Skip to content

Commit 82b6e03

Browse files
jef-njef-n
committed
cosmetic cleanups, typo fixes, formatting
1 parent c0bfcea commit 82b6e03

File tree

379 files changed

+1902
-1884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+1902
-1884
lines changed

‎python/analysis/interpolation/DualEdgeTriangulation.sip

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ class DualEdgeTriangulation: Triangulation
8787
/**returns the number of a HalfEdge from a triangle in which 'point' is in. If the number -10 is returned, this means, that 'point' is outside the convex hull. If -5 is returned, then numerical problems with the leftOfTest occured (and the value of the possible edge is stored in the variable 'mUnstableEdge'. -20 means, that the inserted point is exactly on an edge (the number is stored in the variable 'mEdgeWithPoint'). -25 means, that the point is already in the triangulation (the number of the point is stored in the member 'mTwiceInsPoint'. If -100 is returned, this means that something else went wrong*/
8888
int baseEdgeOfTriangle( Point3D* point );
8989
/**Checks, if 'edge' has to be swapped because of the empty circle criterion. If so, doSwap(...) is called.*/
90-
bool checkSwap( unsigned int edge, unsigned int recursivDeep );
90+
bool checkSwap( unsigned int edge, unsigned int recursiveDeep );
9191
/**Swaps 'edge' and test recursively for other swaps (delaunay criterion)*/
92-
void doSwap( unsigned int edge, unsigned int recursivDeep );
93-
/**Swaps 'edge' and does no recursiv testing*/
92+
void doSwap( unsigned int edge, unsigned int recursiveDeep );
93+
/**Swaps 'edge' and does no recursive testing*/
9494
void doOnlySwap( unsigned int edge );
9595
/**Returns true, if it is possible to swap an edge, otherwise false(concave quad or edge on (or outside) the convex hull)*/
9696
bool swapPossible( unsigned int edge );

‎python/analysis/network/qgsgraphdirector.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class QgsGraphDirector : QObject
4444
const QVector< QgsPoint > &additionalPoints,
4545
QVector< QgsPoint> &tiedPoints /Out/ );
4646

47-
void addProperter( QgsArcProperter* prop /Transfer/ ) ;
47+
void addProperter( QgsArcProperter* prop /Transfer/ );
4848

4949
/**
5050
* return Director name

‎python/core/composer/qgscomposermap.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ class QgsComposerMap : QgsComposerItem
770770
public slots:
771771

772772
/**Called if map canvas has changed*/
773-
void updateCachedImage( );
773+
void updateCachedImage();
774774
/**Call updateCachedImage if item is in render mode*/
775775
void renderModeUpdateCachedImage();
776776

‎python/core/gps/qgsqtlocationconnection.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class QgsQtLocationConnection: QgsGPSConnection
1212

1313
protected slots:
1414
/**Needed to make QtLocation detected*/
15-
void broadcastConnectionAvailable( );
15+
void broadcastConnectionAvailable();
1616

1717
/**Parse available data source content*/
1818
void parseData();

‎python/core/qgsgmlschema.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
class QgsGmlFeatureClass
55
{
66
public:
7-
QgsGmlFeatureClass( );
7+
QgsGmlFeatureClass();
88
QgsGmlFeatureClass( QString name, QString path );
99

1010
~QgsGmlFeatureClass();

‎python/core/qgsmaplayer.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class QgsMapLayer : QObject
258258
* @see also loadNamedStyle () and saveNamedStyle ();
259259
* @note This method was added in QGIS 1.8
260260
*/
261-
virtual QString styleURI( );
261+
virtual QString styleURI();
262262

263263
/** Retrieve the default style for this layer if one
264264
* exists (either as a .qml file on disk or as a

‎python/core/raster/qgsrastertransparency.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class QgsRasterTransparency
5454
int alphaValue( double, double, double, int theGlobalTransparency = 255 ) const;
5555

5656
/**True if there are no entries in the pixel lists except the nodata value*/
57-
bool isEmpty( ) const;
57+
bool isEmpty() const;
5858

5959
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
6060

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,6 @@ class QgsCptCityBrowserModel : QAbstractItemModel
343343
protected:
344344

345345
// populates the model
346-
void addRootItems( );
346+
void addRootItems();
347347
void removeRootItems();
348348
};

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,17 @@ class QgsSymbolLayerV2Utils
124124
/** @deprecated Use wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element, QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle, double borderWidth, double size ) instead */
125125
static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
126126
QString name, QColor color, QColor borderColor = QColor(),
127-
double borderWidth = -1, double size = -1 ) /Deprecated/ ;
127+
double borderWidth = -1, double size = -1 ) /Deprecated/;
128128
static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
129129
QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle,
130130
double borderWidth = -1, double size = -1 );
131131
/** @deprecated Use wellKnownMarkerFromSld( QDomElement &element, QString &name, QColor &color, QColor &borderColor, Qt::PenStyle &borderStyle, double &borderWidth, double &size ) instead */
132132
static bool wellKnownMarkerFromSld( QDomElement &element,
133133
QString &name, QColor &color, QColor &borderColor,
134-
double &borderWidth, double &size ) /Deprecated/ ;
134+
double &borderWidth, double &size ) /Deprecated/;
135135
static bool wellKnownMarkerFromSld( QDomElement &element,
136136
QString &name, QColor &color, QColor &borderColor, Qt::PenStyle &borderStyle,
137-
double &borderWidth, double &size ) /PyName=wellKnownMarkerFromSld2/ ;
137+
double &borderWidth, double &size ) /PyName=wellKnownMarkerFromSld2/;
138138

139139
static void externalMarkerToSld( QDomDocument &doc, QDomElement &element,
140140
QString path, QString format, int *markIndex = 0,

‎python/gui/qgscolorbutton.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class QgsColorButton: QPushButton
135135
/**
136136
* Reimplemented to accept dragged colors
137137
*/
138-
void dragEnterEvent( QDragEnterEvent * e ) ;
138+
void dragEnterEvent( QDragEnterEvent * e );
139139

140140
/**
141141
* Reimplemented to accept dropped colors

‎python/gui/qgscolorbuttonv2.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,12 @@ class QgsColorButtonV2: QToolButton
283283
/**
284284
* Reimplemented to accept dragged colors
285285
*/
286-
void dragEnterEvent( QDragEnterEvent * e ) ;
286+
void dragEnterEvent( QDragEnterEvent * e );
287287

288288
/**
289289
* Reimplemented to reset button appearance after drag leave
290290
*/
291-
void dragLeaveEvent( QDragLeaveEvent *e ) ;
291+
void dragLeaveEvent( QDragLeaveEvent *e );
292292

293293
/**
294294
* Reimplemented to accept dropped colors

‎python/gui/qgscolorwidgets.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class QgsColorWidget : QWidget
134134
static const QPixmap& transparentBackground();
135135

136136
//Reimplemented to accept dragged colors
137-
void dragEnterEvent( QDragEnterEvent * e ) ;
137+
void dragEnterEvent( QDragEnterEvent * e );
138138

139139
//Reimplemented to accept dropped colors
140140
void dropEvent( QDropEvent *e );

‎python/gui/qgsfieldproxymodel.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class QgsFieldProxyModel : QSortFilterProxyModel
2929
explicit QgsFieldProxyModel( QObject *parent /TransferThis/ = 0 );
3030

3131
//! sourceFieldModel returns the QgsFieldModel used in this QSortFilterProxyModel
32-
QgsFieldModel* sourceFieldModel() ;
32+
QgsFieldModel* sourceFieldModel();
3333

3434
/**
3535
* @brief setFilters set flags that affect how fields are filtered

‎python/gui/qgslegendinterface.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ class QgsLegendInterface : QObject
8585
void groupIndexChanged( int oldIndex, int newIndex );
8686

8787
/* //! emitted when group relations have changed */
88-
void groupRelationsChanged( );
88+
void groupRelationsChanged();
8989

9090
/* //! emitted when an item (group/layer) is added */
9191
void itemAdded( QModelIndex index );
9292

9393
/* //! emitted when an item (group/layer) is removed */
94-
void itemRemoved( );
94+
void itemRemoved();
9595

9696
//! Emitted whenever current (selected) layer changes
9797
// the pointer to layer can be null if no layer is selected

‎python/gui/qgsmapcanvas.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,10 @@ class QgsMapCanvas : QGraphicsView
228228
void setWheelAction( WheelAction action, double factor = 2 );
229229

230230
//! Zoom in with fixed factor
231-
void zoomIn( );
231+
void zoomIn();
232232

233233
//! Zoom out with fixed factor
234-
void zoomOut( );
234+
void zoomOut();
235235

236236
//! Zoom to a specific scale
237237
// added in 1.5

‎python/gui/qgsowssourceselect.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class QgsOWSSourceSelect : QDialog
132132
*
133133
* \retval false if the layers could not be retrieved or parsed
134134
*/
135-
virtual void populateLayerList( );
135+
virtual void populateLayerList();
136136

137137
//! create an item including possible parents
138138
//! @note not available in python bindings

‎python/gui/qgsrasterformatsaveoptionswidget.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class QgsRasterFormatSaveOptionsWidget : QWidget
6262
QString currentProfileKey() const;
6363
QString createOptions( QString profile ) const;
6464
void deleteCreateOptions( QString profile );
65-
void setCreateOptions( );
65+
void setCreateOptions();
6666
void setCreateOptions( QString profile, QString options );
6767
void setCreateOptions( QString profile, QStringList list );
6868
QStringList profiles() const;

‎python/gui/raster/qgsrasterhistogramwidget.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class QgsRasterHistogramWidget : QWidget
3535
/** Used when the histogram band selector changes, or when tab is loaded. */
3636
void on_cboHistoBand_currentIndexChanged( int );
3737
/** Applies the selected min/max values to the renderer widget. */
38-
void applyHistoMin( );
39-
void applyHistoMax( );
38+
void applyHistoMin();
39+
void applyHistoMax();
4040
/** Button to activate picking of the min/max value on the graph. */
4141
void on_btnHistoMin_toggled();
4242
void on_btnHistoMax_toggled();

‎python/gui/raster/qgsrasterrendererwidget.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class QgsRasterRendererWidget: QWidget
2424
virtual QString max( int index = 0 );
2525
virtual void setMin( QString value, int index = 0 );
2626
virtual void setMax( QString value, int index = 0 );
27-
virtual QString stdDev( );
27+
virtual QString stdDev();
2828
virtual void setStdDev( QString value );
2929
virtual int selectedBand( int index = 0 );
3030

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

+19-19
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class QgsSimpleLineSymbolLayerV2Widget : QgsSymbolLayerV2Widget
3939
void offsetChanged();
4040
void on_mCustomCheckBox_stateChanged( int state );
4141
void on_mChangePatternButton_clicked();
42-
void on_mPenWidthUnitWidget_changed( );
43-
void on_mOffsetUnitWidget_changed( );
44-
void on_mDashPatternUnitWidget_changed( );
42+
void on_mPenWidthUnitWidget_changed();
43+
void on_mOffsetUnitWidget_changed();
44+
void on_mDashPatternUnitWidget_changed();
4545
void on_mDataDefinedPropertiesButton_clicked();
4646
void on_mDrawInsideCheckBox_stateChanged( int state );
4747

@@ -74,9 +74,9 @@ class QgsSimpleMarkerSymbolLayerV2Widget : QgsSymbolLayerV2Widget
7474
void setSize();
7575
void setAngle();
7676
void setOffset();
77-
void on_mSizeUnitWidget_changed( );
78-
void on_mOffsetUnitWidget_changed( );
79-
void on_mOutlineWidthUnitWidget_changed( );
77+
void on_mSizeUnitWidget_changed();
78+
void on_mOffsetUnitWidget_changed();
79+
void on_mOutlineWidthUnitWidget_changed();
8080
void on_mDataDefinedPropertiesButton_clicked();
8181
void on_mOutlineStyleComboBox_currentIndexChanged( int index );
8282
void on_mOutlineWidthSpinBox_valueChanged( double d );
@@ -108,8 +108,8 @@ class QgsSimpleFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget
108108
void borderWidthChanged();
109109
void borderStyleChanged();
110110
void offsetChanged();
111-
void on_mBorderWidthUnitWidget_changed( );
112-
void on_mOffsetUnitWidget_changed( );
111+
void on_mBorderWidthUnitWidget_changed();
112+
void on_mOffsetUnitWidget_changed();
113113
void on_mDataDefinedPropertiesButton_clicked();
114114
};
115115

@@ -140,7 +140,7 @@ class QgsGradientFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget
140140
void setGradientSpread( int index );
141141
void offsetChanged();
142142
void referencePointChanged();
143-
void on_mOffsetUnitWidget_changed( );
143+
void on_mOffsetUnitWidget_changed();
144144
void on_mDataDefinedPropertiesButton_clicked();
145145
void colorModeChanged();
146146
void on_mSpinAngle_valueChanged( double value );
@@ -168,12 +168,12 @@ class QgsShapeburstFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget
168168
void colorModeChanged();
169169
void on_mSpinBlurRadius_valueChanged( int value );
170170
void on_mSpinMaxDistance_valueChanged( double value );
171-
void on_mDistanceUnitWidget_changed( );
171+
void on_mDistanceUnitWidget_changed();
172172
void on_mRadioUseWholeShape_toggled( bool value );
173173
void applyColorRamp();
174174
void on_mButtonEditRamp_clicked();
175175
void offsetChanged();
176-
void on_mOffsetUnitWidget_changed( );
176+
void on_mOffsetUnitWidget_changed();
177177
void on_mDataDefinedPropertiesButton_clicked();
178178
void on_mIgnoreRingsCheckBox_stateChanged( int state );
179179
};
@@ -201,9 +201,9 @@ class QgsMarkerLineSymbolLayerV2Widget : QgsSymbolLayerV2Widget
201201
void setRotate();
202202
void setOffset();
203203
void setPlacement();
204-
void on_mIntervalUnitWidget_changed( );
205-
void on_mOffsetUnitWidget_changed( );
206-
void on_mOffsetAlongLineUnitWidget_changed( );
204+
void on_mIntervalUnitWidget_changed();
205+
void on_mOffsetUnitWidget_changed();
206+
void on_mOffsetAlongLineUnitWidget_changed();
207207
void on_mDataDefinedPropertiesButton_clicked();
208208

209209
};
@@ -238,9 +238,9 @@ class QgsSvgMarkerSymbolLayerV2Widget : QgsSymbolLayerV2Widget
238238
void on_mChangeColorButton_colorChanged( const QColor& color );
239239
void on_mChangeBorderColorButton_colorChanged( const QColor& color );
240240
void on_mBorderWidthSpinBox_valueChanged( double d );
241-
void on_mSizeUnitWidget_changed( );
242-
void on_mBorderWidthUnitWidget_changed( );
243-
void on_mOffsetUnitWidget_changed( );
241+
void on_mSizeUnitWidget_changed();
242+
void on_mBorderWidthUnitWidget_changed();
243+
void on_mOffsetUnitWidget_changed();
244244
void on_mDataDefinedPropertiesButton_clicked();
245245
void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
246246
void on_mVerticalAnchorComboBox_currentIndexChanged( int index );
@@ -337,8 +337,8 @@ class QgsFontMarkerSymbolLayerV2Widget : QgsSymbolLayerV2Widget
337337
void setAngle( double angle );
338338
void setCharacter( const QChar& chr );
339339
void setOffset();
340-
void on_mSizeUnitWidget_changed( );
341-
void on_mOffsetUnitWidget_changed( );
340+
void on_mSizeUnitWidget_changed();
341+
void on_mOffsetUnitWidget_changed();
342342
void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
343343
void on_mVerticalAnchorComboBox_currentIndexChanged( int index );
344344
};

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class QgsSymbolsListWidget : QWidget
1414
void setLineWidth( double width );
1515
void addSymbolToStyle();
1616
void symbolAddedToStyle( QString name, QgsSymbolV2* symbol );
17-
void on_mSymbolUnitWidget_changed( );
17+
void on_mSymbolUnitWidget_changed();
1818
void on_mTransparencySlider_valueChanged( int value );
1919

2020
void on_groupsCombo_currentIndexChanged( int index );

‎python/plugins/fTools/tools/doGeoprocessing.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ def convex_hull(self, useField ):
471471
outFeatFields = QgsFields()
472472
if useField:
473473
importedField = vproviderA.fields().at( self.myParam )
474-
importedFieldName = importedField.name( )
474+
importedFieldName = importedField.name()
475475
#
476476
outFeatFields.extend( vproviderA.fields() )
477477
# creating area and perimeter fields
@@ -526,7 +526,7 @@ def convex_hull(self, useField ):
526526
outFeat.setGeometry( outGeom )
527527
(area, perim) = self.simpleMeasure( outGeom )
528528
for f in firstFeature.fields():
529-
outFeat.setAttribute( f.name( ), firstFeature.attribute( f.name( ) ) )
529+
outFeat.setAttribute( f.name(), firstFeature.attribute( f.name() ) )
530530
outFeat.setAttribute( "area", area )
531531
outFeat.setAttribute( "perim", perim )
532532
writer.addFeature( outFeat )
@@ -549,7 +549,7 @@ def convex_hull(self, useField ):
549549
outFeat.setGeometry( outGeom )
550550
(area, perim) = self.simpleMeasure( outGeom )
551551
for f in inFeat.fields():
552-
outFeat.setAttribute( f.name( ), inFeat.attribute( f.name( ) ) )
552+
outFeat.setAttribute( f.name(), inFeat.attribute( f.name() ) )
553553
outFeat.setAttribute( "area", area )
554554
outFeat.setAttribute( "perim", perim )
555555
writer.addFeature( outFeat )
@@ -586,7 +586,7 @@ def convex_hull(self, useField ):
586586
outFeat.setGeometry( outGeom )
587587
(area, perim) = self.simpleMeasure( outGeom )
588588
for f in firstFeature.fields():
589-
outFeat.setAttribute( f.name( ), firstFeature.attribute( f.name( ) ) )
589+
outFeat.setAttribute( f.name(), firstFeature.attribute( f.name() ) )
590590
outFeat.setAttribute( "area", area )
591591
outFeat.setAttribute( "perim", perim )
592592
writer.addFeature( outFeat )
@@ -610,7 +610,7 @@ def convex_hull(self, useField ):
610610
outFeat.setGeometry( outGeom )
611611
(area, perim) = self.simpleMeasure( outGeom )
612612
for f in inFeat.fields():
613-
outFeat.setAttribute( f.name( ), inFeat.attribute( f.name( ) ) )
613+
outFeat.setAttribute( f.name(), inFeat.attribute( f.name() ) )
614614
outFeat.setAttribute( "area", area )
615615
outFeat.setAttribute( "perim", perim )
616616
writer.addFeature( outFeat )

‎python/plugins/fTools/tools/doRandPoints.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -211,16 +211,16 @@ def randomize(self, inLayer, outPath, minimum, design, value):
211211
if len(featErrors) >= 10:
212212
err_msg = "Too many features couldn't be calculated due to conversion error. "
213213
err_msg += "Please check out message log for more info."
214-
msgLogInstance = QgsMessageLog.instance( )
214+
msgLogInstance = QgsMessageLog.instance()
215215
msgLogInstance.logMessage( "WARNING - fTools: " + self.tr( "Random Points" ) )
216216
msgLogInstance.logMessage( "The following feature ids should be checked." )
217217
for feat in featErrors:
218-
msgLogInstance.logMessage( "Feature id: %d" % feat.id( ) )
218+
msgLogInstance.logMessage( "Feature id: %d" % feat.id() )
219219
msgLogInstance.logMessage( "End of features to be checked." )
220220
else:
221221
features_ids = []
222222
for feat in featErrors:
223-
features_ids.append( str( feat.id( ) ) )
223+
features_ids.append( str( feat.id() ) )
224224
erroneous_ids = ', '.join(features_ids)
225225
err_msg = "The following features IDs couldn't be calculated due to conversion error: %s" % erroneous_ids
226226
self.iface.messageBar().pushMessage("Errors", err_msg)

0 commit comments

Comments
 (0)