indentation update

qgis · Sep 19, 2015 · 25437c1 · 25437c1
1 parent abaeb5f
commit 25437c1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/python/plugins/processing/algs/qgis/OrientedMinimumBoundingBox.py b/python/plugins/processing/algs/qgis/OrientedMinimumBoundingBox.py
@@ -61,7 +61,7 @@ def processAlgorithm(self, progress):
 
         if byFeature and layer.geometryType() == QGis.Point and layer.featureCount() <= 2:
             raise GeoAlgorithmExecutionException(self.tr("Can't calculate an OMBB for each point, it's a point. The number of points must be greater than 2"))
-            
+
         fields = [
             QgsField('AREA', QVariant.Double),
             QgsField('PERIMETER', QVariant.Double),

diff --git a/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
@@ -178,7 +178,7 @@ def __init__(self):
                         SetVectorStyle(), SetRasterStyle(),
                         SelectByExpression(), HypsometricCurves(),
                         SplitLinesWithLines(), CreateConstantRaster(),
-                        FieldsMapper(),SelectByAttributeSum(), Datasources2Vrt(),
+                        FieldsMapper(), SelectByAttributeSum(), Datasources2Vrt(),
                         CheckValidity(), OrientedMinimumBoundingBox()
                         ]
 

diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh
@@ -31,7 +31,7 @@ fi
 
 if [ "$1" = "-c" ]; then
 	echo "Cleaning..."
-	find . \( -name "*.prepare" -o -name "*.astyle" -o -name "*.nocopyright" -o -name "astyle.*.diff" -o -name "sha-*.diff" -o -name "*.sortinc" \) -print -delete
+	find . \( -name "*.prepare" -o -name "*.astyle" -o -name "*.nocopyright" -o -name "astyle.*.diff" -o -name "sha-*.diff" -o -name "*.sortinc" -o -name "*.bom" \) -print -delete
 fi
 
 set -e

diff --git a/src/core/qgsexpressioncontext.h b/src/core/qgsexpressioncontext.h
@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
      qgsexpressioncontext.h
      ----------------------
     Date                 : April 2015

diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
@@ -192,7 +192,7 @@ void QgsStyleV2ManagerDialog::on_tabItemType_currentChanged( int )
     rampTypes << tr( "Gradient" ) << tr( "Random" ) << tr( "ColorBrewer" );
     rampTypes << tr( "cpt-city" ); // todo, only for rasters?
     QMenu* menu = new QMenu( btnAddItem );
-    Q_FOREACH( const QString& rampType, rampTypes )
+    Q_FOREACH ( const QString& rampType, rampTypes )
     {
       menu->addAction( rampType );
     }
@@ -691,7 +691,7 @@ void QgsStyleV2ManagerDialog::removeItem()
 bool QgsStyleV2ManagerDialog::removeSymbol()
 {
   QModelIndexList indexes = listItems->selectionModel()->selectedIndexes();
-  Q_FOREACH( const QModelIndex& index, indexes )
+  Q_FOREACH ( const QModelIndex& index, indexes )
   {
     QString symbolName = index.data().toString();
     // delete from style and update list
@@ -766,7 +766,7 @@ void QgsStyleV2ManagerDialog::exportSelectedItemsImages( QString dir, QString fo
     return;
 
   QModelIndexList indexes =  listItems->selectionModel()->selection().indexes();
-  Q_FOREACH( const QModelIndex& index, indexes )
+  Q_FOREACH ( const QModelIndex& index, indexes )
   {
     QString name = index.data().toString();
     QString path = dir + "/" + name + "." + format;
@@ -1157,11 +1157,11 @@ void QgsStyleV2ManagerDialog::regrouped( QStandardItem *item )
 void QgsStyleV2ManagerDialog::setSymbolsChecked( QStringList symbols )
 {
   QStandardItemModel *model = qobject_cast<QStandardItemModel*>( listItems->model() );
-  Q_FOREACH( const QString& symbol, symbols )
+  Q_FOREACH ( const QString& symbol, symbols )
   {
     QList<QStandardItem*> items = model->findItems( symbol );
-    Q_FOREACH( QStandardItem* item, items )
-    item->setCheckState( Qt::Checked );
+    Q_FOREACH ( QStandardItem* item, items )
+      item->setCheckState( Qt::Checked );
   }
 }
 
@@ -1204,27 +1204,27 @@ void QgsStyleV2ManagerDialog::tagsChanged()
     return;
   }
   // compare old with new to find removed tags
-  Q_FOREACH( const QString &tag, oldtags )
+  Q_FOREACH ( const QString &tag, oldtags )
   {
     if ( !newtags.contains( tag ) )
       removetags.append( tag );
   }
   if ( removetags.size() > 0 )
   {
-    Q_FOREACH( const QModelIndex& index, indexes )
+    Q_FOREACH ( const QModelIndex& index, indexes )
     {
       mStyle->detagSymbol( type, index.data().toString(), removetags );
     }
   }
   // compare new with old to find added tags
-  Q_FOREACH( const QString &tag, newtags )
+  Q_FOREACH ( const QString &tag, newtags )
   {
     if ( !oldtags.contains( tag ) )
       addtags.append( tag );
   }
   if ( addtags.size() > 0 )
   {
-    Q_FOREACH( const QModelIndex& index, indexes )
+    Q_FOREACH ( const QModelIndex& index, indexes )
     {
       mStyle->tagSymbol( type, index.data().toString(), addtags );
     }
@@ -1345,7 +1345,7 @@ void QgsStyleV2ManagerDialog::listitemsContextMenu( const QPoint& point )
   groupList->setTitle( tr( "Apply Group" ) );
 
   QStringList groups = mStyle->groupNames();
-  Q_FOREACH( const QString& group, groups )
+  Q_FOREACH ( const QString& group, groups )
   {
     groupList->addAction( group );
   }
@@ -1368,7 +1368,7 @@ void QgsStyleV2ManagerDialog::listitemsContextMenu( const QPoint& point )
       groupId = mStyle->groupId( selectedItem->text() );
     }
     QModelIndexList indexes =  listItems->selectionModel()->selectedIndexes();
-    Q_FOREACH( const QModelIndex& index, indexes )
+    Q_FOREACH ( const QModelIndex& index, indexes )
     {
       mStyle->group( type, index.data().toString(), groupId );
     }

diff --git a/src/server/qgswmsprojectparser.cpp b/src/server/qgswmsprojectparser.cpp
@@ -259,7 +259,7 @@ void QgsWMSProjectParser::addLayersFromGroup( const QDomElement& legendGroupElem
     QMap< int, QDomElement > layerOrderList;
     QDomNodeList groupElemChildren = legendGroupElem.childNodes();
     // for rendering layers has to be add from bottom (end) to top (start)
-    for ( int i = groupElemChildren.size()-1; i >= 0 ; --i )
+    for ( int i = groupElemChildren.size() - 1; i >= 0 ; --i )
     {
       QDomElement elem = groupElemChildren.at( i ).toElement();
       if ( elem.tagName() == "legendgroup" )