diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
index f3fe37f306c..bc36746f8fe 100644
--- a/src/app/legend/qgslegend.cpp
+++ b/src/app/legend/qgslegend.cpp
@@ -284,7 +284,7 @@ void QgsLegend::removeGroup( int groupIndex )
 void QgsLegend::removeLayers( QStringList theLayers )
 {
   QgsDebugMsg( "Entering." );
-  foreach (const QString &myId, theLayers)
+  foreach( const QString &myId, theLayers )
   {
     bool invLayerRemoved = false;
 
@@ -322,7 +322,7 @@ void QgsLegend::removeLayer( QString theLayer )
 {
   QStringList myList;
   myList << theLayer;
-  removeLayers(myList);
+  removeLayers( myList );
 }
 
 void QgsLegend::mousePressEvent( QMouseEvent * e )
@@ -875,9 +875,9 @@ void QgsLegend::addLayers( QList<QgsMapLayer *> theLayerList )
   if ( layers().count() > 0 ) myFirstLayerFlag = true;
 
   //iteratively add the layers to the canvas
-  for (int i = 0; i < theLayerList.size(); ++i)
+  for ( int i = 0; i < theLayerList.size(); ++i )
   {
-    QgsMapLayer * layer = theLayerList.at(i);
+    QgsMapLayer * layer = theLayerList.at( i );
     QgsLegendLayer* llayer = new QgsLegendLayer( layer );
     if ( !QgsProject::instance()->layerIsEmbedded( layer->id() ).isEmpty() )
     {
@@ -928,11 +928,11 @@ void QgsLegend::addLayers( QList<QgsMapLayer *> theLayerList )
 
     updateMapCanvasLayerSet();
     emit itemAdded( indexFromItem( llayer ) );
-}
+  }
   // first layer?
   if ( myFirstLayerFlag )
   {
-    QgsMapLayer * myFirstLayer = theLayerList.at(0);
+    QgsMapLayer * myFirstLayer = theLayerList.at( 0 );
     if ( !mMapCanvas->mapRenderer()->hasCrsTransformEnabled() )
       mMapCanvas->mapRenderer()->setDestinationCrs( myFirstLayer->crs() );
     mMapCanvas->zoomToFullExtent();
@@ -1173,7 +1173,7 @@ void QgsLegend::removeGroup( QgsLegendGroup *lg )
 
     if ( cl )
       QgsMapLayerRegistry::instance()->removeMapLayers(
-            QStringList() << cl->layer()->id() );
+        QStringList() << cl->layer()->id() );
     else if ( cg )
       removeGroup( cg );
 
@@ -2422,7 +2422,7 @@ void QgsLegend::removeSelectedLayers()
     if ( ll && ll->layer() )
     {
       QgsMapLayerRegistry::instance()->removeMapLayers(
-            QStringList() << ll->layer()->id() );
+        QStringList() << ll->layer()->id() );
       continue;
     }
   }
diff --git a/src/browser/qgsbrowser.cpp b/src/browser/qgsbrowser.cpp
index eb4108b579d..97eb960b58f 100644
--- a/src/browser/qgsbrowser.cpp
+++ b/src/browser/qgsbrowser.cpp
@@ -246,7 +246,7 @@ bool QgsBrowser::layerClicked( QgsLayerItem *item )
   QgsDebugMsg( "Layer created" );
 
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << mLayer );
+    QList<QgsMapLayer *>() << mLayer );
 
   return true;
 }
diff --git a/src/core/qgspluginlayerregistry.cpp b/src/core/qgspluginlayerregistry.cpp
index 21a1cec8638..a230ac93cbc 100644
--- a/src/core/qgspluginlayerregistry.cpp
+++ b/src/core/qgspluginlayerregistry.cpp
@@ -101,7 +101,7 @@ bool QgsPluginLayerRegistry::removePluginLayerType( QString typeName )
       if ( pl->pluginLayerType() == typeName )
       {
         QgsMapLayerRegistry::instance()->removeMapLayers(
-              QStringList() << layer->id() );
+          QStringList() << layer->id() );
       }
     }
   }
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
index 254914074cc..bb98dc06aba 100644
--- a/src/mapserver/qgswmsserver.cpp
+++ b/src/mapserver/qgswmsserver.cpp
@@ -1428,7 +1428,7 @@ QStringList QgsWMSServer::layerSet( const QStringList &layersList,
       {
         layerKeys.push_front( theMapLayer->id() );
         QgsMapLayerRegistry::instance()->addMapLayers(
-              QList<QgsMapLayer *>() << theMapLayer, false );
+          QList<QgsMapLayer *>() << theMapLayer, false );
       }
       else
       {
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
index 50a808f7790..3860e59bb3f 100644
--- a/src/plugins/georeferencer/qgsgeorefplugingui.cpp
+++ b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -147,7 +147,7 @@ QgsGeorefPluginGui::~QgsGeorefPluginGui()
   if ( mLayer )
   {
     QgsMapLayerRegistry::instance()->removeMapLayers(
-          (QStringList() << mLayer->id()), false );
+      ( QStringList() << mLayer->id() ), false );
   }
 
   delete mToolZoomIn;
@@ -253,7 +253,7 @@ void QgsGeorefPluginGui::openRaster()
   //delete any old rasterlayers
   if ( mLayer )
     QgsMapLayerRegistry::instance()->removeMapLayers(
-          QStringList() << mLayer->id(), false );
+      QStringList() << mLayer->id(), false );
 
   // Add raster
   addRaster( mRasterFileName );
@@ -1042,7 +1042,7 @@ void QgsGeorefPluginGui::addRaster( QString file )
 
   // so layer is not added to legend
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << mLayer, false );
+    QList<QgsMapLayer *>() << mLayer, false );
 
   // add layer to map canvas
   QList<QgsMapCanvasLayer> layers;
diff --git a/src/plugins/offline_editing/offline_editing.cpp b/src/plugins/offline_editing/offline_editing.cpp
index 14e31c33ab0..1c00b3f4c42 100644
--- a/src/plugins/offline_editing/offline_editing.cpp
+++ b/src/plugins/offline_editing/offline_editing.cpp
@@ -183,7 +183,7 @@ void QgsOfflineEditing::synchronize( QgsLegendInterface* legendInterface )
 
       // register this layer with the central layers registry
       QgsMapLayerRegistry::instance()->addMapLayers(
-            QList<QgsMapLayer *>() << remoteLayer, true );
+        QList<QgsMapLayer *>() << remoteLayer, true );
 
       // apply layer edit log
       QString qgisLayerId = layer->id();
@@ -235,7 +235,7 @@ void QgsOfflineEditing::synchronize( QgsLegendInterface* legendInterface )
 
       // remove offline layer
       QgsMapLayerRegistry::instance()->removeMapLayers(
-            (QStringList() << qgisLayerId), true );
+        ( QStringList() << qgisLayerId ), true );
 
       // disable offline project
       QString projectTitle = QgsProject::instance()->title();
@@ -498,7 +498,7 @@ void QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlite3* db, con
 
       // register this layer with the central layers registry
       QgsMapLayerRegistry::instance()->addMapLayers(
-            QList<QgsMapLayer *>() << newLayer );
+        QList<QgsMapLayer *>() << newLayer );
 
       if ( hasLabels )
       {
@@ -571,7 +571,7 @@ void QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlite3* db, con
 
       // remove remote layer
       QgsMapLayerRegistry::instance()->removeMapLayers(
-            QStringList() << layer->id() );
+        QStringList() << layer->id() );
     }
   }
 }
diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
index a3fd2d0d325..c38eab83627 100644
--- a/src/plugins/spatialquery/qgsspatialquerydialog.cpp
+++ b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@@ -299,7 +299,7 @@ bool QgsSpatialQueryDialog::addLayerSubset( QString name, QString subset )
     return false;
   }
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << addLyr );
+    QList<QgsMapLayer *>() << addLyr );
   return true;
 } // bool QgsSpatialQueryDialog::addLayerSubset( QString name, QString subset )
 
diff --git a/tests/src/core/testqgsmaprenderer.cpp b/tests/src/core/testqgsmaprenderer.cpp
index 650c3ea0d1f..f0aa8727eb3 100644
--- a/tests/src/core/testqgsmaprenderer.cpp
+++ b/tests/src/core/testqgsmaprenderer.cpp
@@ -167,7 +167,7 @@ void TestQgsMapRenderer::initTestCase()
                                      myPolyFileInfo.completeBaseName(), "ogr" );
   // Register the layer with the registry
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << mpPolysLayer );
+    QList<QgsMapLayer *>() << mpPolysLayer );
   // add the test layer to the maprender
   mpMapRenderer = new QgsMapRenderer();
   QStringList myLayers;
diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp
index 1a82553665d..3a7b1197c9f 100644
--- a/tests/src/core/testqgsrasterlayer.cpp
+++ b/tests/src/core/testqgsrasterlayer.cpp
@@ -91,9 +91,9 @@ void TestQgsRasterLayer::initTestCase()
       myLandsatRasterFileInfo.completeBaseName() );
   // Register the layer with the registry
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << mpRasterLayer );
+    QList<QgsMapLayer *>() << mpRasterLayer );
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << mpLandsatRasterLayer );
+    QList<QgsMapLayer *>() << mpLandsatRasterLayer );
   // add the test layer to the maprender
   mpMapRenderer = new QgsMapRenderer();
   QStringList myLayers;
@@ -240,9 +240,9 @@ void TestQgsRasterLayer::registry()
       myRasterFileInfo.completeBaseName() );
 
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << mypLayer, false );
+    QList<QgsMapLayer *>() << mypLayer, false );
   QgsMapLayerRegistry::instance()->removeMapLayers(
-        QStringList() << mypLayer->id() );
+    QStringList() << mypLayer->id() );
   //cleanup
   //delete mypLayer;
 }
diff --git a/tests/src/core/testqgsrenderers.cpp b/tests/src/core/testqgsrenderers.cpp
index 44fe6aaaa01..aedfbff027d 100644
--- a/tests/src/core/testqgsrenderers.cpp
+++ b/tests/src/core/testqgsrenderers.cpp
@@ -91,7 +91,7 @@ void TestQgsRenderers::initTestCase()
                                       myPointFileInfo.completeBaseName(), "ogr" );
   // Register the layer with the registry
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << mpPointsLayer );
+    QList<QgsMapLayer *>() << mpPointsLayer );
 
   //
   //create a poly layer that will be used in all tests...
@@ -102,7 +102,7 @@ void TestQgsRenderers::initTestCase()
                                      myPolyFileInfo.completeBaseName(), "ogr" );
   // Register the layer with the registry
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << mpPolysLayer );
+    QList<QgsMapLayer *>() << mpPolysLayer );
 
 
   //
@@ -114,7 +114,7 @@ void TestQgsRenderers::initTestCase()
                                      myLineFileInfo.completeBaseName(), "ogr" );
   // Register the layer with the registry
   QgsMapLayerRegistry::instance()->addMapLayers(
-        QList<QgsMapLayer *>() << mpLinesLayer );
+    QList<QgsMapLayer *>() << mpLinesLayer );
   //
   // We only need maprender instead of mapcanvas
   // since maprender does not require a qui
diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp
index 24371d6fff3..58cbb109c8c 100644
--- a/tests/src/core/testqgsvectorlayer.cpp
+++ b/tests/src/core/testqgsvectorlayer.cpp
@@ -82,7 +82,7 @@ class TestQgsVectorLayer: public QObject
                                               myDbfFileInfo.completeBaseName(), "ogr" );
       // Register the layer with the registry
       QgsMapLayerRegistry::instance()->addMapLayers(
-            QList<QgsMapLayer *>() << mpNonSpatialLayer );
+        QList<QgsMapLayer *>() << mpNonSpatialLayer );
       //
       //create a point layer that will be used in all tests...
       //
@@ -92,7 +92,7 @@ class TestQgsVectorLayer: public QObject
                                           myPointFileInfo.completeBaseName(), "ogr" );
       // Register the layer with the registry
       QgsMapLayerRegistry::instance()->addMapLayers(
-            QList<QgsMapLayer *>() << mpPointsLayer );
+        QList<QgsMapLayer *>() << mpPointsLayer );
 
       //
       //create a poly layer that will be used in all tests...
@@ -103,7 +103,7 @@ class TestQgsVectorLayer: public QObject
                                          myPolyFileInfo.completeBaseName(), "ogr" );
       // Register the layer with the registry
       QgsMapLayerRegistry::instance()->addMapLayers(
-            QList<QgsMapLayer *>() << mpPolysLayer );
+        QList<QgsMapLayer *>() << mpPolysLayer );
 
 
       //
@@ -115,7 +115,7 @@ class TestQgsVectorLayer: public QObject
                                          myLineFileInfo.completeBaseName(), "ogr" );
       // Register the layer with the registry
       QgsMapLayerRegistry::instance()->addMapLayers(
-            QList<QgsMapLayer *>() << mpLinesLayer );
+        QList<QgsMapLayer *>() << mpLinesLayer );
       //
       // We only need maprender instead of mapcanvas
       // since maprender does not require a qui