Skip to content

Commit d830d53

Browse files
timlinuxtimlinux
committed
[BACKPORT] to 1.8. Remove deprecated use of map layer registry addLayer and removeLayer elsewhere in code base
1 parent 8d4a656 commit d830d53

15 files changed

+64
-29
lines changed

‎src/app/legend/qgslegend.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,8 @@ void QgsLegend::removeGroup( QgsLegendGroup *lg )
11721172
QgsLegendGroup *cg = dynamic_cast<QgsLegendGroup *>( child );
11731173

11741174
if ( cl )
1175-
QgsMapLayerRegistry::instance()->removeMapLayer( cl->layer()->id() );
1175+
QgsMapLayerRegistry::instance()->removeMapLayers(
1176+
QStringList() << cl->layer()->id() );
11761177
else if ( cg )
11771178
removeGroup( cg );
11781179

@@ -2420,7 +2421,8 @@ void QgsLegend::removeSelectedLayers()
24202421
QgsLegendLayer *ll = dynamic_cast<QgsLegendLayer *>( item );
24212422
if ( ll && ll->layer() )
24222423
{
2423-
QgsMapLayerRegistry::instance()->removeMapLayer( ll->layer()->id() );
2424+
QgsMapLayerRegistry::instance()->removeMapLayers(
2425+
QStringList() << ll->layer()->id() );
24242426
continue;
24252427
}
24262428
}

‎src/app/qgsnewspatialitelayerdialog.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,11 @@ bool QgsNewSpatialiteLayerDialog::apply()
429429
if ( layer->isValid() )
430430
{
431431
// register this layer with the central layers registry
432-
if ( QgsMapLayerRegistry::instance()->addMapLayer( layer ) )
432+
QList<QgsMapLayer *> myList;
433+
myList << layer;
434+
//addMapLayers returns a list of all successfully added layers
435+
//so we compare that to our original list.
436+
if ( myList == QgsMapLayerRegistry::instance()->addMapLayers( myList ) )
433437
return true;
434438
}
435439
else

‎src/browser/qgsbrowser.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ bool QgsBrowser::layerClicked( QgsLayerItem *item )
245245

246246
QgsDebugMsg( "Layer created" );
247247

248-
QgsMapLayerRegistry::instance()->addMapLayer( mLayer );
248+
QgsMapLayerRegistry::instance()->addMapLayers(
249+
QList<QgsMapLayer *>() << mLayer );
249250

250251
return true;
251252
}

‎src/core/qgspluginlayerregistry.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ bool QgsPluginLayerRegistry::removePluginLayerType( QString typeName )
100100
QgsPluginLayer* pl = qobject_cast<QgsPluginLayer*>( layer );
101101
if ( pl->pluginLayerType() == typeName )
102102
{
103-
QgsMapLayerRegistry::instance()->removeMapLayer( layer->id() );
103+
QgsMapLayerRegistry::instance()->removeMapLayers(
104+
QStringList() << layer->id() );
104105
}
105106
}
106107
}

‎src/mapserver/qgswmsserver.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,8 @@ QStringList QgsWMSServer::layerSet( const QStringList &layersList,
14271427
if ( theMapLayer )
14281428
{
14291429
layerKeys.push_front( theMapLayer->id() );
1430-
QgsMapLayerRegistry::instance()->addMapLayer( theMapLayer, false );
1430+
QgsMapLayerRegistry::instance()->addMapLayers(
1431+
QList<QgsMapLayer *>() << theMapLayer, false );
14311432
}
14321433
else
14331434
{

‎src/plugins/georeferencer/qgsgeorefplugingui.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ QgsGeorefPluginGui::~QgsGeorefPluginGui()
146146
// delete layer (and don't signal it as it's our private layer)
147147
if ( mLayer )
148148
{
149-
QgsMapLayerRegistry::instance()->removeMapLayer( mLayer->id(), false );
149+
QgsMapLayerRegistry::instance()->removeMapLayers(
150+
(QStringList() << mLayer->id()), false );
150151
}
151152

152153
delete mToolZoomIn;
@@ -251,7 +252,8 @@ void QgsGeorefPluginGui::openRaster()
251252

252253
//delete any old rasterlayers
253254
if ( mLayer )
254-
QgsMapLayerRegistry::instance()->removeMapLayer( mLayer->id(), false );
255+
QgsMapLayerRegistry::instance()->removeMapLayers(
256+
QStringList() << mLayer->id(), false );
255257

256258
// Add raster
257259
addRaster( mRasterFileName );
@@ -1039,7 +1041,8 @@ void QgsGeorefPluginGui::addRaster( QString file )
10391041
mLayer = new QgsRasterLayer( file, "Raster" );
10401042

10411043
// so layer is not added to legend
1042-
QgsMapLayerRegistry::instance()->addMapLayer( mLayer, false );
1044+
QgsMapLayerRegistry::instance()->addMapLayers(
1045+
QList<QgsMapLayer *>() << mLayer, false );
10431046

10441047
// add layer to map canvas
10451048
QList<QgsMapCanvasLayer> layers;

‎src/plugins/offline_editing/offline_editing.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ void QgsOfflineEditing::synchronize( QgsLegendInterface* legendInterface )
182182
copySymbology( offlineLayer, remoteLayer );
183183

184184
// register this layer with the central layers registry
185-
QgsMapLayerRegistry::instance()->addMapLayer( remoteLayer, true );
185+
QgsMapLayerRegistry::instance()->addMapLayers(
186+
QList<QgsMapLayer *>() << remoteLayer, true );
186187

187188
// apply layer edit log
188189
QString qgisLayerId = layer->id();
@@ -233,7 +234,8 @@ void QgsOfflineEditing::synchronize( QgsLegendInterface* legendInterface )
233234
}
234235

235236
// remove offline layer
236-
QgsMapLayerRegistry::instance()->removeMapLayer( qgisLayerId, true );
237+
QgsMapLayerRegistry::instance()->removeMapLayers(
238+
(QStringList() << qgisLayerId), true );
237239

238240
// disable offline project
239241
QString projectTitle = QgsProject::instance()->title();
@@ -495,7 +497,8 @@ void QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlite3* db, con
495497
}
496498

497499
// register this layer with the central layers registry
498-
QgsMapLayerRegistry::instance()->addMapLayer( newLayer );
500+
QgsMapLayerRegistry::instance()->addMapLayers(
501+
QList<QgsMapLayer *>() << newLayer );
499502

500503
if ( hasLabels )
501504
{
@@ -567,7 +570,8 @@ void QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlite3* db, con
567570
}
568571

569572
// remove remote layer
570-
QgsMapLayerRegistry::instance()->removeMapLayer( layer->id() );
573+
QgsMapLayerRegistry::instance()->removeMapLayers(
574+
QStringList() << layer->id() );
571575
}
572576
}
573577
}

‎src/plugins/roadgraph/exportdlg.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ QgsVectorLayer* RgExportDlg::mapLayer() const
8585
QList<QgsField> attrList;
8686
attrList.append( QgsField( "one", QVariant::Int ) );
8787
prov->addAttributes( attrList );
88-
QgsMapLayerRegistry::instance()->addMapLayer( myLayer );
88+
QList<QgsMapLayer *> myList;
89+
myList << myLayer;
90+
QgsMapLayerRegistry::instance()->addMapLayers( myList );
8991

9092
}
9193
else

‎src/plugins/spatialquery/qgsspatialquerydialog.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@ bool QgsSpatialQueryDialog::addLayerSubset( QString name, QString subset )
298298
delete addLyr;
299299
return false;
300300
}
301-
QgsMapLayerRegistry::instance()->addMapLayer( addLyr );
301+
QgsMapLayerRegistry::instance()->addMapLayers(
302+
QList<QgsMapLayer *>() << addLyr );
302303
return true;
303304
} // bool QgsSpatialQueryDialog::addLayerSubset( QString name, QString subset )
304305

‎src/plugins/sqlanywhere/sqlanywhere.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ void SqlAnywhere::addSqlAnywhereLayer()
152152
SaDebugMsg( "Beautifying layer name. new: " + layer->name() );
153153

154154
// register this layer with the central layers registry
155-
QgsMapLayerRegistry::instance()->addMapLayer(( QgsVectorLayer* )layer );
155+
QList<QgsMapLayer *> myList;
156+
myList << ( QgsVectorLayer* )layer;
157+
QgsMapLayerRegistry::instance()->addMapLayers( myList );
156158
}
157159
else
158160
{

‎tests/src/core/regression992.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ void Regression992::initTestCase()
7575
mpRasterLayer = new QgsRasterLayer( myRasterFileInfo.filePath(),
7676
myRasterFileInfo.completeBaseName() );
7777
// Register the layer with the registry
78-
QgsMapLayerRegistry::instance()->addMapLayer( mpRasterLayer );
78+
QList<QgsMapLayer *> myList;
79+
myList << mpRasterLayer;
80+
QgsMapLayerRegistry::instance()->addMapLayers( myList );
7981
// add the test layer to the maprender
8082
mpMapRenderer = new QgsMapRenderer();
8183
QStringList myLayers;

‎tests/src/core/testqgsmaprenderer.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ void TestQgsMapRenderer::initTestCase()
166166
mpPolysLayer = new QgsVectorLayer( myPolyFileInfo.filePath(),
167167
myPolyFileInfo.completeBaseName(), "ogr" );
168168
// Register the layer with the registry
169-
QgsMapLayerRegistry::instance()->addMapLayer( mpPolysLayer );
169+
QgsMapLayerRegistry::instance()->addMapLayers(
170+
QList<QgsMapLayer *>() << mpPolysLayer );
170171
// add the test layer to the maprender
171172
mpMapRenderer = new QgsMapRenderer();
172173
QStringList myLayers;

‎tests/src/core/testqgsrasterlayer.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,10 @@ void TestQgsRasterLayer::initTestCase()
9090
mpLandsatRasterLayer = new QgsRasterLayer( myLandsatRasterFileInfo.filePath(),
9191
myLandsatRasterFileInfo.completeBaseName() );
9292
// Register the layer with the registry
93-
QgsMapLayerRegistry::instance()->addMapLayer( mpRasterLayer );
94-
QgsMapLayerRegistry::instance()->addMapLayer( mpLandsatRasterLayer );
93+
QgsMapLayerRegistry::instance()->addMapLayers(
94+
QList<QgsMapLayer *>() << mpRasterLayer );
95+
QgsMapLayerRegistry::instance()->addMapLayers(
96+
QList<QgsMapLayer *>() << mpLandsatRasterLayer );
9597
// add the test layer to the maprender
9698
mpMapRenderer = new QgsMapRenderer();
9799
QStringList myLayers;
@@ -237,8 +239,10 @@ void TestQgsRasterLayer::registry()
237239
QgsRasterLayer * mypLayer = new QgsRasterLayer( myRasterFileInfo.filePath(),
238240
myRasterFileInfo.completeBaseName() );
239241

240-
QgsMapLayerRegistry::instance()->addMapLayer( mypLayer, false );
241-
QgsMapLayerRegistry::instance()->removeMapLayer( mypLayer->id() );
242+
QgsMapLayerRegistry::instance()->addMapLayers(
243+
QList<QgsMapLayer *>() << mypLayer, false );
244+
QgsMapLayerRegistry::instance()->removeMapLayers(
245+
QStringList() << mypLayer->id() );
242246
//cleanup
243247
//delete mypLayer;
244248
}

‎tests/src/core/testqgsrenderers.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ void TestQgsRenderers::initTestCase()
9090
mpPointsLayer = new QgsVectorLayer( myPointFileInfo.filePath(),
9191
myPointFileInfo.completeBaseName(), "ogr" );
9292
// Register the layer with the registry
93-
QgsMapLayerRegistry::instance()->addMapLayer( mpPointsLayer );
93+
QgsMapLayerRegistry::instance()->addMapLayers(
94+
QList<QgsMapLayer *>() << mpPointsLayer );
9495

9596
//
9697
//create a poly layer that will be used in all tests...
@@ -100,7 +101,8 @@ void TestQgsRenderers::initTestCase()
100101
mpPolysLayer = new QgsVectorLayer( myPolyFileInfo.filePath(),
101102
myPolyFileInfo.completeBaseName(), "ogr" );
102103
// Register the layer with the registry
103-
QgsMapLayerRegistry::instance()->addMapLayer( mpPolysLayer );
104+
QgsMapLayerRegistry::instance()->addMapLayers(
105+
QList<QgsMapLayer *>() << mpPolysLayer );
104106

105107

106108
//
@@ -111,7 +113,8 @@ void TestQgsRenderers::initTestCase()
111113
mpLinesLayer = new QgsVectorLayer( myLineFileInfo.filePath(),
112114
myLineFileInfo.completeBaseName(), "ogr" );
113115
// Register the layer with the registry
114-
QgsMapLayerRegistry::instance()->addMapLayer( mpLinesLayer );
116+
QgsMapLayerRegistry::instance()->addMapLayers(
117+
QList<QgsMapLayer *>() << mpLinesLayer );
115118
//
116119
// We only need maprender instead of mapcanvas
117120
// since maprender does not require a qui

‎tests/src/core/testqgsvectorlayer.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ class TestQgsVectorLayer: public QObject
8181
mpNonSpatialLayer = new QgsVectorLayer( myDbfFileInfo.filePath(),
8282
myDbfFileInfo.completeBaseName(), "ogr" );
8383
// Register the layer with the registry
84-
QgsMapLayerRegistry::instance()->addMapLayer( mpNonSpatialLayer );
84+
QgsMapLayerRegistry::instance()->addMapLayers(
85+
QList<QgsMapLayer *>() << mpNonSpatialLayer );
8586
//
8687
//create a point layer that will be used in all tests...
8788
//
@@ -90,7 +91,8 @@ class TestQgsVectorLayer: public QObject
9091
mpPointsLayer = new QgsVectorLayer( myPointFileInfo.filePath(),
9192
myPointFileInfo.completeBaseName(), "ogr" );
9293
// Register the layer with the registry
93-
QgsMapLayerRegistry::instance()->addMapLayer( mpPointsLayer );
94+
QgsMapLayerRegistry::instance()->addMapLayers(
95+
QList<QgsMapLayer *>() << mpPointsLayer );
9496

9597
//
9698
//create a poly layer that will be used in all tests...
@@ -100,7 +102,8 @@ class TestQgsVectorLayer: public QObject
100102
mpPolysLayer = new QgsVectorLayer( myPolyFileInfo.filePath(),
101103
myPolyFileInfo.completeBaseName(), "ogr" );
102104
// Register the layer with the registry
103-
QgsMapLayerRegistry::instance()->addMapLayer( mpPolysLayer );
105+
QgsMapLayerRegistry::instance()->addMapLayers(
106+
QList<QgsMapLayer *>() << mpPolysLayer );
104107

105108

106109
//
@@ -111,7 +114,8 @@ class TestQgsVectorLayer: public QObject
111114
mpLinesLayer = new QgsVectorLayer( myLineFileInfo.filePath(),
112115
myLineFileInfo.completeBaseName(), "ogr" );
113116
// Register the layer with the registry
114-
QgsMapLayerRegistry::instance()->addMapLayer( mpLinesLayer );
117+
QgsMapLayerRegistry::instance()->addMapLayers(
118+
QList<QgsMapLayer *>() << mpLinesLayer );
115119
//
116120
// We only need maprender instead of mapcanvas
117121
// since maprender does not require a qui

0 commit comments

Comments
 (0)