From: Sami Rämö <sami.ramo@ixonos.com>
Date: Thu, 17 Jun 2010 13:45:17 +0000 (+0300)
Subject: Cleanup
X-Git-Tag: v1.0~8^2~17
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;ds=sidebyside;h=f35acbd4f6d9b69c47d76fe3282d5db5092cd500;p=situare

Cleanup

 Reviewed by Kaj Wallin
---

diff --git a/src/map/mapscroller.h b/src/map/mapscroller.h
index 76297a2..acd6644 100644
--- a/src/map/mapscroller.h
+++ b/src/map/mapscroller.h
@@ -41,8 +41,6 @@ class MapScroller : public QVariantAnimation
 private:
     /**
     * @brief Constructor in not accessible because class is using singleton design pattern.
-    *
-    * @todo remove default constructor implementation after caller does set the easing curve
     */
     MapScroller();
 
diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 5d6fefc..ca24777 100644
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -53,8 +53,6 @@ MapView::MapView(QWidget *parent)
     setOptimizationFlag(QGraphicsView::DontAdjustForAntialiasing);
 
     m_scroller = &MapScroller::getInstance();
-
-    qWarning() << __PRETTY_FUNCTION__ << "SPEED_TO_DISTANCE_FACTOR" << KINETIC_SPEED_TO_DISTANCE_FACTOR;
 }
 
 void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
@@ -76,14 +74,8 @@ void MapView::mouseMoveEvent(QMouseEvent *event)
     m_dragMovement[m_index] = m_mouseLastViewPosition - event->pos();
     m_dragTime[m_index] = time.elapsed();
     time.start();
-
-//    qWarning() << __PRETTY_FUNCTION__ << m_index << m_dragMovement[m_index].x() << m_dragMovement[m_index].y() << m_dragTime[m_index];
-
     m_index++;
 
-//    qWarning() << __PRETTY_FUNCTION__ << m_dragViewSpeed.x() << m_dragViewSpeed.y();
-//    qWarning() << __PRETTY_FUNCTION__  << "elapsed:" << time.elapsed() << "ms";
-
     emit viewScrolled(m_scenePosition);
 
     m_mouseLastScenePosition = mapToScene(event->pos()).toPoint();
@@ -113,14 +105,12 @@ void MapView::mousePressEvent(QMouseEvent *event)
 
 void MapView::mouseReleaseEvent(QMouseEvent *event)
 {
-//    qWarning() << __PRETTY_FUNCTION__;
+    qDebug() << __PRETTY_FUNCTION__;
 
     int elapsed = time.elapsed();
 
     QGraphicsView::mouseReleaseEvent(event);
 
-    qWarning() << __PRETTY_FUNCTION__ << "elapsed:" << elapsed;
-
     // start kinetic scroll only if there isn't too much time elapsed from the last mouse move event
     if (elapsed <= KINETIC_MAX_TIME_FROM_LAST_MOUSE_EVENT_MS) {
         QPointF dragViewSpeed;
@@ -132,14 +122,10 @@ void MapView::mouseReleaseEvent(QMouseEvent *event)
                 dragLength += m_dragMovement[i].manhattanLength();
                 values++;
             }
-            qWarning() << __PRETTY_FUNCTION__ << m_dragMovement[i].x() << m_dragMovement[i].y() << m_dragTime[i];
         }
         dragViewSpeed /= values;
         dragViewSpeed *= KINETIC_SPEED_TO_DISTANCE_FACTOR;
 
-        qWarning() << __PRETTY_FUNCTION__ << dragViewSpeed.x() << dragViewSpeed.y();
-        qWarning() << __PRETTY_FUNCTION__ << "dragLength:" << dragLength;
-
         if (dragLength >= KINETIC_MIN_DRAG_LENGTH) {
             QPointF dragSceneSpeed = dragViewSpeed * (1 << (MAX_MAP_ZOOM_LEVEL - m_zoomLevel));