[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/extragear/graphics/libkmap/libkmap
From: Michael Georg Hansen <mike () mghansen ! de>
Date: 2010-07-31 21:08:56
Message-ID: 20100731210856.BCEC7AC783 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1157689 by mghansen:
Move the MouseMode enum to a kmap_primitives.
M +1 -1 backend-googlemaps.cpp
M +4 -4 backend-marble.cpp
M +2 -2 kmap.cpp
M +6 -0 kmap_primitives.h
M +0 -7 map-backend.h
--- branches/extragear/graphics/libkmap/libkmap/backend-googlemaps.cpp #1157688:1157689
@@ -981,7 +981,7 @@
void BackendGoogleMaps::mouseModeChanged(MouseMode mouseMode)
{
- if(mouseMode == MouseSelection)
+ if(mouseMode == MouseModeSelection)
{
// d->htmlWidget->runScript(QString("selectionModeStatus(true)"));
d->htmlWidget->mouseModeChanged(true);
--- branches/extragear/graphics/libkmap/libkmap/backend-marble.cpp #1157688:1157689
@@ -159,7 +159,7 @@
emit(signalBackendReady(backendName()));
- d->currentMouseMode = MousePan;
+ d->currentMouseMode = MouseModePan;
}
BackendMarble::~BackendMarble()
@@ -441,7 +441,7 @@
painter->autoMapQuality();
//here we draw the selection rectangle
- if(!d->searchRectangleCoordinates.isEmpty() && d->currentMouseMode == MouseSelection)
+ if(!d->searchRectangleCoordinates.isEmpty() && d->currentMouseMode == MouseModeSelection)
{
const qreal lonWest = d->searchRectangleCoordinates.at(0);
const qreal latNorth = d->searchRectangleCoordinates.at(1);
@@ -822,7 +822,7 @@
QMouseEvent* const mouseEvent = static_cast<QMouseEvent*>(event);
bool doFilterEvent = false;
- if(d->currentMouseMode == MouseSelection)
+ if(d->currentMouseMode == MouseModeSelection)
{
/*
@@ -1257,7 +1257,7 @@
kDebug()<<"Mouse mode changed.";
- if(d->currentMouseMode == MousePan)
+ if(d->currentMouseMode == MouseModePan)
{
d->searchRectangleCoordinates.clear();
d->firstSelectionPoint.clear();
--- branches/extragear/graphics/libkmap/libkmap/kmap.cpp #1157688:1157689
@@ -1819,7 +1819,7 @@
{
if(d->actionSetPanMode->isChecked())
{
- d->currentBackend->mouseModeChanged(MousePan);
+ d->currentBackend->mouseModeChanged(MouseModePan);
emit signalRemoveCurrentSelection();
d->actionSetSelectionMode->setChecked(false);
}
@@ -1832,7 +1832,7 @@
// {
if(d->actionSetSelectionMode->isChecked())
{
- d->currentBackend->mouseModeChanged(MouseSelection);
+ d->currentBackend->mouseModeChanged(MouseModeSelection);
d->actionSetPanMode->setChecked(false);
}
else
--- branches/extragear/graphics/libkmap/libkmap/kmap_primitives.h #1157688:1157689
@@ -80,6 +80,12 @@
#endif /* KMAP_HAVE_VALGRIND */
}
+enum MouseMode
+{
+ MouseModePan = 1,
+ MouseModeSelection = 2
+};
+
class KMAP_EXPORT WMWGeoCoordinate
{
public:
--- branches/extragear/graphics/libkmap/libkmap/map-backend.h #1157688:1157689
@@ -41,13 +41,6 @@
namespace KMapIface
{
-enum MouseMode
-{
- MousePan = 1,
- MouseSelection = 2
-};
-
-
class WMWSharedData;
class MapBackend : public QObject
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic