Skip to content
Permalink
Browse files

cosmetic cleanups, typo fixes, formatting

  • Loading branch information
jef-n committed Oct 20, 2014
1 parent c0bfcea commit 82b6e0342a64d9c6366f9284d71e26f62011814a
Showing 379 changed files with 1,902 additions and 1,884 deletions.
@@ -87,10 +87,10 @@ class DualEdgeTriangulation: Triangulation
/**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*/
int baseEdgeOfTriangle( Point3D* point );
/**Checks, if 'edge' has to be swapped because of the empty circle criterion. If so, doSwap(...) is called.*/
bool checkSwap( unsigned int edge, unsigned int recursivDeep );
bool checkSwap( unsigned int edge, unsigned int recursiveDeep );
/**Swaps 'edge' and test recursively for other swaps (delaunay criterion)*/
void doSwap( unsigned int edge, unsigned int recursivDeep );
/**Swaps 'edge' and does no recursiv testing*/
void doSwap( unsigned int edge, unsigned int recursiveDeep );
/**Swaps 'edge' and does no recursive testing*/
void doOnlySwap( unsigned int edge );
/**Returns true, if it is possible to swap an edge, otherwise false(concave quad or edge on (or outside) the convex hull)*/
bool swapPossible( unsigned int edge );
@@ -44,7 +44,7 @@ class QgsGraphDirector : QObject
const QVector< QgsPoint > &additionalPoints,
QVector< QgsPoint> &tiedPoints /Out/ );

void addProperter( QgsArcProperter* prop /Transfer/ ) ;
void addProperter( QgsArcProperter* prop /Transfer/ );

/**
* return Director name
@@ -770,7 +770,7 @@ class QgsComposerMap : QgsComposerItem
public slots:

/**Called if map canvas has changed*/
void updateCachedImage( );
void updateCachedImage();
/**Call updateCachedImage if item is in render mode*/
void renderModeUpdateCachedImage();

@@ -12,7 +12,7 @@ class QgsQtLocationConnection: QgsGPSConnection

protected slots:
/**Needed to make QtLocation detected*/
void broadcastConnectionAvailable( );
void broadcastConnectionAvailable();

/**Parse available data source content*/
void parseData();
@@ -4,7 +4,7 @@
class QgsGmlFeatureClass
{
public:
QgsGmlFeatureClass( );
QgsGmlFeatureClass();
QgsGmlFeatureClass( QString name, QString path );

~QgsGmlFeatureClass();
@@ -258,7 +258,7 @@ class QgsMapLayer : QObject
* @see also loadNamedStyle () and saveNamedStyle ();
* @note This method was added in QGIS 1.8
*/
virtual QString styleURI( );
virtual QString styleURI();

/** Retrieve the default style for this layer if one
* exists (either as a .qml file on disk or as a
@@ -54,7 +54,7 @@ class QgsRasterTransparency
int alphaValue( double, double, double, int theGlobalTransparency = 255 ) const;

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

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

@@ -343,6 +343,6 @@ class QgsCptCityBrowserModel : QAbstractItemModel
protected:

// populates the model
void addRootItems( );
void addRootItems();
void removeRootItems();
};
@@ -124,17 +124,17 @@ class QgsSymbolLayerV2Utils
/** @deprecated Use wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element, QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle, double borderWidth, double size ) instead */
static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
QString name, QColor color, QColor borderColor = QColor(),
double borderWidth = -1, double size = -1 ) /Deprecated/ ;
double borderWidth = -1, double size = -1 ) /Deprecated/;
static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle,
double borderWidth = -1, double size = -1 );
/** @deprecated Use wellKnownMarkerFromSld( QDomElement &element, QString &name, QColor &color, QColor &borderColor, Qt::PenStyle &borderStyle, double &borderWidth, double &size ) instead */
static bool wellKnownMarkerFromSld( QDomElement &element,
QString &name, QColor &color, QColor &borderColor,
double &borderWidth, double &size ) /Deprecated/ ;
double &borderWidth, double &size ) /Deprecated/;
static bool wellKnownMarkerFromSld( QDomElement &element,
QString &name, QColor &color, QColor &borderColor, Qt::PenStyle &borderStyle,
double &borderWidth, double &size ) /PyName=wellKnownMarkerFromSld2/ ;
double &borderWidth, double &size ) /PyName=wellKnownMarkerFromSld2/;

static void externalMarkerToSld( QDomDocument &doc, QDomElement &element,
QString path, QString format, int *markIndex = 0,
@@ -135,7 +135,7 @@ class QgsColorButton: QPushButton
/**
* Reimplemented to accept dragged colors
*/
void dragEnterEvent( QDragEnterEvent * e ) ;
void dragEnterEvent( QDragEnterEvent * e );

/**
* Reimplemented to accept dropped colors
@@ -283,12 +283,12 @@ class QgsColorButtonV2: QToolButton
/**
* Reimplemented to accept dragged colors
*/
void dragEnterEvent( QDragEnterEvent * e ) ;
void dragEnterEvent( QDragEnterEvent * e );

/**
* Reimplemented to reset button appearance after drag leave
*/
void dragLeaveEvent( QDragLeaveEvent *e ) ;
void dragLeaveEvent( QDragLeaveEvent *e );

/**
* Reimplemented to accept dropped colors
@@ -134,7 +134,7 @@ class QgsColorWidget : QWidget
static const QPixmap& transparentBackground();

//Reimplemented to accept dragged colors
void dragEnterEvent( QDragEnterEvent * e ) ;
void dragEnterEvent( QDragEnterEvent * e );

//Reimplemented to accept dropped colors
void dropEvent( QDropEvent *e );
@@ -29,7 +29,7 @@ class QgsFieldProxyModel : QSortFilterProxyModel
explicit QgsFieldProxyModel( QObject *parent /TransferThis/ = 0 );

//! sourceFieldModel returns the QgsFieldModel used in this QSortFilterProxyModel
QgsFieldModel* sourceFieldModel() ;
QgsFieldModel* sourceFieldModel();

/**
* @brief setFilters set flags that affect how fields are filtered
@@ -85,13 +85,13 @@ class QgsLegendInterface : QObject
void groupIndexChanged( int oldIndex, int newIndex );

/* //! emitted when group relations have changed */
void groupRelationsChanged( );
void groupRelationsChanged();

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

/* //! emitted when an item (group/layer) is removed */
void itemRemoved( );
void itemRemoved();

//! Emitted whenever current (selected) layer changes
// the pointer to layer can be null if no layer is selected
@@ -228,10 +228,10 @@ class QgsMapCanvas : QGraphicsView
void setWheelAction( WheelAction action, double factor = 2 );

//! Zoom in with fixed factor
void zoomIn( );
void zoomIn();

//! Zoom out with fixed factor
void zoomOut( );
void zoomOut();

//! Zoom to a specific scale
// added in 1.5
@@ -132,7 +132,7 @@ class QgsOWSSourceSelect : QDialog
*
* \retval false if the layers could not be retrieved or parsed
*/
virtual void populateLayerList( );
virtual void populateLayerList();

//! create an item including possible parents
//! @note not available in python bindings
@@ -62,7 +62,7 @@ class QgsRasterFormatSaveOptionsWidget : QWidget
QString currentProfileKey() const;
QString createOptions( QString profile ) const;
void deleteCreateOptions( QString profile );
void setCreateOptions( );
void setCreateOptions();
void setCreateOptions( QString profile, QString options );
void setCreateOptions( QString profile, QStringList list );
QStringList profiles() const;
@@ -35,8 +35,8 @@ class QgsRasterHistogramWidget : QWidget
/** Used when the histogram band selector changes, or when tab is loaded. */
void on_cboHistoBand_currentIndexChanged( int );
/** Applies the selected min/max values to the renderer widget. */
void applyHistoMin( );
void applyHistoMax( );
void applyHistoMin();
void applyHistoMax();
/** Button to activate picking of the min/max value on the graph. */
void on_btnHistoMin_toggled();
void on_btnHistoMax_toggled();
@@ -24,7 +24,7 @@ class QgsRasterRendererWidget: QWidget
virtual QString max( int index = 0 );
virtual void setMin( QString value, int index = 0 );
virtual void setMax( QString value, int index = 0 );
virtual QString stdDev( );
virtual QString stdDev();
virtual void setStdDev( QString value );
virtual int selectedBand( int index = 0 );

@@ -39,9 +39,9 @@ class QgsSimpleLineSymbolLayerV2Widget : QgsSymbolLayerV2Widget
void offsetChanged();
void on_mCustomCheckBox_stateChanged( int state );
void on_mChangePatternButton_clicked();
void on_mPenWidthUnitWidget_changed( );
void on_mOffsetUnitWidget_changed( );
void on_mDashPatternUnitWidget_changed( );
void on_mPenWidthUnitWidget_changed();
void on_mOffsetUnitWidget_changed();
void on_mDashPatternUnitWidget_changed();
void on_mDataDefinedPropertiesButton_clicked();
void on_mDrawInsideCheckBox_stateChanged( int state );

@@ -74,9 +74,9 @@ class QgsSimpleMarkerSymbolLayerV2Widget : QgsSymbolLayerV2Widget
void setSize();
void setAngle();
void setOffset();
void on_mSizeUnitWidget_changed( );
void on_mOffsetUnitWidget_changed( );
void on_mOutlineWidthUnitWidget_changed( );
void on_mSizeUnitWidget_changed();
void on_mOffsetUnitWidget_changed();
void on_mOutlineWidthUnitWidget_changed();
void on_mDataDefinedPropertiesButton_clicked();
void on_mOutlineStyleComboBox_currentIndexChanged( int index );
void on_mOutlineWidthSpinBox_valueChanged( double d );
@@ -108,8 +108,8 @@ class QgsSimpleFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget
void borderWidthChanged();
void borderStyleChanged();
void offsetChanged();
void on_mBorderWidthUnitWidget_changed( );
void on_mOffsetUnitWidget_changed( );
void on_mBorderWidthUnitWidget_changed();
void on_mOffsetUnitWidget_changed();
void on_mDataDefinedPropertiesButton_clicked();
};

@@ -140,7 +140,7 @@ class QgsGradientFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget
void setGradientSpread( int index );
void offsetChanged();
void referencePointChanged();
void on_mOffsetUnitWidget_changed( );
void on_mOffsetUnitWidget_changed();
void on_mDataDefinedPropertiesButton_clicked();
void colorModeChanged();
void on_mSpinAngle_valueChanged( double value );
@@ -168,12 +168,12 @@ class QgsShapeburstFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget
void colorModeChanged();
void on_mSpinBlurRadius_valueChanged( int value );
void on_mSpinMaxDistance_valueChanged( double value );
void on_mDistanceUnitWidget_changed( );
void on_mDistanceUnitWidget_changed();
void on_mRadioUseWholeShape_toggled( bool value );
void applyColorRamp();
void on_mButtonEditRamp_clicked();
void offsetChanged();
void on_mOffsetUnitWidget_changed( );
void on_mOffsetUnitWidget_changed();
void on_mDataDefinedPropertiesButton_clicked();
void on_mIgnoreRingsCheckBox_stateChanged( int state );
};
@@ -201,9 +201,9 @@ class QgsMarkerLineSymbolLayerV2Widget : QgsSymbolLayerV2Widget
void setRotate();
void setOffset();
void setPlacement();
void on_mIntervalUnitWidget_changed( );
void on_mOffsetUnitWidget_changed( );
void on_mOffsetAlongLineUnitWidget_changed( );
void on_mIntervalUnitWidget_changed();
void on_mOffsetUnitWidget_changed();
void on_mOffsetAlongLineUnitWidget_changed();
void on_mDataDefinedPropertiesButton_clicked();

};
@@ -238,9 +238,9 @@ class QgsSvgMarkerSymbolLayerV2Widget : QgsSymbolLayerV2Widget
void on_mChangeColorButton_colorChanged( const QColor& color );
void on_mChangeBorderColorButton_colorChanged( const QColor& color );
void on_mBorderWidthSpinBox_valueChanged( double d );
void on_mSizeUnitWidget_changed( );
void on_mBorderWidthUnitWidget_changed( );
void on_mOffsetUnitWidget_changed( );
void on_mSizeUnitWidget_changed();
void on_mBorderWidthUnitWidget_changed();
void on_mOffsetUnitWidget_changed();
void on_mDataDefinedPropertiesButton_clicked();
void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
void on_mVerticalAnchorComboBox_currentIndexChanged( int index );
@@ -337,8 +337,8 @@ class QgsFontMarkerSymbolLayerV2Widget : QgsSymbolLayerV2Widget
void setAngle( double angle );
void setCharacter( const QChar& chr );
void setOffset();
void on_mSizeUnitWidget_changed( );
void on_mOffsetUnitWidget_changed( );
void on_mSizeUnitWidget_changed();
void on_mOffsetUnitWidget_changed();
void on_mHorizontalAnchorComboBox_currentIndexChanged( int index );
void on_mVerticalAnchorComboBox_currentIndexChanged( int index );
};
@@ -14,7 +14,7 @@ class QgsSymbolsListWidget : QWidget
void setLineWidth( double width );
void addSymbolToStyle();
void symbolAddedToStyle( QString name, QgsSymbolV2* symbol );
void on_mSymbolUnitWidget_changed( );
void on_mSymbolUnitWidget_changed();
void on_mTransparencySlider_valueChanged( int value );

void on_groupsCombo_currentIndexChanged( int index );
@@ -471,7 +471,7 @@ def convex_hull(self, useField ):
outFeatFields = QgsFields()
if useField:
importedField = vproviderA.fields().at( self.myParam )
importedFieldName = importedField.name( )
importedFieldName = importedField.name()
#
outFeatFields.extend( vproviderA.fields() )
# creating area and perimeter fields
@@ -526,7 +526,7 @@ def convex_hull(self, useField ):
outFeat.setGeometry( outGeom )
(area, perim) = self.simpleMeasure( outGeom )
for f in firstFeature.fields():
outFeat.setAttribute( f.name( ), firstFeature.attribute( f.name( ) ) )
outFeat.setAttribute( f.name(), firstFeature.attribute( f.name() ) )
outFeat.setAttribute( "area", area )
outFeat.setAttribute( "perim", perim )
writer.addFeature( outFeat )
@@ -549,7 +549,7 @@ def convex_hull(self, useField ):
outFeat.setGeometry( outGeom )
(area, perim) = self.simpleMeasure( outGeom )
for f in inFeat.fields():
outFeat.setAttribute( f.name( ), inFeat.attribute( f.name( ) ) )
outFeat.setAttribute( f.name(), inFeat.attribute( f.name() ) )
outFeat.setAttribute( "area", area )
outFeat.setAttribute( "perim", perim )
writer.addFeature( outFeat )
@@ -586,7 +586,7 @@ def convex_hull(self, useField ):
outFeat.setGeometry( outGeom )
(area, perim) = self.simpleMeasure( outGeom )
for f in firstFeature.fields():
outFeat.setAttribute( f.name( ), firstFeature.attribute( f.name( ) ) )
outFeat.setAttribute( f.name(), firstFeature.attribute( f.name() ) )
outFeat.setAttribute( "area", area )
outFeat.setAttribute( "perim", perim )
writer.addFeature( outFeat )
@@ -610,7 +610,7 @@ def convex_hull(self, useField ):
outFeat.setGeometry( outGeom )
(area, perim) = self.simpleMeasure( outGeom )
for f in inFeat.fields():
outFeat.setAttribute( f.name( ), inFeat.attribute( f.name( ) ) )
outFeat.setAttribute( f.name(), inFeat.attribute( f.name() ) )
outFeat.setAttribute( "area", area )
outFeat.setAttribute( "perim", perim )
writer.addFeature( outFeat )
@@ -211,16 +211,16 @@ def randomize(self, inLayer, outPath, minimum, design, value):
if len(featErrors) >= 10:
err_msg = "Too many features couldn't be calculated due to conversion error. "
err_msg += "Please check out message log for more info."
msgLogInstance = QgsMessageLog.instance( )
msgLogInstance = QgsMessageLog.instance()
msgLogInstance.logMessage( "WARNING - fTools: " + self.tr( "Random Points" ) )
msgLogInstance.logMessage( "The following feature ids should be checked." )
for feat in featErrors:
msgLogInstance.logMessage( "Feature id: %d" % feat.id( ) )
msgLogInstance.logMessage( "Feature id: %d" % feat.id() )
msgLogInstance.logMessage( "End of features to be checked." )
else:
features_ids = []
for feat in featErrors:
features_ids.append( str( feat.id( ) ) )
features_ids.append( str( feat.id() ) )
erroneous_ids = ', '.join(features_ids)
err_msg = "The following features IDs couldn't be calculated due to conversion error: %s" % erroneous_ids
self.iface.messageBar().pushMessage("Errors", err_msg)

0 comments on commit 82b6e03

Please sign in to comment.
You can’t perform that action at this time.