Commit ebe76ad6 authored by Tomas Mecir's avatar Tomas Mecir

Do not link against qt3support anymore

parent ea078ed1
include_directories( ${CMAKE_SOURCE_DIR}/libs ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
add_definitions (-DQT3_SUPPORT)
add_definitions (-DQT3_SUPPORT_WARNINGS)
########### next target ###############
......
......@@ -22,8 +22,6 @@
#include <qstring.h>
#include <qicon.h>
#include <qevent.h>
//Added by qt3to4:
#include <QKeyEvent>
#include <kaction.h>
#include <ktoggleaction.h>
......@@ -51,7 +49,7 @@ public:
// Mouse events for the tool
virtual void mousePressEvent(QPoint, QMouseEvent *, CMapLevel *) { }
virtual void mouseReleaseEvent(QPoint, QMouseEvent *, CMapLevel *) { }
virtual void mouseMoveEvent(QPoint ,Qt::ButtonState,CMapLevel *) { }
virtual void mouseMoveEvent(QPoint, Qt::KeyboardModifiers, Qt::MouseButtons, CMapLevel *) { }
virtual void mouseDoubleClickEvent(QPoint, QMouseEvent *, CMapLevel *) { }
virtual void mouseLeaveEvent() { }
virtual void mouseEnterEvent() { }
......
......@@ -398,7 +398,7 @@ void CMapWidget::mouseMoveEvent(QMouseEvent *e)
else
{
// Send the mouse event to the current tool
mapManager->getCurrentTool()->mouseMoveEvent(e->pos(),e->button(),viewWidget->getCurrentlyViewedLevel());
mapManager->getCurrentTool()->mouseMoveEvent(e->pos(), e->modifiers(), e->buttons(), viewWidget->getCurrentlyViewedLevel());
}
}
......
......@@ -48,10 +48,11 @@
#include <kdebug.h>
CMapTextPreview::CMapTextPreview(CMapManager *manager,QWidget *parent)
: QWidget(parent, Qt::WNorthWestGravity | Qt::WResizeNoErase | Qt::WRepaintNoErase)
: QWidget(parent)
{
buffer = NULL;
mapManager = manager;
setAttribute (Qt::WA_StaticContents);
buffer = NULL;
mapManager = manager;
}
CMapTextPreview::~CMapTextPreview()
......
......@@ -66,7 +66,7 @@ void CMapToolRoom::mouseReleaseEvent(QPoint mousePos, QMouseEvent * /*e*/, CMapL
}
/** Called when the tool recives a mouse move event */
void CMapToolRoom::mouseMoveEvent(QPoint mousePos,Qt::ButtonState,CMapLevel *)
void CMapToolRoom::mouseMoveEvent(QPoint mousePos, Qt::KeyboardModifiers, Qt::MouseButtons, CMapLevel *)
{
lastPos = mapManager->cordsSnapGrid(mousePos);
mapManager->getActiveView()->requestPaint();
......
......@@ -37,7 +37,7 @@ public:
/** Called when the tool recives a mouse release event */
virtual void mouseReleaseEvent(QPoint mousePos, QMouseEvent *e, CMapLevel *currentLevel);
/** Called when the tool recives a mouse move event */
virtual void mouseMoveEvent(QPoint mousePos,Qt::ButtonState,CMapLevel *currentLevel);
virtual void mouseMoveEvent(QPoint mousePos, Qt::KeyboardModifiers, Qt::MouseButtons, CMapLevel *currentLevel);
virtual void mouseLeaveEvent();
virtual void mouseEnterEvent();
......
......@@ -25,8 +25,6 @@
#include "../cmapcmdmoveelements.h"
#include <qcursor.h>
//Added by qt3to4:
#include <QPixmap>
#include <kstandarddirs.h>
#include <kiconloader.h>
......@@ -308,7 +306,7 @@ void CMapToolSelect::mouseDoubleClickEvent(QPoint mousePos, QMouseEvent *, CMapL
/** Called when the tool recives a mouse move event */
void CMapToolSelect::mouseMoveEvent(QPoint mousePos,Qt::ButtonState,CMapLevel *)
void CMapToolSelect::mouseMoveEvent(QPoint mousePos, Qt::KeyboardModifiers, Qt::MouseButtons, CMapLevel *)
{
// If a drag operation is not in progress then return
if (!bDragging) return;
......
......@@ -44,7 +44,7 @@ public:
/** Called when the tool recives a mouse release event */
virtual void mouseReleaseEvent(QPoint mousePos, QMouseEvent *e, CMapLevel *currentLevel);
/** Called when the tool recives a mouse move event */
virtual void mouseMoveEvent(QPoint mousePos,Qt::ButtonState,CMapLevel *currentLevel);
virtual void mouseMoveEvent(QPoint mousePos, Qt::KeyboardModifiers, Qt::MouseButtons, CMapLevel *currentLevel);
/** Called when the tool recives a mouse double click event */
virtual void mouseDoubleClickEvent(QPoint mousePos, QMouseEvent *e, CMapLevel *currentLevel);
/** This is called when a key is pressed */
......
......@@ -22,8 +22,6 @@
#include <kiconloader.h>
#include <qcursor.h>
//Added by qt3to4:
#include <QKeyEvent>
#include "../../../cmapmanager.h"
#include "../../../cmaplevel.h"
......
......@@ -21,8 +21,6 @@
#include <qobject.h>
#include <qcursor.h>
#include <qevent.h>
//Added by qt3to4:
#include <QKeyEvent>
#include "../../../cmaptoolbase.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment