Variable rename (get rid of "my" prefix)

elpaso · elpaso · commit acb6f42d605f · 2018-11-05T10:24:35.000+01:00
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -925,26 +925,25 @@ bool QgsProject::addLayer( const QDomElement &layerElem, QList<QDomNode> &broken
   if ( !mapLayer )
   {
     QgsDebugMsg( QStringLiteral( "Unable to create layer" ) );
-
     return false;
   }
 
   Q_CHECK_PTR( mapLayer ); // NOLINT
 
   // have the layer restore state that is stored in Dom node
   bool layerIsValid = mapLayer->readLayerXml( layerElem, context ) && mapLayer->isValid();
-  QList<QgsMapLayer *> myLayers;
-  myLayers << mapLayer;
+  QList<QgsMapLayer *> newLayers;
+  newLayers << mapLayer;
   if ( layerIsValid )
   {
     emit readMapLayer( mapLayer, layerElem );
-    addMapLayers( myLayers );
+    addMapLayers( newLayers );
   }
   else
   {
     // It's a bad layer: do not add to legend (the user will decide if she wants to do so)
-    addMapLayers( myLayers, false );
-    myLayers.first();
+    addMapLayers( newLayers, false );
+    newLayers.first();
     QgsDebugMsg( "Unable to load " + type + " layer" );
     brokenNodes.push_back( layerElem );
   }

Original file line number	Diff line number	Diff line change
`@@ -925,26 +925,25 @@ bool QgsProject::addLayer( const QDomElement &layerElem, QList<QDomNode> &broken`
`925`	`925`	`if ( !mapLayer )`
`926`	`926`	`{`
`927`	`927`	`QgsDebugMsg( QStringLiteral( "Unable to create layer" ) );`
`928`		`-`
`929`	`928`	`return false;`
`930`	`929`	`}`
`931`	`930`
`932`	`931`	`Q_CHECK_PTR( mapLayer ); // NOLINT`
`933`	`932`
`934`	`933`	`// have the layer restore state that is stored in Dom node`
`935`	`934`	`bool layerIsValid = mapLayer->readLayerXml( layerElem, context ) && mapLayer->isValid();`
`936`		`- QList<QgsMapLayer *> myLayers;`
`937`		`- myLayers << mapLayer;`
	`935`	`+ QList<QgsMapLayer *> newLayers;`
	`936`	`+ newLayers << mapLayer;`
`938`	`937`	`if ( layerIsValid )`
`939`	`938`	`{`
`940`	`939`	`emit readMapLayer( mapLayer, layerElem );`
`941`		`- addMapLayers( myLayers );`
	`940`	`+ addMapLayers( newLayers );`
`942`	`941`	`}`
`943`	`942`	`else`
`944`	`943`	`{`
`945`	`944`	`// It's a bad layer: do not add to legend (the user will decide if she wants to do so)`
`946`		`- addMapLayers( myLayers, false );`
`947`		`- myLayers.first();`
	`945`	`+ addMapLayers( newLayers, false );`
	`946`	`+ newLayers.first();`
`948`	`947`	`QgsDebugMsg( "Unable to load " + type + " layer" );`
`949`	`948`	`brokenNodes.push_back( layerElem );`
`950`	`949`	`}`