Deprecate refreshLegend

qgis · Oct 7, 2018 · 12fd51e27e1229c6751ea430413f429fe08c270f · 12fd51e
1 parent 56149ff
commit 12fd51e27e1229c6751ea430413f429fe08c270f
Unified Split

Showing with 9 additions and 5 deletions.

+3 −1 src/app/qgsrasterlayerproperties.cpp

+1 −1 src/app/qgsrasterlayerproperties.h

+3 −1 src/app/qgsvectorlayerproperties.cpp

+2 −2 src/app/qgsvectorlayerproperties.h
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -1054,8 +1054,10 @@ void QgsRasterLayerProperties::apply()
   mRasterLayer->setCustomProperty( "WMSBackgroundLayer", mBackgroundLayerCheckBox->isChecked() );
 
 
-  // update symbology (this is now disconnected)
+  // update symbology (this is now deprecated and disconnected)
+  Q_NOWARN_DEPRECATED_PUSH
   emit refreshLegend( mRasterLayer->id(), false );
+  Q_NOWARN_DEPRECATED_POP
 
   // Force a redraw of the legend
   mRasterLayer->setLegend( QgsMapLayerLegend::defaultRasterLegend( mRasterLayer ) );

diff --git a/src/app/qgsrasterlayerproperties.h b/src/app/qgsrasterlayerproperties.h
@@ -141,7 +141,7 @@ class APP_EXPORT QgsRasterLayerProperties : public QgsOptionsDialogBase, private
 
   signals:
     //! Emitted when changes to layer were saved to update legend
-    void refreshLegend( const QString &layerID, bool expandItem );
+    Q_DECL_DEPRECATED void refreshLegend( const QString &layerID, bool expandItem ) SIP_DEPRECATED;
 
   private:
     QPushButton *mBtnStyle = nullptr;

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -754,8 +754,10 @@ void QgsVectorLayerProperties::apply()
   mLayer->geometryOptions()->setRemoveDuplicateNodes( mRemoveDuplicateNodesCheckbox->isChecked() );
   mLayer->geometryOptions()->setGeometryPrecision( mGeometryPrecisionSpinBox->value() );
 
-  // update symbology
+  // update symbology (this is now deprecated and disconnected)
+  Q_NOWARN_DEPRECATED_PUSH
   emit refreshLegend( mLayer->id() );
+  Q_NOWARN_DEPRECATED_POP
 
   mLayer->triggerRepaint();
   // notify the project we've made a change

diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -133,8 +133,8 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
   signals:
 
     //! Emitted when changes to layer were saved to update legend
-    void refreshLegend( const QString &layerID, bool expandItem );
-    void refreshLegend( const QString &layerID );
+    Q_DECL_DEPRECATED void refreshLegend( const QString &layerID, bool expandItem ) SIP_DEPRECATED;
+    Q_DECL_DEPRECATED void refreshLegend( const QString &layerID ) SIP_DEPRECATED;
 
     void toggleEditing( QgsMapLayer * );