Marked few drawing progress reporting signals as deprecated

wonder-sk · wonder-sk · commit d9b95bcd423f · 2013-11-01T10:35:34.000+07:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1898,8 +1898,6 @@ void QgisApp::setupConnections()
            mMapCanvas, SLOT( setRenderFlag( bool ) ) );
 
   // connect renderer
-  connect( mMapCanvas->mapRenderer(), SIGNAL( drawingProgress( int, int ) ),
-           this, SLOT( showProgress( int, int ) ) );
   connect( mMapCanvas->mapRenderer(), SIGNAL( hasCrsTransformEnabled( bool ) ),
            this, SLOT( hasCrsTransformEnabled( bool ) ) );
   connect( mMapCanvas->mapRenderer(), SIGNAL( destinationSrsChanged() ),
diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
@@ -396,7 +396,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
 
   signals:
 
-    /** Emit a signal to notify of a progress event */
+    //! @deprecated in 2.1 - not emitted anymore
     void drawingProgress( int theProgress, int theTotalSteps );
 
     /** Emit a signal with status (e.g. to be caught by QgisApp and display a msg on status bar) */
diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
@@ -713,9 +713,6 @@ void QgsMapRenderer::onDrawingProgress( int current, int total )
 {
   Q_UNUSED( current );
   Q_UNUSED( total );
-  // TODO: emit signal with progress
-// QgsDebugMsg(QString("onDrawingProgress: %1 / %2").arg(current).arg(total));
-  emit updateMap();
 }
 
 void QgsMapRenderer::setProjectionsEnabled( bool enabled )
diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
@@ -291,12 +291,14 @@ class CORE_EXPORT QgsMapRenderer : public QObject
 
   signals:
 
+    //! @deprecated in 2.1 - not emitted anymore
     void drawingProgress( int current, int total );
 
     void hasCrsTransformEnabled( bool flag );
 
     void destinationSrsChanged();
 
+    //! @deprecated in 2.1 - not emitted anymore
     void updateMap();
 
     void mapUnitsChanged();
@@ -306,7 +308,7 @@ class CORE_EXPORT QgsMapRenderer : public QObject
 
   public slots:
 
-    //! called by signal from layer current being drawn
+    //! @deprecated in 2.1 - does nothing
     Q_DECL_DEPRECATED void onDrawingProgress( int current, int total );
 
   protected:
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1277,8 +1277,8 @@ void QgsRasterLayer::triggerRepaint()
 
 void QgsRasterLayer::updateProgress( int theProgress, int theMax )
 {
-  //simply propogate it on!
-  emit drawingProgress( theProgress, theMax );
+  Q_UNUSED( theProgress );
+  Q_UNUSED( theMax );
 }
 
 void QgsRasterLayer::onProgress( int theType, double theProgress, QString theMessage )
diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -372,8 +372,8 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
   public slots:
     void showStatusMessage( const QString & theMessage );
 
-    /** \brief Propagate progress updates from GDAL up to the parent app */
-    void updateProgress( int, int );
+    //! @deprecated in 2.1 - does nothing
+    Q_DECL_DEPRECATED void updateProgress( int, int );
 
     /** \brief receive progress signal from provider */
     void onProgress( int, double, QString );
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -299,8 +299,8 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     /** The map units may have changed, so cope with that */
     void mapUnitsChanged();
 
-    //! \note Deprecated in 2.1 - does nothing - kept for API compatibility
-    void updateMap();
+    //! @deprecated in 2.1 - does nothing - kept for API compatibility
+    Q_DECL_DEPRECATED void updateMap();
 
     //! show whatever error is exposed by the QgsMapLayer.
     void showError( QgsMapLayer * mapLayer );

Original file line number	Diff line number	Diff line change
`@@ -713,9 +713,6 @@ void QgsMapRenderer::onDrawingProgress( int current, int total )`
`713`	`713`	`{`
`714`	`714`	`Q_UNUSED( current );`
`715`	`715`	`Q_UNUSED( total );`
`716`		`- // TODO: emit signal with progress`
`717`		`-// QgsDebugMsg(QString("onDrawingProgress: %1 / %2").arg(current).arg(total));`
`718`		`- emit updateMap();`
`719`	`716`	`}`
`720`	`717`
`721`	`718`	`void QgsMapRenderer::setProjectionsEnabled( bool enabled )`
Original file line number	Diff line number	Diff line change
`@@ -1277,8 +1277,8 @@ void QgsRasterLayer::triggerRepaint()`
`1277`	`1277`
`1278`	`1278`	`void QgsRasterLayer::updateProgress( int theProgress, int theMax )`
`1279`	`1279`	`{`
`1280`		`- //simply propogate it on!`
`1281`		`- emit drawingProgress( theProgress, theMax );`
	`1280`	`+ Q_UNUSED( theProgress );`
	`1281`	`+ Q_UNUSED( theMax );`
`1282`	`1282`	`}`
`1283`	`1283`
`1284`	`1284`	`void QgsRasterLayer::onProgress( int theType, double theProgress, QString theMessage )`