Don't emit layerOrderChanged when removing layers

nyalldawson · nyalldawson · commit 746d288e33b6 · 2017-03-22T13:01:32.000+10:00
Otherwise it automatically enables the layer order panel
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -2171,7 +2171,6 @@ void QgsProject::removeMapLayers( const QList<QgsMapLayer *> &layers )
   QStringList layerIds;
   QList<QgsMapLayer *> layerList;
 
-  bool layerOrderHasChanged = false;
   QList< QgsMapLayer * > currentOrder = layerOrder();
   Q_FOREACH ( QgsMapLayer *layer, layers )
   {
@@ -2180,7 +2179,6 @@ void QgsProject::removeMapLayers( const QList<QgsMapLayer *> &layers )
     {
       layerIds << layer->id();
       layerList << layer;
-      layerOrderHasChanged = layerOrderHasChanged || currentOrder.contains( layer );
     }
   }
 
@@ -2204,8 +2202,6 @@ void QgsProject::removeMapLayers( const QList<QgsMapLayer *> &layers )
   }
 
   emit layersRemoved( layerIds );
-  if ( layerOrderHasChanged )
-    emit layerOrderChanged();
 }
 
 void QgsProject::removeMapLayer( const QString &layerId )
diff --git a/tests/src/python/test_qgsproject.py b/tests/src/python/test_qgsproject.py
@@ -210,7 +210,7 @@ def testLayerOrder(self):
         self.assertEqual(len(layer_order_changed_spy), 3)
         prj.removeMapLayer(layer)
         self.assertEqual(prj.layerOrder(), [layer2, layer3])
-        self.assertEqual(len(layer_order_changed_spy), 4)
+        self.assertEqual(len(layer_order_changed_spy), 3) # should be no signal
 
         # save and restore
         file_name = os.path.join(str(QDir.tempPath()), 'proj.qgs')

Original file line number	Diff line number	Diff line change
`@@ -2171,7 +2171,6 @@ void QgsProject::removeMapLayers( const QList<QgsMapLayer *> &layers )`
`2171`	`2171`	`QStringList layerIds;`
`2172`	`2172`	`QList<QgsMapLayer *> layerList;`
`2173`	`2173`
`2174`		`- bool layerOrderHasChanged = false;`
`2175`	`2174`	`QList< QgsMapLayer * > currentOrder = layerOrder();`
`2176`	`2175`	`Q_FOREACH ( QgsMapLayer *layer, layers )`
`2177`	`2176`	`{`
`@@ -2180,7 +2179,6 @@ void QgsProject::removeMapLayers( const QList<QgsMapLayer *> &layers )`
`2180`	`2179`	`{`
`2181`	`2180`	`layerIds << layer->id();`
`2182`	`2181`	`layerList << layer;`
`2183`		`- layerOrderHasChanged = layerOrderHasChanged \|\| currentOrder.contains( layer );`
`2184`	`2182`	`}`
`2185`	`2183`	`}`
`2186`	`2184`
`@@ -2204,8 +2202,6 @@ void QgsProject::removeMapLayers( const QList<QgsMapLayer *> &layers )`
`2204`	`2202`	`}`
`2205`	`2203`
`2206`	`2204`	`emit layersRemoved( layerIds );`
`2207`		`- if ( layerOrderHasChanged )`
`2208`		`- emit layerOrderChanged();`
`2209`	`2205`	`}`
`2210`	`2206`
`2211`	`2207`	`void QgsProject::removeMapLayer( const QString &layerId )`