make QgsMapCanvas::updateCanvasItemPositions a protected slot

3nids · 3nids · commit ae6ad5c5990b · 2017-06-15T15:11:03.000+02:00
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
@@ -851,16 +851,17 @@ Overridden drag enter event
 called when panning is in action, reset indicates end of panning
 %End
 
-    void updateCanvasItemPositions();
-%Docstring
-called on resize or changed extent to notify canvas items to change their rectangle
-%End
-
 
 
     void updateDatumTransformEntries();
 %Docstring
 Make sure the datum transform store is properly populated
+%End
+
+  protected slots:
+    void updateCanvasItemPositions();
+%Docstring
+called on resize or changed extent to notify canvas items to change their rectangle
 %End
 
 }; // class QgsMapCanvas
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -867,8 +867,6 @@ void QgsMapCanvas::zoomToPreviousExtent()
     // update controls' enabled state
     emit zoomLastStatusChanged( mLastExtentIndex > 0 );
     emit zoomNextStatusChanged( mLastExtentIndex < mLastExtent.size() - 1 );
-    // notify canvas items of change
-    updateCanvasItemPositions();
   }
 
 } // zoomToPreviousExtent
@@ -1337,9 +1335,6 @@ void QgsMapCanvas::resizeEvent( QResizeEvent *e )
 
   moveCanvasContents( true );
 
-  // notify canvas items of change
-  updateCanvasItemPositions();
-
   updateScale();
 
   //refresh();
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -716,9 +716,6 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     //! called when panning is in action, reset indicates end of panning
     void moveCanvasContents( bool reset = false );
 
-    //! called on resize or changed extent to notify canvas items to change their rectangle
-    void updateCanvasItemPositions();
-
     /// implementation struct
     class CanvasProperties;
 
@@ -735,6 +732,10 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     //! Make sure the datum transform store is properly populated
     void updateDatumTransformEntries();
 
+  protected slots:
+    //! called on resize or changed extent to notify canvas items to change their rectangle
+    void updateCanvasItemPositions();
+
   private slots:
 
     void layerRepaintRequested( bool deferred );
