indentation update

qgis · Jun 10, 2015 · 4e86109 · 4e86109
1 parent 49286b3
commit 4e86109
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 22 deletions.
diff --git a/src/analysis/openstreetmap/qgsosmdatabase.cpp b/src/analysis/openstreetmap/qgsosmdatabase.cpp
@@ -476,7 +476,7 @@ void QgsOSMDatabase::exportSpatiaLiteWays( bool closed, const QString& tableName
     {
       // make sure tags that indicate areas are taken into consideration when deciding on a closed way is or isn't an area
       // and allow for a closed way to be exported both as a polygon and a line in case both area and non-area tags are present
-      if ( ( t.value( "area" ) != "yes" && !t.contains( "amenity" ) && !t.contains( "landuse" ) && !t.contains( "building" ) && !t.contains( "natural" ) && !t.contains( "leisure" ) && !t.contains( "aeroway" ) ) || !closed )
+      if (( t.value( "area" ) != "yes" && !t.contains( "amenity" ) && !t.contains( "landuse" ) && !t.contains( "building" ) && !t.contains( "natural" ) && !t.contains( "leisure" ) && !t.contains( "aeroway" ) ) || !closed )
         isArea = false;
     }
 

diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -506,7 +506,7 @@ void QgsVectorLayerFeatureIterator::prepareExpressions()
         if ( mRequest.flags() & QgsFeatureRequest::SubsetOfAttributes )
         {
           QgsAttributeList attrs;
-          Q_FOREACH( const QString& col, exp->referencedColumns() )
+          Q_FOREACH ( const QString& col, exp->referencedColumns() )
           {
             attrs.append( mSource->mFields.fieldNameIndex( col ) );
           }

diff --git a/src/plugins/raster_terrain_analysis/qgsruggednessindex.cpp b/src/plugins/raster_terrain_analysis/qgsruggednessindex.cpp
@@ -16,4 +16,3 @@
  ***************************************************************************/
 
 #include "qgsruggednessindex.h"
-
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -1560,7 +1560,7 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
           {
             continue;
           }
-          QgsPoint layerInfoPoint = mMapRenderer->mapToLayerCoordinates( currentLayer, *(infoPoint.data()) );
+          QgsPoint layerInfoPoint = mMapRenderer->mapToLayerCoordinates( currentLayer, *( infoPoint.data() ) );
           if ( featureInfoFromRasterLayer( rasterLayer, &layerInfoPoint, result, layerElement, version, infoFormat ) != 0 )
           {
             continue;

diff --git a/tests/src/analysis/testqgsrastercalculator.cpp b/tests/src/analysis/testqgsrastercalculator.cpp
@@ -527,4 +527,3 @@ void TestQgsRasterCalculator::calcWithReprojectedLayers()
 
 QTEST_MAIN( TestQgsRasterCalculator )
 #include "testqgsrastercalculator.moc"
-
diff --git a/tests/src/core/testcontrastenhancements.cpp b/tests/src/core/testcontrastenhancements.cpp
@@ -104,4 +104,3 @@ void TestContrastEnhancements::linearMinMaxEnhancementTest()
 }
 QTEST_MAIN( TestContrastEnhancements )
 #include "testcontrastenhancements.moc"
-
diff --git a/tests/src/core/testqgsapplication.cpp b/tests/src/core/testqgsapplication.cpp
@@ -71,4 +71,3 @@ void TestQgsApplication::checkGdalSkip()
 
 QTEST_MAIN( TestQgsApplication )
 #include "testqgsapplication.moc"
-
diff --git a/tests/src/core/testqgscomposerdd.cpp b/tests/src/core/testqgscomposerdd.cpp
@@ -146,4 +146,3 @@ void TestQgsComposerDD::ddEvaluate()
 
 QTEST_MAIN( TestQgsComposerDD )
 #include "testqgscomposerdd.moc"
-
diff --git a/tests/src/core/testqgscomposertable.cpp b/tests/src/core/testqgscomposertable.cpp
@@ -518,4 +518,3 @@ void TestQgsComposerTable::attributeTableVisibleOnly()
 
 QTEST_MAIN( TestQgsComposerTable )
 #include "testqgscomposertable.moc"
-
diff --git a/tests/src/core/testqgscomposertablev2.cpp b/tests/src/core/testqgscomposertablev2.cpp
@@ -626,4 +626,3 @@ void TestQgsComposerTableV2::removeDuplicates()
 
 QTEST_MAIN( TestQgsComposerTableV2 )
 #include "testqgscomposertablev2.moc"
-
diff --git a/tests/src/core/testqgscomposition.cpp b/tests/src/core/testqgscomposition.cpp
@@ -253,4 +253,3 @@ void TestQgsComposition::pageIsEmpty()
 
 QTEST_MAIN( TestQgsComposition )
 #include "testqgscomposition.moc"
-
diff --git a/tests/src/core/testqgscoordinatetransform.cpp b/tests/src/core/testqgscoordinatetransform.cpp
@@ -75,4 +75,3 @@ void TestQgsCoordinateTransform::transformBoundingBox()
 
 QTEST_MAIN( TestQgsCoordinateTransform )
 #include "testqgscoordinatetransform.moc"
-
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -1151,4 +1151,3 @@ class TestQgsExpression: public QObject
 QTEST_MAIN( TestQgsExpression )
 
 #include "testqgsexpression.moc"
-
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -682,4 +682,3 @@ void TestQgsGeometry::dumpPolyline( QgsPolyline &thePolyline )
 
 QTEST_MAIN( TestQgsGeometry )
 #include "testqgsgeometry.moc"
-
diff --git a/tests/src/core/testqgsgeometryimport.cpp b/tests/src/core/testqgsgeometryimport.cpp
@@ -246,4 +246,3 @@ bool TestQgsGeometryImport::compareLineStrings( const QgsPolyline& polyline, QVa
 
 QTEST_MAIN( TestQgsGeometryImport )
 #include "testqgsgeometryimport.moc"
-
diff --git a/tests/src/core/testqgspainteffect.cpp b/tests/src/core/testqgspainteffect.cpp
@@ -126,7 +126,7 @@ class TestQgsPaintEffect: public QObject
 
 
 TestQgsPaintEffect::TestQgsPaintEffect()
-   : mPicture( 0 )
+    : mPicture( 0 )
 {
 
 }

diff --git a/tests/src/core/testqgspointlocator.cpp b/tests/src/core/testqgspointlocator.cpp
@@ -261,4 +261,3 @@ class TestQgsPointLocator : public QObject
 QTEST_MAIN( TestQgsPointLocator )
 
 #include "testqgspointlocator.moc"
-
diff --git a/tests/src/core/testqgsrulebasedrenderer.cpp b/tests/src/core/testqgsrulebasedrenderer.cpp
@@ -176,4 +176,3 @@ class TestQgsRuleBasedRenderer: public QObject
 QTEST_MAIN( TestQgsRuleBasedRenderer )
 
 #include "testqgsrulebasedrenderer.moc"
-
diff --git a/tests/src/core/testqgsscaleexpression.cpp b/tests/src/core/testqgsscaleexpression.cpp
@@ -86,4 +86,3 @@ class TestQgsScaleExpression: public QObject
 QTEST_MAIN( TestQgsScaleExpression )
 
 #include "testqgsscaleexpression.moc"
-
diff --git a/tests/src/core/testqgsvectorfilewriter.cpp b/tests/src/core/testqgsvectorfilewriter.cpp
@@ -400,4 +400,3 @@ void TestQgsVectorFileWriter::projectedPlygonGridTest()
 
 QTEST_MAIN( TestQgsVectorFileWriter )
 #include "testqgsvectorfilewriter.moc"
-
diff --git a/tests/src/core/testqgsvectorlayercache.cpp b/tests/src/core/testqgsvectorlayercache.cpp
@@ -241,4 +241,3 @@ void TestVectorLayerCache::onCommittedFeaturesAdded( QString layerId, QgsFeature
 
 QTEST_MAIN( TestVectorLayerCache )
 #include "testqgsvectorlayercache.moc"
-
diff --git a/tests/src/gui/testqgsquickprint.cpp b/tests/src/gui/testqgsquickprint.cpp
@@ -177,4 +177,3 @@ bool TestQgsQuickPrint::imageCheck( QString theTestType )
 
 QTEST_MAIN( TestQgsQuickPrint )
 #include "testqgsquickprint.moc"
-