From 907ce693063f0925ad4eb5ae10c33f550aac96f0 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sun, 17 Aug 2014 09:10:31 +0200 Subject: [PATCH] indentation update --- .../processing/algs/grass/GrassAlgorithm.py | 2 +- .../processing/algs/grass7/Grass7Algorithm.py | 2 +- .../plugins/processing/algs/otb/OTBAlgorithm.py | 2 +- .../processing/algs/qgis/scripts/Fill_holes.py | 2 +- .../algs/qgis/scripts/Frequency_analysis.py | 4 ++-- src/app/qgsfieldsproperties.cpp | 16 ++++++++-------- src/core/composer/qgscomposermapoverview.cpp | 12 ++++++------ src/core/composer/qgscomposermapoverview.h | 2 +- src/core/qgsattributeaction.cpp | 2 +- src/core/qgsfield.cpp | 2 +- src/core/qgsvectorlayer.cpp | 14 +++++++------- src/core/qgsvectorlayerfeatureiterator.cpp | 2 +- src/gui/qgsattributeform.cpp | 4 ++-- src/gui/qgscodeeditorhtml.cpp | 2 +- src/mapserver/qgsserverprojectparser.cpp | 4 ++-- src/providers/ogr/qgsogrfeatureiterator.cpp | 2 +- src/providers/ogr/qgsogrprovider.cpp | 10 +++++----- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/python/plugins/processing/algs/grass/GrassAlgorithm.py b/python/plugins/processing/algs/grass/GrassAlgorithm.py index 0ba602b5a33..b5683ea6b96 100644 --- a/python/plugins/processing/algs/grass/GrassAlgorithm.py +++ b/python/plugins/processing/algs/grass/GrassAlgorithm.py @@ -82,7 +82,7 @@ class GrassAlgorithm(GeoAlgorithm): def getParameterDescriptions(self): descs = {} - _, helpfile = self.help() + _, helpfile = self.help() try: infile = open(helpfile) lines = infile.readlines() diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/python/plugins/processing/algs/grass7/Grass7Algorithm.py index e3f587d60ee..99f33a62c1d 100644 --- a/python/plugins/processing/algs/grass7/Grass7Algorithm.py +++ b/python/plugins/processing/algs/grass7/Grass7Algorithm.py @@ -83,7 +83,7 @@ class Grass7Algorithm(GeoAlgorithm): def getParameterDescriptions(self): descs = {} - _, helpfile = self.help() + _, helpfile = self.help() try: infile = open(helpfile) lines = infile.readlines() diff --git a/python/plugins/processing/algs/otb/OTBAlgorithm.py b/python/plugins/processing/algs/otb/OTBAlgorithm.py index 342107fb397..bd799c5e0d3 100644 --- a/python/plugins/processing/algs/otb/OTBAlgorithm.py +++ b/python/plugins/processing/algs/otb/OTBAlgorithm.py @@ -150,7 +150,7 @@ class OTBAlgorithm(GeoAlgorithm): if line.startswith("*Parameter"): param = ParameterFactory.getFromString(line[1:]) param.isAdvanced = True - else: + else: param = getParameterFromString(line) # Hack for initializing the elevation parameters from Processing configuration if param.name == "-elev.dem.path" or param.name == "-elev.dem" or "elev.dem" in param.name: diff --git a/python/plugins/processing/algs/qgis/scripts/Fill_holes.py b/python/plugins/processing/algs/qgis/scripts/Fill_holes.py index 5c0c9179f13..17d93201380 100644 --- a/python/plugins/processing/algs/qgis/scripts/Fill_holes.py +++ b/python/plugins/processing/algs/qgis/scripts/Fill_holes.py @@ -16,7 +16,7 @@ n = polyLayer.featureCount() l = 0 writer = processing.VectorWriter(Results, None, polyPrder.fields(), - QGis.WKBMultiPolygon, polyPrder.crs()) + QGis.WKBMultiPolygon, polyPrder.crs()) resgeom = QgsGeometry() diff --git a/python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py b/python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py index 6430cae81d8..55c75eded4c 100644 --- a/python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py +++ b/python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py @@ -11,8 +11,8 @@ layer = processing.getObject(Input) inputFields = layer.pendingFields() fieldIdxs = [] fields = Fields.split(',') -for f in fields: - idx = inputFields.indexFromName(f) +for f in fields: + idx = inputFields.indexFromName(f) if idx == -1: raise GeoAlgorithmExecutionException('Field not found:' + f) fieldIdxs.append(idx) diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp index 148e30afc63..e6e2cd76c45 100644 --- a/src/app/qgsfieldsproperties.cpp +++ b/src/app/qgsfieldsproperties.cpp @@ -605,14 +605,14 @@ void QgsFieldsProperties::attributesListCellChanged( int row, int column ) QTableWidgetItem *aliasItem = mFieldsList->item( row, column ); if ( aliasItem ) { - if ( !aliasItem->text().trimmed().isEmpty() ) - { - mLayer->addAttributeAlias( idx, aliasItem->text() ); - } - else - { - mLayer->remAttributeAlias(idx); - } + if ( !aliasItem->text().trimmed().isEmpty() ) + { + mLayer->addAttributeAlias( idx, aliasItem->text() ); + } + else + { + mLayer->remAttributeAlias( idx ); + } } } } diff --git a/src/core/composer/qgscomposermapoverview.cpp b/src/core/composer/qgscomposermapoverview.cpp index c6e45f4ecc1..d56fac699dd 100644 --- a/src/core/composer/qgscomposermapoverview.cpp +++ b/src/core/composer/qgscomposermapoverview.cpp @@ -218,14 +218,14 @@ void QgsComposerMapOverview::setFrameMap( const int mapId ) void QgsComposerMapOverview::connectSignals() { - if ( mFrameMapId != -1 && mComposerMap->composition() ) + if ( mFrameMapId != -1 && mComposerMap->composition() ) + { + const QgsComposerMap* map = mComposerMap->composition()->getComposerMapById( mFrameMapId ); + if ( map ) { - const QgsComposerMap* map = mComposerMap->composition()->getComposerMapById( mFrameMapId ); - if ( map ) - { - QObject::connect( map, SIGNAL( extentChanged() ), this, SLOT( overviewExtentChanged() ) ); - } + QObject::connect( map, SIGNAL( extentChanged() ), this, SLOT( overviewExtentChanged() ) ); } + } } void QgsComposerMapOverview::setFrameSymbol( QgsFillSymbolV2 *symbol ) diff --git a/src/core/composer/qgscomposermapoverview.h b/src/core/composer/qgscomposermapoverview.h index 8975a4a9563..0250de21384 100644 --- a/src/core/composer/qgscomposermapoverview.h +++ b/src/core/composer/qgscomposermapoverview.h @@ -96,7 +96,7 @@ class CORE_EXPORT QgsComposerMapOverview : public QObject */ void connectSignals(); -public slots: + public slots: void overviewExtentChanged(); diff --git a/src/core/qgsattributeaction.cpp b/src/core/qgsattributeaction.cpp index d83c76ab7be..a65ab1bfd8c 100644 --- a/src/core/qgsattributeaction.cpp +++ b/src/core/qgsattributeaction.cpp @@ -53,7 +53,7 @@ void QgsAttributeAction::removeAction( int index ) } } -void QgsAttributeAction::doAction(int index, const QgsFeature& feat, int defaultValueIndex ) +void QgsAttributeAction::doAction( int index, const QgsFeature& feat, int defaultValueIndex ) { QMap substitutionMap; if ( defaultValueIndex >= 0 ) diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp index 92ece8e5097..ab59a350239 100644 --- a/src/core/qgsfield.cpp +++ b/src/core/qgsfield.cpp @@ -150,7 +150,7 @@ bool QgsFields::append( const QgsField& field, FieldOrigin origin, int originInd return true; } -bool QgsFields::appendExpressionField(const QgsField& field, int originIndex) +bool QgsFields::appendExpressionField( const QgsField& field, int originIndex ) { if ( mNameToIndex.contains( field.name() ) ) return false; diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 0f67c97c966..bce0c7f4f05 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -2046,13 +2046,13 @@ bool QgsVectorLayer::addAttribute( const QgsField &field ) return mEditBuffer->addAttribute( field ); } -void QgsVectorLayer::remAttributeAlias( int attIndex) +void QgsVectorLayer::remAttributeAlias( int attIndex ) { if ( attIndex < 0 || attIndex >= pendingFields().count() ) return; QString name = pendingFields()[ attIndex ].name(); - if ( mAttributeAliasMap.contains(name) ) + if ( mAttributeAliasMap.contains( name ) ) { mAttributeAliasMap.remove( name ); emit layerModified(); @@ -2895,11 +2895,11 @@ QVariant QgsVectorLayer::minimumValue( int index ) else if ( origin == QgsFields::OriginEdit || origin == QgsFields::OriginExpression ) { // the layer is editable, but in certain cases it can still be avoided going through all features - if ( origin == QgsFields::OriginEdit && - mEditBuffer->mDeletedFeatureIds.isEmpty() && - mEditBuffer->mAddedFeatures.isEmpty() && ! - mEditBuffer->mDeletedAttributeIds.contains( index ) && - mEditBuffer->mChangedAttributeValues.isEmpty() ) + if ( origin == QgsFields::OriginEdit && + mEditBuffer->mDeletedFeatureIds.isEmpty() && + mEditBuffer->mAddedFeatures.isEmpty() && ! + mEditBuffer->mDeletedAttributeIds.contains( index ) && + mEditBuffer->mChangedAttributeValues.isEmpty() ) { return mDataProvider->minimumValue( index ); } diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp index 219c12a927e..ad673d2d5b2 100644 --- a/src/core/qgsvectorlayerfeatureiterator.cpp +++ b/src/core/qgsvectorlayerfeatureiterator.cpp @@ -551,7 +551,7 @@ void QgsVectorLayerFeatureIterator::addVirtualAttributes( QgsFeature& f ) { QMap::ConstIterator it = mExpressionFieldInfo.constBegin(); - for( ; it != mExpressionFieldInfo.constEnd(); ++it ) + for ( ; it != mExpressionFieldInfo.constEnd(); ++it ) { QgsExpression* exp = it.value(); QVariant val = exp->evaluate( f ); diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp index 482523eecdb..28e033421b1 100644 --- a/src/gui/qgsattributeform.cpp +++ b/src/gui/qgsattributeform.cpp @@ -163,7 +163,7 @@ bool QgsAttributeForm::save() QVariant srcVar = eww->value(); // need to check dstVar.isNull() != srcVar.isNull() // otherwise if dstVar=NULL and scrVar=0, then dstVar = srcVar - if ( ( dstVar != srcVar || dstVar.isNull() != srcVar.isNull() ) && srcVar.isValid() ) + if (( dstVar != srcVar || dstVar.isNull() != srcVar.isNull() ) && srcVar.isValid() ) { dst[eww->fieldIdx()] = srcVar; @@ -201,7 +201,7 @@ bool QgsAttributeForm::save() int n = 0; for ( int i = 0; i < dst.count(); ++i ) { - if ( ( dst[i] == src[i] && dst[i].isNull() == src[i].isNull() ) || !dst[i].isValid() ) + if (( dst[i] == src[i] && dst[i].isNull() == src[i].isNull() ) || !dst[i].isValid() ) { QgsDebugMsg( "equal or invalid destination" ); QgsDebugMsg( QString( "dst:'%1' (type:%2,isNull:%3,isValid:%4)" ) diff --git a/src/gui/qgscodeeditorhtml.cpp b/src/gui/qgscodeeditorhtml.cpp index e87e369950d..7fb11168252 100644 --- a/src/gui/qgscodeeditorhtml.cpp +++ b/src/gui/qgscodeeditorhtml.cpp @@ -23,7 +23,7 @@ QgsCodeEditorHTML::QgsCodeEditorHTML( QWidget *parent ) - : QgsCodeEditor( parent ) + : QgsCodeEditor( parent ) { if ( !parent ) { diff --git a/src/mapserver/qgsserverprojectparser.cpp b/src/mapserver/qgsserverprojectparser.cpp index d82a76f9f9d..75f2d32a354 100644 --- a/src/mapserver/qgsserverprojectparser.cpp +++ b/src/mapserver/qgsserverprojectparser.cpp @@ -64,8 +64,8 @@ QgsServerProjectParser::QgsServerProjectParser( QDomDocument* xmlDoc, const QStr } QgsServerProjectParser::QgsServerProjectParser() - : mXMLDoc( 0 ) - , mUseLayerIDs( false ) + : mXMLDoc( 0 ) + , mUseLayerIDs( false ) { } diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp index e74df98afaf..1781132b433 100644 --- a/src/providers/ogr/qgsogrfeatureiterator.cpp +++ b/src/providers/ogr/qgsogrfeatureiterator.cpp @@ -337,7 +337,7 @@ QgsOgrFeatureSource::QgsOgrFeatureSource( const QgsOgrProvider* p ) mSubsetString = p->mSubsetString; mEncoding = p->mEncoding; // no copying - this is a borrowed pointer from Qt mFields = p->mAttributeFields; - mOgrGeometryTypeFilter = wkbFlatten(p->mOgrGeometryTypeFilter); + mOgrGeometryTypeFilter = wkbFlatten( p->mOgrGeometryTypeFilter ); } QgsFeatureIterator QgsOgrFeatureSource::getFeatures( const QgsFeatureRequest& request ) diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp index 80ba05046a7..110c8a175c8 100644 --- a/src/providers/ogr/qgsogrprovider.cpp +++ b/src/providers/ogr/qgsogrprovider.cpp @@ -447,7 +447,7 @@ QgsOgrProvider::~QgsOgrProvider() repack(); - if( ogrDataSource ) + if ( ogrDataSource ) { OGR_DS_Destroy( ogrDataSource ); } @@ -551,7 +551,7 @@ QString QgsOgrProvider::subsetString() QString QgsOgrProvider::ogrWkbGeometryTypeName( OGRwkbGeometryType type ) const { QString geom; - switch ( (int)type ) + switch (( int )type ) { case wkbUnknown: geom = "Unknown"; break; case wkbPoint: geom = "Point"; break; @@ -624,7 +624,7 @@ QStringList QgsOgrProvider::subLayers() const QgsDebugMsg( QString( "id = %1 name = %2 layerGeomType = %3" ).arg( i ).arg( theLayerName ).arg( layerGeomType ) ); - if ( wkbFlatten(layerGeomType) != wkbUnknown ) + if ( wkbFlatten( layerGeomType ) != wkbUnknown ) { int theLayerFeatureCount = OGR_L_GetFeatureCount( layer, 0 ); @@ -660,10 +660,10 @@ QStringList QgsOgrProvider::subLayers() const { fCount[wkbUnknown] = 0; } - bool bIs25D = ( (layerGeomType & wkb25DBit) != 0 ); + bool bIs25D = (( layerGeomType & wkb25DBit ) != 0 ); foreach ( OGRwkbGeometryType gType, fCount.keys() ) { - QString geom = ogrWkbGeometryTypeName( (bIs25D) ? (OGRwkbGeometryType) (gType | wkb25DBit) : gType ); + QString geom = ogrWkbGeometryTypeName(( bIs25D ) ? ( OGRwkbGeometryType )( gType | wkb25DBit ) : gType ); QString sl = QString( "%1:%2:%3:%4" ).arg( i ).arg( theLayerName ).arg( fCount.value( gType ) ).arg( geom ); QgsDebugMsg( "sub layer: " + sl );