Merge branch 'crosshair2'

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index f099331..745f719 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -37,7 +37,8 @@ MapView::MapView(QWidget *parent)
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
     m_zoomAnimation = new QPropertyAnimation(this, "viewScale", this);
-    connect(m_zoomAnimation, SIGNAL(finished()), this, SIGNAL(viewZoomFinished()));
+    connect(m_zoomAnimation, SIGNAL(finished()),
+        this, SIGNAL(viewZoomFinished()));
 }
 
 void MapView::setZoomLevel(int zoomLevel)
@@ -68,7 +69,6 @@ void MapView::setViewScale(qreal viewScale)
     QTransform transform;
     transform.scale(viewScale, viewScale);
     setTransform(transform);
-    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
 }
 
 void MapView::mouseMoveEvent(QMouseEvent *event)
@@ -80,7 +80,6 @@ void MapView::mouseMoveEvent(QMouseEvent *event)
     emit viewScrolled(m_scenePosition);
 
     m_mousePosition = mapToScene(event->pos()).toPoint();
-    emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
 }
 
 void MapView::mousePressEvent(QMouseEvent *event)
@@ -106,16 +105,8 @@ void MapView::resizeEvent(QResizeEvent *event)
 
     emit viewResized(event->size());
     emit viewResizedNewSize(viewport()->width(), viewport()->height());
-    //emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
 }
 
-void MapView::showEvent(QShowEvent *event)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    QGraphicsView::showEvent(event);
-    //emit viewContentChanged(mapToScene(viewport()->x(), viewport()->y()).toPoint());
-}
 
 void MapView::updateViewPortContent()
 {