indentation update

qgis · Nov 24, 2013 · f665ddc · f665ddc
1 parent 843504e
commit f665ddc
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/python/plugins/processing/tools/vector.py b/python/plugins/processing/tools/vector.py
@@ -44,7 +44,7 @@ class Features:
         def __init__(self, layer):
             self.layer = layer
             self.selection = False
-            self.iter = layer.getFeatures()            
+            self.iter = layer.getFeatures()
             if ProcessingConfig.getSetting(ProcessingConfig.USE_SELECTED):
                 selected = layer.selectedFeatures()
                 if len(selected) > 0:

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -664,7 +664,7 @@ void QgsComposer::showItemOptions( QgsComposerItem* item )
 
 void QgsComposer::on_mActionOptions_triggered()
 {
-  mQgis->showOptionsDialog( this, QString("mOptionsPageComposer") );
+  mQgis->showOptionsDialog( this, QString( "mOptionsPageComposer" ) );
 }
 
 QgsMapCanvas *QgsComposer::mapCanvas( void )

diff --git a/src/app/qgsclipboard.cpp b/src/app/qgsclipboard.cpp
@@ -147,7 +147,7 @@ QgsFeatureList QgsClipboard::copyOf( const QgsFields &fields )
 {
   QgsDebugMsg( "returning clipboard." );
   if ( !mUseSystemClipboard )
-      return mFeatureClipboard;
+    return mFeatureClipboard;
 
   QClipboard *cb = QApplication::clipboard();
 

diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -42,7 +42,7 @@ QgsAtlasComposition::QgsAtlasComposition( QgsComposition* composition ) :
   QgsExpression::setSpecialColumn( "$numpages", QVariant(( int )1 ) );
   QgsExpression::setSpecialColumn( "$numfeatures", QVariant(( int )0 ) );
   QgsExpression::setSpecialColumn( "$atlasfeatureid", QVariant(( int )0 ) );
-  QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue(QgsGeometry()));
+  QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue( QgsGeometry() ) );
 }
 
 QgsAtlasComposition::~QgsAtlasComposition()
@@ -58,9 +58,9 @@ void QgsAtlasComposition::setCoverageLayer( QgsVectorLayer* layer )
 
   // Grab the first feature so that user can use it to test the style in rules.
   QgsFeature fet;
-  layer->getFeatures().nextFeature(fet);
+  layer->getFeatures().nextFeature( fet );
   QgsExpression::setSpecialColumn( "$atlasfeatureid", fet.id() );
-  QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue(*fet.geometry()));
+  QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue( *fet.geometry() ) );
 }
 
 //
@@ -234,7 +234,7 @@ void QgsAtlasComposition::prepareForFeature( int featureI )
   // retrieve the next feature, based on its id
   mCoverageLayer->getFeatures( QgsFeatureRequest().setFilterFid( mFeatureIds[ featureI ] ) ).nextFeature( mCurrentFeature );
   QgsExpression::setSpecialColumn( "$atlasfeatureid", mCurrentFeature.id() );
-  QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue(*mCurrentFeature.geometry()));
+  QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue( *mCurrentFeature.geometry() ) );
 
   if ( !mSingleFile && mFilenamePattern.size() > 0 )
   {

diff --git a/src/core/qgsfeatureiterator.h b/src/core/qgsfeatureiterator.h
@@ -39,7 +39,7 @@ class CORE_EXPORT QgsAbstractFeatureIterator
     //! end of iterating: free the resources / lock
     virtual bool close() = 0;
 
-  protected:    
+  protected:
     /**
      * If you write a feature iterator for your provider, this is the method you
      * need to implement!!

diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp
@@ -76,9 +76,9 @@ void QgsVectorLayerCache::setFullCache( bool fullCache )
     setCacheSize( mLayer->featureCount() + 100 );
 
     // Initialize the cache...
-    QgsFeatureIterator it ( new QgsCachedFeatureWriterIterator( this, QgsFeatureRequest()
-                                                            .setSubsetOfAttributes( mCachedAttributes )
-                                                            .setFlags( !mCacheGeometry ? QgsFeatureRequest::NoGeometry : QgsFeatureRequest::Flags( 0 ) ) ) );
+    QgsFeatureIterator it( new QgsCachedFeatureWriterIterator( this, QgsFeatureRequest()
+                           .setSubsetOfAttributes( mCachedAttributes )
+                           .setFlags( !mCacheGeometry ? QgsFeatureRequest::NoGeometry : QgsFeatureRequest::Flags( 0 ) ) ) );
 
     int i = 0;
 

diff --git a/src/core/symbology-ng/qgsrendererv2registry.cpp b/src/core/symbology-ng/qgsrendererv2registry.cpp
@@ -88,7 +88,7 @@ QgsRendererV2AbstractMetadata* QgsRendererV2Registry::rendererMetadata( QString
   return mRenderers.value( rendererName );
 }
 
-QgsRendererV2Metadata::~QgsRendererV2Metadata(){}
+QgsRendererV2Metadata::~QgsRendererV2Metadata() {}
 
 QStringList QgsRendererV2Registry::renderersList()
 {

diff --git a/src/plugins/globe/globe_plugin_dialog.cpp b/src/plugins/globe/globe_plugin_dialog.cpp
@@ -38,7 +38,7 @@
 #include <osg/DisplaySettings>
 
 //constructor
-QgsGlobePluginDialog::QgsGlobePluginDialog(QWidget* parent, GlobePlugin* globe, Qt::WFlags fl )
+QgsGlobePluginDialog::QgsGlobePluginDialog( QWidget* parent, GlobePlugin* globe, Qt::WFlags fl )
     : QDialog( parent, fl )
     , mGlobe( globe )
 {

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2409,7 +2409,7 @@ QgsRectangle QgsPostgresProvider::extent()
           {
             sql = QString( "SELECT %1(%2,%3,%4)" )
                   .arg( mConnectionRO->majorVersion() < 2 ? "estimated_extent" :
-                        (mConnectionRO->majorVersion() == 2 && mConnectionRO->minorVersion() < 1 ? "st_estimated_extent" : "st_estimatedextent" ) )
+                        ( mConnectionRO->majorVersion() == 2 && mConnectionRO->minorVersion() < 1 ? "st_estimated_extent" : "st_estimatedextent" ) )
                   .arg( quotedValue( mSchemaName ) )
                   .arg( quotedValue( mTableName ) )
                   .arg( quotedValue( mGeometryColumn ) );