Remove duplicate selectionChanged signal from QgsVectorLayer

nyalldawson · nyalldawson · commit 4a5faa083f1e · 2016-11-15T07:00:49.000+10:00
If you don't want the extra info, just don't capture it...
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -1504,7 +1504,7 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.
 - saveStyleToDatabase(): msgError argument is correctly declared as output argument
 - getStyleFromDatabase(): msgError argument is correctly declared as output argument
 - loadNamedStyle(): theResultFlag argument is correctly declared as output argument
-
+- The duplicate selectionChanged() signal was removed. Use selectionChanged( const QgsFeatureIds&, const QgsFeatureIds&, const bool ) instead.
 
 QgsVectorLayerEditBuffer        {#qgis_api_break_3_0_QgsVectorLayerEditBuffer}
 ------------------------
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -1548,9 +1548,6 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
      */
     void selectionChanged( const QgsFeatureIds& selected, const QgsFeatureIds& deselected, const bool clearAndSelect );
 
-    /** This signal is emitted when selection was changed */
-    void selectionChanged();
-
     /** This signal is emitted when modifications has been done on layer */
     void layerModified();
 
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -181,7 +181,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   connect( mLayer, SIGNAL( editingStarted() ), this, SLOT( editingToggled() ) );
   connect( mLayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );
   connect( mLayer, SIGNAL( destroyed() ), this, SLOT( close() ) );
-  connect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( updateTitle() ) );
+  connect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsAttributeTableDialog::updateTitle );
   connect( mLayer, SIGNAL( featureAdded( QgsFeatureId ) ), this, SLOT( updateTitle() ) );
   connect( mLayer, SIGNAL( featuresDeleted( QgsFeatureIds ) ), this, SLOT( updateTitle() ) );
   connect( mLayer, SIGNAL( attributeAdded( int ) ), this, SLOT( columnBoxInit() ) );
diff --git a/src/app/qgsstatisticalsummarydockwidget.cpp b/src/app/qgsstatisticalsummarydockwidget.cpp
@@ -251,14 +251,14 @@ void QgsStatisticalSummaryDockWidget::layerChanged( QgsMapLayer *layer )
   QgsVectorLayer* newLayer = dynamic_cast< QgsVectorLayer* >( layer );
   if ( mLayer && mLayer != newLayer )
   {
-    disconnect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( layerSelectionChanged() ) );
+    disconnect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsStatisticalSummaryDockWidget::layerSelectionChanged );
   }
 
   mLayer = newLayer;
 
   if ( mLayer )
   {
-    connect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( layerSelectionChanged() ) );
+    connect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsStatisticalSummaryDockWidget::layerSelectionChanged );
   }
 
   mFieldExpressionWidget->setLayer( mLayer );
@@ -294,7 +294,7 @@ void QgsStatisticalSummaryDockWidget::layersRemoved( const QStringList& layers )
 {
   if ( mLayer && layers.contains( mLayer->id() ) )
   {
-    disconnect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( layerSelectionChanged() ) );
+    disconnect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsStatisticalSummaryDockWidget::layerSelectionChanged );
     mLayer = nullptr;
   }
 }
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -155,8 +155,7 @@ QgsVectorLayer::QgsVectorLayer( const QString& vectorLayerPath,
     setDataSource( vectorLayerPath, baseName, providerKey, loadDefaultStyleFlag );
   }
 
-  connect( this, SIGNAL( selectionChanged( QgsFeatureIds, QgsFeatureIds, bool ) ), this, SIGNAL( selectionChanged() ) );
-  connect( this, SIGNAL( selectionChanged( QgsFeatureIds, QgsFeatureIds, bool ) ), this, SIGNAL( repaintRequested() ) );
+  connect( this, &QgsVectorLayer::selectionChanged, this, &QgsVectorLayer::repaintRequested );
   connect( QgsProject::instance()->relationManager(), &QgsRelationManager::relationsLoaded, this, &QgsVectorLayer::onRelationsLoaded );
 
   // Default simplify drawing settings
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1691,9 +1691,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      */
     void selectionChanged( const QgsFeatureIds& selected, const QgsFeatureIds& deselected, const bool clearAndSelect );
 
-    //! This signal is emitted when selection was changed
-    void selectionChanged();
-
     //! This signal is emitted when modifications has been done on layer
     void layerModified();
 
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -38,7 +38,7 @@ QgsAttributeTableFilterModel::QgsAttributeTableFilterModel( QgsMapCanvas* canvas
   setSourceModel( sourceModel );
   setDynamicSortFilter( true );
   setSortRole( QgsAttributeTableModel::SortRole );
-  connect( layer(), SIGNAL( selectionChanged() ), SLOT( selectionChanged() ) );
+  connect( layer(), &QgsVectorLayer::selectionChanged, this, &QgsAttributeTableFilterModel::selectionChanged );
 }
 
 bool QgsAttributeTableFilterModel::lessThan( const QModelIndex &left, const QModelIndex &right ) const
diff --git a/src/gui/attributetable/qgsvectorlayerselectionmanager.cpp b/src/gui/attributetable/qgsvectorlayerselectionmanager.cpp
@@ -21,7 +21,7 @@ QgsVectorLayerSelectionManager::QgsVectorLayerSelectionManager( QgsVectorLayer*
     : QgsIFeatureSelectionManager( parent )
     , mLayer( layer )
 {
-  connect( mLayer, SIGNAL( selectionChanged( QgsFeatureIds, QgsFeatureIds, bool ) ), this, SIGNAL( selectionChanged( QgsFeatureIds, QgsFeatureIds, bool ) ) );
+  connect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsVectorLayerSelectionManager::selectionChanged );
 }
 
 int QgsVectorLayerSelectionManager::selectedFeatureCount()
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -78,7 +78,7 @@ QgsAttributeForm::QgsAttributeForm( QgsVectorLayer* vl, const QgsFeature &featur
   connect( vl, &QgsVectorLayer::updatedFields, this, &QgsAttributeForm::onUpdatedFields );
   connect( vl, &QgsVectorLayer::beforeAddingExpressionField, this, &QgsAttributeForm::preventFeatureRefresh );
   connect( vl, &QgsVectorLayer::beforeRemovingExpressionField, this, &QgsAttributeForm::preventFeatureRefresh );
-  connect( vl, SIGNAL( selectionChanged() ), this, SLOT( layerSelectionChanged() ) );
+  connect( vl, &QgsVectorLayer::selectionChanged, this, &QgsAttributeForm::layerSelectionChanged );
 
   // constraints management
   updateAllConstraints();
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -336,7 +336,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer> &layers )
       QgsVectorLayer *isVectLyr = qobject_cast<QgsVectorLayer *>( currentLayer );
       if ( isVectLyr )
       {
-        disconnect( currentLayer, SIGNAL( selectionChanged() ), this, SLOT( selectionChangedSlot() ) );
+        disconnect( isVectLyr, &QgsVectorLayer::selectionChanged, this, &QgsMapCanvas::selectionChangedSlot );
       }
     }
 
@@ -354,7 +354,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer> &layers )
       QgsVectorLayer *isVectLyr = qobject_cast<QgsVectorLayer *>( currentLayer );
       if ( isVectLyr )
       {
-        connect( currentLayer, SIGNAL( selectionChanged() ), this, SLOT( selectionChangedSlot() ) );
+        connect( isVectLyr, &QgsVectorLayer::selectionChanged, this, &QgsMapCanvas::selectionChangedSlot );
       }
     }
 
diff --git a/src/plugins/grass/qgsgrassmoduleparam.cpp b/src/plugins/grass/qgsgrassmoduleparam.cpp
@@ -1388,8 +1388,7 @@ void QgsGrassModuleSelection::onModeChanged()
     if ( vectorLayer )
     {
       onLayerSelectionChanged();
-      connect( vectorLayer, SIGNAL( selectionChanged( const QgsFeatureIds, const QgsFeatureIds, const bool ) ),
-               SLOT( onLayerSelectionChanged() ) );
+      connect( vectorLayer, &QgsVectorLayer::selectionChanged, this, &QgsGrassModuleSelection::onLayerSelectionChanged );
     }
   }
 }
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@@ -125,23 +125,23 @@ void QgsSpatialQueryDialog::setLayer( bool isTarget, int index )
   {
     if ( mLayerTarget )
     {
-      disconnect( mLayerTarget, SIGNAL( selectionChanged() ),
-                  this, SLOT( signal_layerTarget_selectionFeaturesChanged() ) );
+      disconnect( mLayerTarget, &QgsVectorLayer::selectionChanged,
+                  this, &QgsSpatialQueryDialog::signal_layerTarget_selectionFeaturesChanged );
     }
     mLayerTarget = getLayerFromCombobox( isTarget, index );
-    connect( mLayerTarget, SIGNAL( selectionChanged() ),
-             this, SLOT( signal_layerTarget_selectionFeaturesChanged() ) );
+    connect( mLayerTarget, &QgsVectorLayer::selectionChanged,
+             this, &QgsSpatialQueryDialog::signal_layerTarget_selectionFeaturesChanged );
   }
   else
   {
     if ( mLayerReference )
     {
-      disconnect( mLayerReference, SIGNAL( selectionChanged() ),
-                  this, SLOT( signal_layerReference_selectionFeaturesChanged() ) );
+      disconnect( mLayerReference, &QgsVectorLayer::selectionChanged,
+                  this, &QgsSpatialQueryDialog::signal_layerReference_selectionFeaturesChanged );
     }
     mLayerReference = getLayerFromCombobox( isTarget, index );
-    connect( mLayerReference, SIGNAL( selectionChanged() ),
-             this, SLOT( signal_layerReference_selectionFeaturesChanged() ) );
+    connect( mLayerReference, &QgsVectorLayer::selectionChanged,
+             this, &QgsSpatialQueryDialog::signal_layerReference_selectionFeaturesChanged );
   }
 } // void QgsSpatialQueryDialog::setLayer(bool isTarget, int index)
 
@@ -369,14 +369,14 @@ void QgsSpatialQueryDialog::disconnectAll()
 
   if ( mLayerTarget )
   {
-    disconnect( mLayerTarget, SIGNAL( selectionChanged() ),
-                this, SLOT( signal_layerTarget_selectionFeaturesChanged() ) );
+    disconnect( mLayerTarget, &QgsVectorLayer::selectionChanged,
+                this, &QgsSpatialQueryDialog::signal_layerTarget_selectionFeaturesChanged );
 
   }
   if ( mLayerReference )
   {
-    disconnect( mLayerReference, SIGNAL( selectionChanged() ),
-                this, SLOT( signal_layerReference_selectionFeaturesChanged() ) );
+    disconnect( mLayerReference, &QgsVectorLayer::selectionChanged,
+                this, &QgsSpatialQueryDialog::signal_layerReference_selectionFeaturesChanged );
   }
 } // QgsSpatialQueryDialog::disconnectAll()
 

Original file line number	Diff line number	Diff line change
`@@ -251,14 +251,14 @@ void QgsStatisticalSummaryDockWidget::layerChanged( QgsMapLayer *layer )`
`251`	`251`	`QgsVectorLayer* newLayer = dynamic_cast< QgsVectorLayer* >( layer );`
`252`	`252`	`if ( mLayer && mLayer != newLayer )`
`253`	`253`	`{`
`254`		`- disconnect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( layerSelectionChanged() ) );`
	`254`	`+ disconnect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsStatisticalSummaryDockWidget::layerSelectionChanged );`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`mLayer = newLayer;`
`258`	`258`
`259`	`259`	`if ( mLayer )`
`260`	`260`	`{`
`261`		`- connect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( layerSelectionChanged() ) );`
	`261`	`+ connect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsStatisticalSummaryDockWidget::layerSelectionChanged );`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`mFieldExpressionWidget->setLayer( mLayer );`
`@@ -294,7 +294,7 @@ void QgsStatisticalSummaryDockWidget::layersRemoved( const QStringList& layers )`
`294`	`294`	`{`
`295`	`295`	`if ( mLayer && layers.contains( mLayer->id() ) )`
`296`	`296`	`{`
`297`		`- disconnect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( layerSelectionChanged() ) );`
	`297`	`+ disconnect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsStatisticalSummaryDockWidget::layerSelectionChanged );`
`298`	`298`	`mLayer = nullptr;`
`299`	`299`	`}`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,7 @@ QgsVectorLayer::QgsVectorLayer( const QString& vectorLayerPath,`
`155`	`155`	`setDataSource( vectorLayerPath, baseName, providerKey, loadDefaultStyleFlag );`
`156`	`156`	`}`
`157`	`157`
`158`		`- connect( this, SIGNAL( selectionChanged( QgsFeatureIds, QgsFeatureIds, bool ) ), this, SIGNAL( selectionChanged() ) );`
`159`		`- connect( this, SIGNAL( selectionChanged( QgsFeatureIds, QgsFeatureIds, bool ) ), this, SIGNAL( repaintRequested() ) );`
	`158`	`+ connect( this, &QgsVectorLayer::selectionChanged, this, &QgsVectorLayer::repaintRequested );`
`160`	`159`	`connect( QgsProject::instance()->relationManager(), &QgsRelationManager::relationsLoaded, this, &QgsVectorLayer::onRelationsLoaded );`
`161`	`160`
`162`	`161`	`// Default simplify drawing settings`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ QgsAttributeTableFilterModel::QgsAttributeTableFilterModel( QgsMapCanvas* canvas`
`38`	`38`	`setSourceModel( sourceModel );`
`39`	`39`	`setDynamicSortFilter( true );`
`40`	`40`	`setSortRole( QgsAttributeTableModel::SortRole );`
`41`		`- connect( layer(), SIGNAL( selectionChanged() ), SLOT( selectionChanged() ) );`
	`41`	`+ connect( layer(), &QgsVectorLayer::selectionChanged, this, &QgsAttributeTableFilterModel::selectionChanged );`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`bool QgsAttributeTableFilterModel::lessThan( const QModelIndex &left, const QModelIndex &right ) const`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ QgsVectorLayerSelectionManager::QgsVectorLayerSelectionManager( QgsVectorLayer*`
`21`	`21`	`: QgsIFeatureSelectionManager( parent )`
`22`	`22`	`, mLayer( layer )`
`23`	`23`	`{`
`24`		`- connect( mLayer, SIGNAL( selectionChanged( QgsFeatureIds, QgsFeatureIds, bool ) ), this, SIGNAL( selectionChanged( QgsFeatureIds, QgsFeatureIds, bool ) ) );`
	`24`	`+ connect( mLayer, &QgsVectorLayer::selectionChanged, this, &QgsVectorLayerSelectionManager::selectionChanged );`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`int QgsVectorLayerSelectionManager::selectedFeatureCount()`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer> &layers )`
`336`	`336`	`QgsVectorLayer isVectLyr = qobject_cast<QgsVectorLayer >( currentLayer );`
`337`	`337`	`if ( isVectLyr )`
`338`	`338`	`{`
`339`		`- disconnect( currentLayer, SIGNAL( selectionChanged() ), this, SLOT( selectionChangedSlot() ) );`
	`339`	`+ disconnect( isVectLyr, &QgsVectorLayer::selectionChanged, this, &QgsMapCanvas::selectionChangedSlot );`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`
`@@ -354,7 +354,7 @@ void QgsMapCanvas::setLayerSet( QList<QgsMapCanvasLayer> &layers )`
`354`	`354`	`QgsVectorLayer isVectLyr = qobject_cast<QgsVectorLayer >( currentLayer );`
`355`	`355`	`if ( isVectLyr )`
`356`	`356`	`{`
`357`		`- connect( currentLayer, SIGNAL( selectionChanged() ), this, SLOT( selectionChangedSlot() ) );`
	`357`	`+ connect( isVectLyr, &QgsVectorLayer::selectionChanged, this, &QgsMapCanvas::selectionChangedSlot );`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`