Merge branch 'map' of https://vcs.maemo.org/git/situare into map

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 489ef4c..7533ed8 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -28,11 +28,7 @@
     #include <QGLWidget>
 #endif // Q_WS_MAEMO_5
 
-#ifdef Q_WS_MAEMO_5
-    #include <QAbstractKineticScroller>
-#endif // Q_WS_MAEMO_5
-
-#include "common.h"
+#include "mapcommon.h"
 #include "mapview.h"
 
 MapView::MapView(QWidget *parent) : QGraphicsView(parent)
@@ -42,22 +38,9 @@ MapView::MapView(QWidget *parent) : QGraphicsView(parent)
   * OpenGL can't be used in scratchbox.
   */
 #ifndef Q_WS_MAEMO_5
-    setViewport(new QGLWidget);
+    //setViewport(new QGLWidget);
 #endif // !Q_WS_MAEMO_5
 
-/**
-  * Use kinetic scrolling for Maemo5 and QGraphicsViews drag mode
-  * ScrollHandDrag for other environments
-  */
-#ifdef Q_WS_MAEMO_5
-    QAbstractKineticScroller *scroller = property("kineticScroller")
-                                         .value<QAbstractKineticScroller *>();
-    if (scroller)
-        scroller->setEnabled(true);
-#else
-    setDragMode(QGraphicsView::ScrollHandDrag);
-#endif // Q_WS_MAEMO_5
-
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 }
@@ -101,38 +84,31 @@ qreal MapView::currentScale()
     return currentTransform.m11();
 }
 
-//void MapView::scrollContentsBy (int dx, int dy)
-//{
-//    qDebug() << __PRETTY_FUNCTION__ << "dx:" << dx << "dy:" << dy;
-//
-//    QGraphicsView::scrollContentsBy(dx, dy);
-//}
-
 void MapView::mouseMoveEvent(QMouseEvent *event)
 {
-    m_scenePosition += m_mousePosition - mapToScene(event->pos());
+    m_scenePosition += m_mousePosition - mapToScene(event->pos()).toPoint();
 
     emit viewScrolled(m_scenePosition);
     //qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition" << m_scenePosition;
 
-    m_mousePosition = mapToScene(event->pos());
+    m_mousePosition = mapToScene(event->pos()).toPoint();
 }
 
 void MapView::mousePressEvent(QMouseEvent *event)
 {
-    m_mousePosition = mapToScene(event->pos());
-    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1);
+    m_mousePosition = mapToScene(event->pos()).toPoint();
+    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1).toPoint();
 }
 
 
-void MapView::centerToSceneCoordinates(QPointF sceneCoordinate)
+void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 {
-    //qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
+//    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
     centerOn(sceneCoordinate);
 }
 
 void MapView::resizeEvent(QResizeEvent *event)
 {
-    qDebug() << "Resize event: " << event->size();
+    //qDebug() << "Resize event: " << event->size();
     emit viewResized(event->size());
 }