Skip to content

Commit f76d730

Browse files
committedFeb 11, 2015
indentation update/fix (followup 9ab22bd)
1 parent 10e09bc commit f76d730

26 files changed

+228
-229
lines changed
 

‎python/plugins/processing/algs/qgis/FieldsMapper.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828

2929
from qgis.core import QgsField, QgsExpression, QgsFeature
3030
from processing.core.GeoAlgorithm import GeoAlgorithm
31-
from processing.core.GeoAlgorithmExecutionException import \
32-
GeoAlgorithmExecutionException
31+
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
3332
from processing.core.parameters import ParameterVector
3433
from processing.core.outputs import OutputVector
3534
from processing.tools import dataobjects, vector

‎python/plugins/processing/algs/qgis/ui/FieldsMapperDialogs.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,20 @@ def getWidgetFromParameter(self, param):
6666
item.setLayer(layers[0])
6767
return item
6868
return ParametersPanel.getWidgetFromParameter(self, param)
69-
69+
7070
def updateDependentFields(self):
7171
sender = self.sender()
7272
if not isinstance(sender, QComboBox):
7373
return
74-
if not sender.name in self.dependentItems:
74+
if sender.name not in self.dependentItems:
7575
return
7676
layer = sender.itemData(sender.currentIndex())
7777
children = self.dependentItems[sender.name]
7878
for child in children:
7979
widget = self.valueItems[child]
8080
if isinstance(widget, FieldsMappingPanel):
8181
widget.setLayer(layer)
82-
82+
8383
def somethingDependsOnThisParameter(self, parent):
8484
for param in self.alg.parameters:
8585
if isinstance(param, ParameterFieldsMapping):
@@ -96,13 +96,13 @@ def __init__(self, alg):
9696

9797
self.mainWidget = FieldsMapperParametersPanel(self, alg)
9898
self.setMainWidget()
99-
99+
100100
def setParamValue(self, param, widget, alg=None):
101101
if isinstance(param, ParameterFieldsMapping):
102102
return param.setValue(widget.value())
103103
return AlgorithmDialog.setParamValue(self, param, widget, alg)
104104

105-
105+
106106
class FieldsMapperModelerParametersDialog(ModelerParametersDialog):
107107

108108
def __init__(self, alg, model, algName=None):
@@ -118,7 +118,7 @@ def getWidgetFromParameter(self, param):
118118
if isinstance(param, ParameterFieldsMapping):
119119
return FieldsMappingPanel()
120120
return ModelerParametersDialog.getWidgetFromParameter(self, param)
121-
121+
122122
def setPreviousValues(self):
123123
ModelerParametersDialog.setPreviousValues(self)
124124
if self._algName is not None:

‎python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ def on_model_rowsInserted(self, parent, start, end):
454454

455455
def updateLayerCombo(self):
456456
layers = dataobjects.getVectorLayers()
457-
layers.sort(key = lambda lay: lay.name())
457+
layers.sort(key=lambda lay: lay.name())
458458
for layer in layers:
459459
self.layerCombo.addItem(layer.name(), layer)
460460

‎python/plugins/processing/gui/GeometryPredicateSelectionPanel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def onRightLayerChange(self):
7777

7878
def updatePredicates(self):
7979
if (isinstance(self.leftLayer, QgsVectorLayer)
80-
and isinstance(self.rightLayer, QgsVectorLayer)):
80+
and isinstance(self.rightLayer, QgsVectorLayer)):
8181
leftType = self.leftLayer.geometryType()
8282
rightType = self.rightLayer.geometryType()
8383
unusablePredicates = self.unusablePredicates[leftType][rightType]
@@ -86,7 +86,7 @@ def updatePredicates(self):
8686
for predicate in ParameterGeometryPredicate.predicates:
8787
widget = self.getWidget(predicate)
8888
widget.setEnabled(predicate in self.enabledPredicated
89-
and not predicate in unusablePredicates)
89+
and predicate not in unusablePredicates)
9090

9191
def setRows(self, rows):
9292
widgets = []

‎src/app/qgsbrowserdockwidget.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,18 +206,18 @@ class QgsBrowserTreeFilterProxyModel : public QSortFilterProxyModel
206206

207207
// returns true if at least one ancestor is accepted by filter
208208
bool filterAcceptsAncestor( const QModelIndex &sourceIndex ) const
209-
{
210-
if ( !mModel )
211-
return true;
209+
{
210+
if ( !mModel )
211+
return true;
212212

213-
QModelIndex sourceParentIndex = mModel->parent( sourceIndex );
214-
if ( !sourceParentIndex.isValid() )
215-
return false;
216-
if ( filterAcceptsItem( sourceParentIndex ) )
217-
return true;
213+
QModelIndex sourceParentIndex = mModel->parent( sourceIndex );
214+
if ( !sourceParentIndex.isValid() )
215+
return false;
216+
if ( filterAcceptsItem( sourceParentIndex ) )
217+
return true;
218218

219-
return filterAcceptsAncestor( sourceParentIndex );
220-
}
219+
return filterAcceptsAncestor( sourceParentIndex );
220+
}
221221

222222
// returns true if at least one descendant s accepted by filter
223223
bool filterAcceptsDescendant( const QModelIndex &sourceIndex ) const

‎src/core/pal/internalexception.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace pal
5252
const char* what() const throw() override
5353
{
5454
return "This set is full...";
55-
}
55+
}
5656
};
5757

5858
/** \brief Thrown when trying to access an empty dada set
@@ -62,7 +62,7 @@ namespace pal
6262
const char* what() const throw() override
6363
{
6464
return "This set is empty...";
65-
}
65+
}
6666
};
6767

6868
/** \brief Thrown when a geometry type is not like expected
@@ -72,7 +72,7 @@ namespace pal
7272
const char* what() const throw() override
7373
{
7474
return "GeometryTypeId is not expected...";
75-
}
75+
}
7676
};
7777

7878
/** \brief Thrown when a geometry type is not like expected
@@ -82,7 +82,7 @@ namespace pal
8282
const char* what() const throw() override
8383
{
8484
return "Geometry Type is unknown";
85-
}
85+
}
8686
};
8787

8888

@@ -93,7 +93,7 @@ namespace pal
9393
const char * what() const throw() override
9494
{
9595
return "No way to compute positions";
96-
}
96+
}
9797
};
9898
};
9999

‎src/core/pal/palexception.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ namespace pal
5353
const char * what() const throw() override
5454
{
5555
return "Not yet implemented... sorry";
56-
}
56+
}
5757
};
5858

5959
/** \brief Try to access an unknown feature
@@ -63,7 +63,7 @@ namespace pal
6363
const char * what() const throw() override
6464
{
6565
return "Feature not found";
66-
}
66+
}
6767
};
6868

6969
/** \brief Try to access an unknown layer
@@ -73,7 +73,7 @@ namespace pal
7373
const char * what() const throw() override
7474
{
7575
return "Layer not found";
76-
}
76+
}
7777
};
7878

7979
/** \brief layer already exists
@@ -83,7 +83,7 @@ namespace pal
8383
const char * what() const throw() override
8484
{
8585
return "Layers names must be unique";
86-
}
86+
}
8787
};
8888

8989
/** \brief features already exists
@@ -93,7 +93,7 @@ namespace pal
9393
const char * what() const throw() override
9494
{
9595
return "Features IDs must be unique within a layer";
96-
}
96+
}
9797
};
9898

9999
/** \brief thrown when a value is not in the valid scale range
@@ -109,7 +109,7 @@ namespace pal
109109
const char * what() const throw() override
110110
{
111111
return "value not allowed";
112-
}
112+
}
113113
};
114114
};
115115

‎src/core/qgsexpression.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,10 +522,10 @@ class CORE_EXPORT QgsExpression
522522

523523
virtual QStringList referencedColumns() const override { QStringList lst( mNode->referencedColumns() ); foreach ( Node* n, mList->list() ) lst.append( n->referencedColumns() ); return lst; }
524524
virtual bool needsGeometry() const override { bool needs = false; foreach ( Node* n, mList->list() ) needs |= n->needsGeometry(); return needs; }
525-
virtual void accept( Visitor& v ) const override { v.visit( *this ); }
525+
virtual void accept( Visitor& v ) const override { v.visit( *this ); }
526526

527-
protected:
528-
Node* mNode;
527+
protected:
528+
Node* mNode;
529529
NodeList* mList;
530530
bool mNotIn;
531531
};

‎src/core/qgsspatialindex.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ class QgisVisitor : public SpatialIndex::IVisitor
3535
: mList( list ) {}
3636

3737
void visitNode( const INode& n ) override
38-
{ Q_UNUSED( n ); }
38+
{ Q_UNUSED( n ); }
3939

4040
void visitData( const IData& d ) override
4141
{
4242
mList.append( d.getIdentifier() );
4343
}
4444

4545
void visitData( std::vector<const IData*>& v ) override
46-
{ Q_UNUSED( v ); }
46+
{ Q_UNUSED( v ); }
4747

4848
private:
4949
QList<QgsFeatureId>& mList;
@@ -56,7 +56,7 @@ class QgsSpatialIndexCopyVisitor : public SpatialIndex::IVisitor
5656
: mNewIndex( newIndex ) {}
5757

5858
void visitNode( const INode& n ) override
59-
{ Q_UNUSED( n ); }
59+
{ Q_UNUSED( n ); }
6060

6161
void visitData( const IData& d ) override
6262
{
@@ -67,7 +67,7 @@ class QgsSpatialIndexCopyVisitor : public SpatialIndex::IVisitor
6767
}
6868

6969
void visitData( std::vector<const IData*>& v ) override
70-
{ Q_UNUSED( v ); }
70+
{ Q_UNUSED( v ); }
7171

7272
private:
7373
SpatialIndex::ISpatialIndex* mNewIndex;

‎src/core/raster/qgsrasterdataprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
226226
virtual QStringList subLayers() const override
227227
{
228228
return QStringList();
229-
}
229+
}
230230

231231
/** \brief Returns the legend rendered as pixmap
232232
*

‎src/core/symbology-ng/qgsrendererv2registry.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ class CORE_EXPORT QgsRendererV2Metadata : public QgsRendererV2AbstractMetadata
107107

108108
virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) override { return mCreateFunc ? mCreateFunc( elem ) : NULL; }
109109
virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) override
110-
{ return mWidgetFunc ? mWidgetFunc( layer, style, renderer ) : NULL; }
110+
{ return mWidgetFunc ? mWidgetFunc( layer, style, renderer ) : NULL; }
111111
virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QGis::GeometryType geomType ) override
112-
{ return mCreateFromSldFunc ? mCreateFromSldFunc( elem, geomType ) : NULL; }
112+
{ return mCreateFromSldFunc ? mCreateFromSldFunc( elem, geomType ) : NULL; }
113113

114114
//! @note not available in python bindings
115115
QgsRendererV2CreateFunc createFunction() const { return mCreateFunc; }

0 commit comments

Comments
 (0)
Please sign in to comment.