Skip to content

Commit e48a6f6

Browse files
jef-njef-n
committedNov 30, 2014
indentation update [ci skip]
·
ltr-3_40archive/master_2
1 parent 4d4fa44 commit e48a6f6

19 files changed

+74
-73
lines changed
 

‎python/core/symbology-ng/qgsheatmaprenderer.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2
3737
* @see colorRamp
3838
*/
3939
void setColorRamp( QgsVectorColorRampV2* ramp /Transfer/ );
40-
40+
4141
/**Returns whether the ramp is inverted
4242
* @returns true if color ramp is inverted
4343
* @see setInvertRamp
@@ -121,7 +121,7 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2
121121
* @see renderQuality
122122
*/
123123
void setRenderQuality( const int quality );
124-
124+
125125
/**Returns the expression used for weighting points when generating the heatmap.
126126
* @returns point weight expression. If empty, all points are equally weighted.
127127
* @see setWeightExpression

‎python/core/symbology-ng/qgssymbolv2.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class QgsSymbolV2
5454
SymbolType type() const;
5555

5656
// symbol layers handling
57-
57+
5858
/**Returns list of symbol layers contained in the symbol.
5959
* @returns symbol layers list
6060
* @note added in QGIS 2.7

‎python/gui/symbology-ng/qgsheatmaprendererwidget.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class QgsHeatmapRendererWidget : QgsRendererV2Widget
1717
* @param renderer the mask renderer (will take ownership)
1818
*/
1919
QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
20-
20+
2121
/** @returns the current feature renderer */
2222
virtual QgsFeatureRendererV2* renderer();
2323
};

‎python/plugins/processing/algs/gdal/buildvrt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class buildvrt(GdalAlgorithm):
4242
RESOLUTION = 'RESOLUTION'
4343
SEPARATE = 'SEPARATE'
4444
PROJ_DIFFERENCE = 'PROJ_DIFFERENCE'
45-
45+
4646
RESOLUTION_OPTIONS = ['average', 'highest', 'lowest']
4747

4848
def defineCharacteristics(self):

‎python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
7373
ADDFIELDS = 'ADDFIELDS'
7474
LAUNDER = 'LAUNDER'
7575
INDEX = 'INDEX'
76-
SKIPFAILURES = 'SKIPFAILURES'
76+
SKIPFAILURES = 'SKIPFAILURES'
7777
OPTIONS = 'OPTIONS'
78-
78+
7979
def defineCharacteristics(self):
8080
self.name = 'Import Vector into PostGIS database (new connection)'
8181
self.group = '[OGR] Miscellaneous'
@@ -89,7 +89,7 @@ def defineCharacteristics(self):
8989
self.addParameter(ParameterString(self.HOST, 'Host',
9090
'localhost', optional=False))
9191
self.addParameter(ParameterString(self.PORT, 'Port',
92-
'5432', optional=False))
92+
'5432', optional=False))
9393
self.addParameter(ParameterString(self.USER, 'Username',
9494
'', optional=False))
9595
self.addParameter(ParameterString(self.DBNAME, 'Database Name',
@@ -114,15 +114,15 @@ def defineCharacteristics(self):
114114
self.addParameter(ParameterBoolean(self.CLIP,
115115
'Clip the input layer using the above (rectangle) extent', False))
116116
self.addParameter(ParameterString(self.WHERE, 'Select features using a SQL "WHERE" statement (Ex: column="value")',
117-
'', optional=True))
117+
'', optional=True))
118118
self.addParameter(ParameterString(self.GT, 'Group "n" features per transaction (Default: 20000)',
119119
'', optional=True))
120120
self.addParameter(ParameterBoolean(self.OVERWRITE,
121-
'Overwrite existing table?', True))
121+
'Overwrite existing table?', True))
122122
self.addParameter(ParameterBoolean(self.APPEND,
123-
'Append to existing table?', False))
123+
'Append to existing table?', False))
124124
self.addParameter(ParameterBoolean(self.ADDFIELDS,
125-
'Append and add new fields to existing table?', False))
125+
'Append and add new fields to existing table?', False))
126126
self.addParameter(ParameterBoolean(self.LAUNDER,
127127
'Do not launder columns/table name/s?', False))
128128
self.addParameter(ParameterBoolean(self.INDEX,
@@ -142,23 +142,23 @@ def processAlgorithm(self, progress):
142142
user = unicode(self.getParameterValue(self.USER))
143143
dbname = unicode(self.getParameterValue(self.DBNAME))
144144
password = unicode(self.getParameterValue(self.PASSWORD))
145-
schema = unicode(self.getParameterValue(self.SCHEMA))
145+
schema = unicode(self.getParameterValue(self.SCHEMA))
146146
schemastring = "-lco SCHEMA="+schema
147-
table = unicode(self.getParameterValue(self.TABLE))
147+
table = unicode(self.getParameterValue(self.TABLE))
148148
pk = unicode(self.getParameterValue(self.PK))
149149
pkstring = "-lco FID="+pk
150150
geocolumn = unicode(self.getParameterValue(self.GEOCOLUMN))
151151
geocolumnstring = "-lco GEOMETRY_NAME="+geocolumn
152152
dim = self.DIMLIST[self.getParameterValue(self.DIM)]
153153
dimstring = "-lco DIM="+dim
154154
simplify = unicode(self.getParameterValue(self.SIMPLIFY))
155-
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
155+
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
156156
spat = self.getParameterValue(self.SPAT)
157157
ogrspat = self.ogrConnectionString(spat)
158-
clip = self.getParameterValue(self.CLIP)
158+
clip = self.getParameterValue(self.CLIP)
159159
where = unicode(self.getParameterValue(self.WHERE))
160160
wherestring = "-where '"+where+"'"
161-
gt = unicode(self.getParameterValue(self.GT))
161+
gt = unicode(self.getParameterValue(self.GT))
162162
overwrite = self.getParameterValue(self.OVERWRITE)
163163
append = self.getParameterValue(self.APPEND)
164164
addfields = self.getParameterValue(self.ADDFIELDS)
@@ -171,7 +171,7 @@ def processAlgorithm(self, progress):
171171

172172
arguments = []
173173
arguments.append('-progress')
174-
arguments.append('--config PG_USE_COPY YES')
174+
arguments.append('--config PG_USE_COPY YES')
175175
arguments.append('-f')
176176
arguments.append('PostgreSQL')
177177
arguments.append('PG:"host=')
@@ -185,7 +185,7 @@ def processAlgorithm(self, progress):
185185
arguments.append('password=')
186186
arguments.append(password)
187187
arguments.append('"')
188-
arguments.append(dimstring)
188+
arguments.append(dimstring)
189189
arguments.append(ogrLayer)
190190
if index:
191191
arguments.append(indexstring)
@@ -208,13 +208,13 @@ def processAlgorithm(self, progress):
208208
arguments.append(pkstring)
209209
if len(table) > 0:
210210
arguments.append('-nln')
211-
arguments.append(table)
211+
arguments.append(table)
212212
if len(ssrs) > 0:
213213
arguments.append('-s_srs')
214-
arguments.append(ssrs)
214+
arguments.append(ssrs)
215215
if len(tsrs) > 0:
216216
arguments.append('-t_srs')
217-
arguments.append(tsrs)
217+
arguments.append(tsrs)
218218
if len(spat) > 0:
219219
regionCoords = ogrspat.split(',')
220220
arguments.append('-spat')
@@ -227,7 +227,7 @@ def processAlgorithm(self, progress):
227227
if skipfailures:
228228
arguments.append('-skipfailures')
229229
if where:
230-
arguments.append(wherestring)
230+
arguments.append(wherestring)
231231
if len(simplify) > 0:
232232
arguments.append('-simplify')
233233
arguments.append(simplify)

‎python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
7676
ADDFIELDS = 'ADDFIELDS'
7777
LAUNDER = 'LAUNDER'
7878
INDEX = 'INDEX'
79-
SKIPFAILURES = 'SKIPFAILURES'
79+
SKIPFAILURES = 'SKIPFAILURES'
8080
OPTIONS = 'OPTIONS'
8181

8282
def dbConnectionNames(self):
8383
settings = QSettings()
8484
settings.beginGroup('/PostgreSQL/connections/')
8585
return settings.childGroups()
86-
86+
8787
def defineCharacteristics(self):
8888
self.name = 'Import Vector into PostGIS database (available connections)'
8989
self.group = '[OGR] Miscellaneous'
@@ -115,15 +115,15 @@ def defineCharacteristics(self):
115115
self.addParameter(ParameterBoolean(self.CLIP,
116116
'Clip the input layer using the above (rectangle) extent', False))
117117
self.addParameter(ParameterString(self.WHERE, 'Select features using a SQL "WHERE" statement (Ex: column="value")',
118-
'', optional=True))
118+
'', optional=True))
119119
self.addParameter(ParameterString(self.GT, 'Group "n" features per transaction (Default: 20000)',
120120
'', optional=True))
121121
self.addParameter(ParameterBoolean(self.OVERWRITE,
122-
'Overwrite existing table?', True))
122+
'Overwrite existing table?', True))
123123
self.addParameter(ParameterBoolean(self.APPEND,
124-
'Append to existing table?', False))
124+
'Append to existing table?', False))
125125
self.addParameter(ParameterBoolean(self.ADDFIELDS,
126-
'Append and add new fields to existing table?', False))
126+
'Append and add new fields to existing table?', False))
127127
self.addParameter(ParameterBoolean(self.LAUNDER,
128128
'Do not launder columns/table name/s?', False))
129129
self.addParameter(ParameterBoolean(self.INDEX,
@@ -146,23 +146,23 @@ def processAlgorithm(self, progress):
146146
ogrLayer = self.ogrConnectionString(inLayer)
147147
ssrs = unicode(self.getParameterValue(self.S_SRS))
148148
tsrs = unicode(self.getParameterValue(self.T_SRS))
149-
schema = unicode(self.getParameterValue(self.SCHEMA))
149+
schema = unicode(self.getParameterValue(self.SCHEMA))
150150
schemastring = "-lco SCHEMA="+schema
151-
table = unicode(self.getParameterValue(self.TABLE))
151+
table = unicode(self.getParameterValue(self.TABLE))
152152
pk = unicode(self.getParameterValue(self.PK))
153153
pkstring = "-lco FID="+pk
154154
geocolumn = unicode(self.getParameterValue(self.GEOCOLUMN))
155155
geocolumnstring = "-lco GEOMETRY_NAME="+geocolumn
156156
dim = self.DIMLIST[self.getParameterValue(self.DIM)]
157157
dimstring = "-lco DIM="+dim
158158
simplify = unicode(self.getParameterValue(self.SIMPLIFY))
159-
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
159+
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
160160
spat = self.getParameterValue(self.SPAT)
161161
ogrspat = self.ogrConnectionString(spat)
162-
clip = self.getParameterValue(self.CLIP)
162+
clip = self.getParameterValue(self.CLIP)
163163
where = unicode(self.getParameterValue(self.WHERE))
164164
wherestring = "-where '"+where+"'"
165-
gt = unicode(self.getParameterValue(self.GT))
165+
gt = unicode(self.getParameterValue(self.GT))
166166
overwrite = self.getParameterValue(self.OVERWRITE)
167167
append = self.getParameterValue(self.APPEND)
168168
addfields = self.getParameterValue(self.ADDFIELDS)
@@ -175,7 +175,7 @@ def processAlgorithm(self, progress):
175175

176176
arguments = []
177177
arguments.append('-progress')
178-
arguments.append('--config PG_USE_COPY YES')
178+
arguments.append('--config PG_USE_COPY YES')
179179
arguments.append('-f')
180180
arguments.append('PostgreSQL')
181181
arguments.append('PG:"host=')
@@ -189,7 +189,7 @@ def processAlgorithm(self, progress):
189189
arguments.append('password=')
190190
arguments.append(password)
191191
arguments.append('"')
192-
arguments.append(dimstring)
192+
arguments.append(dimstring)
193193
arguments.append(ogrLayer)
194194
if index:
195195
arguments.append(indexstring)
@@ -212,13 +212,13 @@ def processAlgorithm(self, progress):
212212
arguments.append(pkstring)
213213
if len(table) > 0:
214214
arguments.append('-nln')
215-
arguments.append(table)
215+
arguments.append(table)
216216
if len(ssrs) > 0:
217217
arguments.append('-s_srs')
218-
arguments.append(ssrs)
218+
arguments.append(ssrs)
219219
if len(tsrs) > 0:
220220
arguments.append('-t_srs')
221-
arguments.append(tsrs)
221+
arguments.append(tsrs)
222222
if len(spat) > 0:
223223
regionCoords = ogrspat.split(',')
224224
arguments.append('-spat')
@@ -231,7 +231,7 @@ def processAlgorithm(self, progress):
231231
if skipfailures:
232232
arguments.append('-skipfailures')
233233
if where:
234-
arguments.append(wherestring)
234+
arguments.append(wherestring)
235235
if len(simplify) > 0:
236236
arguments.append('-simplify')
237237
arguments.append(simplify)

‎python/plugins/processing/core/Processing.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ def initialize():
151151
ProcessingConfig.readSettings()
152152
RenderingStyles.loadStyles()
153153
Processing.loadFromProviders()
154-
154+
155155
# Inform registered listeners that all providers' algorithms have been loaded
156156
Processing.fireAlgsListHasChanged()
157-
157+
158158
@staticmethod
159159
def updateAlgsList():
160160
"""Call this method when there has been any change that
@@ -185,7 +185,7 @@ def addAlgListListener(listener):
185185
called for all registered listeners.
186186
"""
187187
Processing.listeners.append(listener)
188-
188+
189189
@staticmethod
190190
def removeAlgListListener(listener):
191191
try:

‎python/plugins/processing/script/snippets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
##Iterate over the features of a layer.
1+
##Iterate over the features of a layer.
22
feats = processing.features(layer)
33
n = len(feats)
44
for i, feat in enumerate(feats):
@@ -9,7 +9,7 @@
99
fields = processing.fields(layer)
1010
# int, float and bool can be used as well as types
1111
fields.append(('NEW_FIELD', str))
12-
writer = processing.VectorWriter(output_file, None, fields,
12+
writer = processing.VectorWriter(output_file, None, fields,
1313
processing.geomtype(layer), layer.crs())
1414

1515
##Create a new table

‎src/app/qgsattributetabledialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ void QgsAttributeTableDialog::updateFieldFromExpression()
307307

308308
bool filtered = mMainView->filterMode() != QgsAttributeTableFilterModel::ShowAll;
309309
QgsFeatureIds filteredIds = filtered ? mMainView->filteredFeatures() : QgsFeatureIds();
310-
this->runFieldCalculation(mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds);
310+
this->runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );
311311
}
312312

313313
void QgsAttributeTableDialog::updateFieldFromExpressionSelected()
314314
{
315315
QgsFeatureIds filteredIds = mLayer->selectedFeaturesIds();
316-
this->runFieldCalculation(mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds);
316+
this->runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds );
317317
}
318318

319319
void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds )
@@ -345,7 +345,7 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QStrin
345345
{
346346
if ( !filteredIds.isEmpty() && !filteredIds.contains( feature.id() ) )
347347
{
348-
continue;
348+
continue;
349349
}
350350

351351
exp.setCurrentRowNumber( rownum );

‎src/app/qgsattributetabledialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttrib
185185
*/
186186
void columnBoxInit();
187187

188-
void runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds = QgsFeatureIds());
188+
void runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds = QgsFeatureIds() );
189189
void updateFieldFromExpression();
190190
void updateFieldFromExpressionSelected();
191191

‎src/app/qgsguivectorlayertools.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class QgsGuiVectorLayerTools : public QgsVectorLayerTools, public QObject
6767
* @param layer The layer to commit
6868
* @return True if successful
6969
*/
70-
bool saveEdits( QgsVectorLayer* layer) const;
70+
bool saveEdits( QgsVectorLayer* layer ) const;
7171

7272
private:
7373
void commitError( QgsVectorLayer* vlayer ) const;

‎src/core/qgis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ class CORE_EXPORT QGis
296296
// It's assumed that this works on all systems supporting
297297
// QLibrary
298298
#if QT_VERSION >= 0x050000
299-
#define cast_to_fptr(f) f
299+
#define cast_to_fptr(f) f
300300
#else
301301
inline void ( *cast_to_fptr( void *p ) )()
302302
{

‎src/core/qgsmultirenderchecker.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ bool QgsMultiRenderChecker::runTest( const QString& theTestName, unsigned int th
5151

5252
QVector<QgsDartMeasurement> dartMeasurements;
5353

54-
Q_FOREACH( const QString& suffix, subDirs )
54+
Q_FOREACH ( const QString& suffix, subDirs )
5555
{
5656
qDebug() << "Checking subdir " << suffix;
5757
bool result;
@@ -83,8 +83,8 @@ bool QgsMultiRenderChecker::runTest( const QString& theTestName, unsigned int th
8383

8484
if ( !successful )
8585
{
86-
Q_FOREACH( const QgsDartMeasurement& measurement, dartMeasurements )
87-
measurement.send();
86+
Q_FOREACH ( const QgsDartMeasurement& measurement, dartMeasurements )
87+
measurement.send();
8888

8989
QgsDartMeasurement msg( "Image not accepted by test", QgsDartMeasurement::Text, "This may be caused because the test is supposed to fail or rendering inconsistencies."
9090
"If this is a rendering inconsistency, please add another control image folder, add an anomaly image or increase the color tolerance." );

‎src/gui/attributetable/qgsdualview.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void QgsDualView::columnBoxInit()
121121
// ... If there are primary key(s) defined
122122
QStringList pkFields;
123123

124-
Q_FOREACH( int attr, pkAttrs )
124+
Q_FOREACH ( int attr, pkAttrs )
125125
{
126126
pkFields.append( "COALESCE(\"" + fields[attr].name() + "\", '<NULL>')" );
127127
}
@@ -152,7 +152,7 @@ void QgsDualView::columnBoxInit()
152152
mFeatureListPreviewButton->addAction( mActionExpressionPreview );
153153
mFeatureListPreviewButton->addAction( mActionPreviewColumnsMenu );
154154

155-
Q_FOREACH( const QgsField& field, fields )
155+
Q_FOREACH ( const QgsField& field, fields )
156156
{
157157
if ( mLayerCache->layer()->editorWidgetV2( mLayerCache->layer()->fieldNameIndex( field.name() ) ) != "Hidden" )
158158
{

0 commit comments

Comments
 (0)
Please sign in to comment.