Fix wmsserver: Do not manipulate maplayerregistry directly

m-kuhn · m-kuhn · commit df19fe5e04b0 · 2013-05-17T12:00:49.000+02:00
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -373,7 +373,7 @@ QImage* QgsWMSServer::getLegendGraphics()
     currentY += layerSpace;
   }
 
-  QgsMapLayerRegistry::instance()->mapLayers().clear();
+  QgsMapLayerRegistry::instance()->removeAllMapLayers();
   delete theImage;
   return paintImage;
 }
@@ -649,7 +649,7 @@ QImage* QgsWMSServer::getMap()
   clearFeatureSelections( selectedLayerIdList );
 
   QgsDebugMsg( "clearing filters" );
-  QgsMapLayerRegistry::instance()->mapLayers().clear();
+  QgsMapLayerRegistry::instance()->removeAllMapLayers();
 
 #ifdef QGISDEBUG
   theImage->save( QDir::tempPath() + QDir::separator() + "lastrender.png" );
@@ -1926,7 +1926,7 @@ QStringList QgsWMSServer::applyFeatureSelections( const QStringList& layerList )
 
 void QgsWMSServer::clearFeatureSelections( const QStringList& layerIds ) const
 {
-  QMap<QString, QgsMapLayer*>& layerMap = QgsMapLayerRegistry::instance()->mapLayers();
+  const QMap<QString, QgsMapLayer*>& layerMap = QgsMapLayerRegistry::instance()->mapLayers();
 
   foreach ( QString id, layerIds )
   {

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ QImage* QgsWMSServer::getLegendGraphics()`
`373`	`373`	`currentY += layerSpace;`
`374`	`374`	`}`
`375`	`375`
`376`		`- QgsMapLayerRegistry::instance()->mapLayers().clear();`
	`376`	`+ QgsMapLayerRegistry::instance()->removeAllMapLayers();`
`377`	`377`	`delete theImage;`
`378`	`378`	`return paintImage;`
`379`	`379`	`}`
`@@ -649,7 +649,7 @@ QImage* QgsWMSServer::getMap()`
`649`	`649`	`clearFeatureSelections( selectedLayerIdList );`
`650`	`650`
`651`	`651`	`QgsDebugMsg( "clearing filters" );`
`652`		`- QgsMapLayerRegistry::instance()->mapLayers().clear();`
	`652`	`+ QgsMapLayerRegistry::instance()->removeAllMapLayers();`
`653`	`653`
`654`	`654`	`#ifdef QGISDEBUG`
`655`	`655`	`theImage->save( QDir::tempPath() + QDir::separator() + "lastrender.png" );`
`@@ -1926,7 +1926,7 @@ QStringList QgsWMSServer::applyFeatureSelections( const QStringList& layerList )`
`1926`	`1926`
`1927`	`1927`	`void QgsWMSServer::clearFeatureSelections( const QStringList& layerIds ) const`
`1928`	`1928`	`{`
`1929`		`- QMap<QString, QgsMapLayer*>& layerMap = QgsMapLayerRegistry::instance()->mapLayers();`
	`1929`	`+ const QMap<QString, QgsMapLayer*>& layerMap = QgsMapLayerRegistry::instance()->mapLayers();`
`1930`	`1930`
`1931`	`1931`	`foreach ( QString id, layerIds )`
`1932`	`1932`	`{`