Skip to content

Commit

Permalink
s/( )/()/; s/== /== /; s/!= /!= /;
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jul 19, 2017
1 parent f814ba0 commit 4f9a9e0
Show file tree
Hide file tree
Showing 104 changed files with 288 additions and 288 deletions.
24 changes: 12 additions & 12 deletions python/core/geometry/qgsregularpolygon.sip
Original file line number Diff line number Diff line change
Expand Up @@ -137,45 +137,45 @@ A regular polygon is empty if radius equal to 0 or number of sides < 3
.. seealso:: numberSides()
%End

QgsPointSequence points( ) const;
QgsPointSequence points() const;
%Docstring
Returns a list including the vertices of the regular polygon.
:rtype: QgsPointSequence
%End

QgsPolygonV2 *toPolygon( ) const /Factory/;
QgsPolygonV2 *toPolygon() const /Factory/;
%Docstring
Returns as a polygon.
:rtype: QgsPolygonV2
%End

QgsLineString *toLineString( ) const /Factory/;
QgsLineString *toLineString() const /Factory/;
%Docstring
Returns as a linestring.
:rtype: QgsLineString
%End

QgsTriangle toTriangle( ) const;
QgsTriangle toTriangle() const;
%Docstring
Returns as a triangle.
An empty triangle is returned if the regular polygon is empty or if the number of sides is different from 3.
:rtype: QgsTriangle
%End

QList<QgsTriangle> triangulate( ) const;
QList<QgsTriangle> triangulate() const;
%Docstring
Returns a triangulation (vertices from sides to the center) of the regular polygon.
An empty list is returned if the regular polygon is empty.
:rtype: list of QgsTriangle
%End

QgsCircle inscribedCircle( ) const;
QgsCircle inscribedCircle() const;
%Docstring
Returns the inscribed circle
:rtype: QgsCircle
%End

QgsCircle circumscribedCircle( ) const;
QgsCircle circumscribedCircle() const;
%Docstring
Returns the circumscribed circle
:rtype: QgsCircle
Expand All @@ -188,33 +188,33 @@ A regular polygon is empty if radius equal to 0 or number of sides < 3
:rtype: str
%End

double interiorAngle( ) const;
double interiorAngle() const;
%Docstring
Returns the measure of the interior angles in degrees.
:rtype: float
%End

double centralAngle( ) const;
double centralAngle() const;
%Docstring
Returns the measure of the central angle (the angle subtended at the center of the polygon by one of its sides) in degrees.
:rtype: float
%End

double area( ) const;
double area() const;
%Docstring
Returns the area.
Returns 0 if the regular polygon is empty.
:rtype: float
%End

double perimeter( ) const;
double perimeter() const;
%Docstring
Returns the perimeter.
Returns 0 if the regular polygon is empty.
:rtype: float
%End

double length( ) const;
double length() const;
%Docstring
Returns the length of a side.
Returns 0 if the regular polygon is empty.
Expand Down
18 changes: 9 additions & 9 deletions python/core/geometry/qgstriangle.sip
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:rtype: bool
%End

QVector<QgsLineString> altitudes( ) const;
QVector<QgsLineString> altitudes() const;
%Docstring
An altitude is a segment (defined by a QgsLineString) from a vertex to the opposite side (or, if necessary, to the extension of the opposite side).
:return: Three altitudes from this triangle
Expand All @@ -214,7 +214,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:rtype: list of QgsLineString
%End

QVector<QgsLineString> medians( ) const;
QVector<QgsLineString> medians() const;
%Docstring
A median is a segment (defined by a QgsLineString) from a vertex to the midpoint of the opposite side.
:return: Three medians from this triangle
Expand All @@ -241,7 +241,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:rtype: list of QgsLineString
%End

QgsTriangle medial( ) const;
QgsTriangle medial() const;
%Docstring
Medial (or midpoint) triangle of a triangle ABC is the triangle with vertices at the midpoints of the triangle's sides.
:return: The medial from this triangle
Expand All @@ -268,7 +268,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:rtype: QgsPoint
%End

QgsPoint circumscribedCenter( ) const;
QgsPoint circumscribedCenter() const;
%Docstring
Center of the circumscribed circle of the triangle.
:return: The center of the circumscribed circle of the triangle
Expand All @@ -281,7 +281,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:rtype: QgsPoint
%End

double circumscribedRadius( ) const;
double circumscribedRadius() const;
%Docstring
Radius of the circumscribed circle of the triangle.
:return: The radius of the circumscribed circle of the triangle
Expand All @@ -294,7 +294,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:rtype: float
%End

QgsCircle circumscribedCircle( ) const;
QgsCircle circumscribedCircle() const;
%Docstring
Circumscribed circle of the triangle.
@return The circumbscribed of the triangle with a QgsCircle.
Expand All @@ -307,7 +307,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:rtype: QgsCircle
%End

QgsPoint inscribedCenter( ) const;
QgsPoint inscribedCenter() const;
%Docstring
Center of the inscribed circle of the triangle.
:return: The center of the inscribed circle of the triangle
Expand All @@ -320,7 +320,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:rtype: QgsPoint
%End

double inscribedRadius( ) const;
double inscribedRadius() const;
%Docstring
Radius of the inscribed circle of the triangle.
:return: The radius of the inscribed circle of the triangle
Expand All @@ -333,7 +333,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:rtype: float
%End

QgsCircle inscribedCircle( ) const;
QgsCircle inscribedCircle() const;
%Docstring
Inscribed circle of the triangle.
@return The inscribed of the triangle with a QgsCircle.
Expand Down
2 changes: 1 addition & 1 deletion python/core/qgsbrowsermodel.sip
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Refresh item children
%Docstring
Emitted when item children fetch was finished
%End
void connectionsChanged( );
void connectionsChanged();
%Docstring
notify the provider dialogs of a changed connection
%End
Expand Down
2 changes: 1 addition & 1 deletion python/core/qgsdataitem.sip
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ Refresh connections: update GUI and emit signal
void endRemoveItems();
void dataChanged( QgsDataItem *item );
void stateChanged( QgsDataItem *item, QgsDataItem::State oldState );
void connectionsChanged( );
void connectionsChanged();
%Docstring
open browsers
%End
Expand Down
8 changes: 4 additions & 4 deletions python/gui/qgsabstractdatasourcewidget.sip
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class QgsAbstractDataSourceWidget : QDialog
%End
public:

~QgsAbstractDataSourceWidget( );
~QgsAbstractDataSourceWidget();
%Docstring
Destructor
%End
Expand All @@ -40,7 +40,7 @@ Destructor

public slots:

virtual void refresh( );
virtual void refresh();
%Docstring
Triggered when the provider's connections need to be refreshed
The default implementation does nothing
Expand Down Expand Up @@ -86,13 +86,13 @@ Emitted when a progress dialog is shown by the provider dialog
Constructor
%End

QgsProviderRegistry::WidgetMode widgetMode( ) const;
QgsProviderRegistry::WidgetMode widgetMode() const;
%Docstring
Return the widget mode
:rtype: QgsProviderRegistry.WidgetMode
%End

const QgsMapCanvas *mapCanvas( ) const;
const QgsMapCanvas *mapCanvas() const;
%Docstring
Return the map canvas (can be null)
:rtype: QgsMapCanvas
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsbrowserdockwidget.sip
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Emitted when a file needs to be opened
%Docstring
Emitted when drop uri list needs to be handled
%End
void connectionsChanged( );
void connectionsChanged();
%Docstring
Connections changed in the browser
%End
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsbrowsertreeview.sip
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class QgsBrowserTreeView : QTreeView
%Docstring
Set the browser model
%End
QgsBrowserModel *browserModel( );
QgsBrowserModel *browserModel();
%Docstring
Return the browser model
:rtype: QgsBrowserModel
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsowssourceselect.sip
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Constructor

public slots:

virtual void refresh( );
virtual void refresh();

%Docstring
Triggered when the provider's connections need to be refreshed
Expand Down
4 changes: 2 additions & 2 deletions python/server/qgsbufferserverrequest.sip
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ class QgsBufferServerRequest : QgsServerRequest
%End
public:

QgsBufferServerRequest( const QString &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers( ), QByteArray *data = 0 );
QgsBufferServerRequest( const QString &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers(), QByteArray *data = 0 );
%Docstring
Constructor

\param url the url string
\param method the request method
%End

QgsBufferServerRequest( const QUrl &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers( ), QByteArray *data = 0 );
QgsBufferServerRequest( const QUrl &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers(), QByteArray *data = 0 );
%Docstring
Constructor

Expand Down
2 changes: 1 addition & 1 deletion python/server/qgsbufferserverresponse.sip
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class QgsBufferServerResponse: QgsServerResponse
\param code HTTP status code value
%End

virtual int statusCode( ) const;
virtual int statusCode() const;
%Docstring
Return the http status code
:rtype: int
Expand Down
2 changes: 1 addition & 1 deletion python/server/qgsrequesthandler.sip
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Return request url
Set response http status code
%End

int statusCode( ) const;
int statusCode() const;
%Docstring
Return response http status code
:rtype: int
Expand Down
2 changes: 1 addition & 1 deletion python/server/qgsserver.sip
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Returns a pointer to the server interface
:rtype: QgsServerInterfaceImpl
%End

void initPython( );
void initPython();
%Docstring
Note: not in Python bindings
%End
Expand Down
6 changes: 3 additions & 3 deletions python/server/qgsserverrequest.sip
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class QgsServerRequest
Constructor
%End

QgsServerRequest( const QString &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers( ) );
QgsServerRequest( const QString &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers() );
%Docstring
Constructor

Expand All @@ -45,7 +45,7 @@ class QgsServerRequest
\param headers
%End

QgsServerRequest( const QUrl &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers( ) );
QgsServerRequest( const QUrl &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers() );
%Docstring
Constructor

Expand Down Expand Up @@ -109,7 +109,7 @@ destructor
@param value
%End

QMap<QString, QString> headers( ) const;
QMap<QString, QString> headers() const;
%Docstring
Return the header map
@return the headers map
Expand Down
4 changes: 2 additions & 2 deletions python/server/qgsserverresponse.sip
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ destructor
:rtype: str
%End

virtual QMap<QString, QString> headers( ) const = 0;
virtual QMap<QString, QString> headers() const = 0;
%Docstring
Return the header value
:rtype: QMap<str, QString>
Expand All @@ -68,7 +68,7 @@ destructor
\param code HTTP status code value
%End

virtual int statusCode( ) const = 0;
virtual int statusCode() const = 0;
%Docstring
Return the http status code
:rtype: int
Expand Down
2 changes: 1 addition & 1 deletion scripts/spell_check/check_spelling.sh
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ for I in $(seq -f '%02g' 0 $(($SPLIT-1)) ) ; do
echo "*** error: could not find error in $LINE" >&2
else
# if the error is not in IGNORECASE_INWORD, then it matched previous and next character (needs to remove them)
# also make error small case and escape special chars: ( ) |
# also make error small case and escape special chars: () |
ERRORSMALLCASE=$(echo ${ERROR,,} |${GP}sed -r 's/\(/\\(/g' |${GP}sed -r 's/\)/\\)/g' |${GP}sed -r 's/\|/\\|/g')
if [[ ! "${ERRORSMALLCASE}" =~ $IGNORECASE_INWORD ]]; then
if [[ -n $(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE:1:-1}${ERRORSMALLCASE: -1}?:" scripts/spell_check/spelling.dat) ]]; then
Expand Down
6 changes: 3 additions & 3 deletions src/app/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -812,13 +812,13 @@ int main( int argc, char *argv[] )
// - use the path specified with --globalsettings path,
// - use the environment if not found
// - use a default location as a fallback
if ( globalsettingsfile.isEmpty( ) )
if ( globalsettingsfile.isEmpty() )
{
globalsettingsfile = getenv( "QGIS_GLOBAL_SETTINGS_FILE" );
}
if ( globalsettingsfile.isEmpty( ) )
if ( globalsettingsfile.isEmpty() )
{
QString default_globalsettingsfile = QgsApplication::pkgDataPath( ) + "/qgis_global_settings.ini";
QString default_globalsettingsfile = QgsApplication::pkgDataPath() + "/qgis_global_settings.ini";
if ( QFile::exists( default_globalsettingsfile ) )
{
globalsettingsfile = default_globalsettingsfile;
Expand Down
4 changes: 2 additions & 2 deletions src/app/nodetool/qgsnodeeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ QVariant QgsNodeEditorModel::data( const QModelIndex &index, int role ) const
return vertex->point().y();
else if ( index.column() == mZCol )
return vertex->point().z();
else if ( index.column() == mMCol )
else if ( index.column() == mMCol )
return vertex->point().m();
else if ( index.column() == mRCol )
{
Expand Down Expand Up @@ -175,7 +175,7 @@ QVariant QgsNodeEditorModel::headerData( int section, Qt::Orientation orientatio
return QVariant( tr( "y" ) );
else if ( section == mZCol )
return QVariant( tr( "z" ) );
else if ( section == mMCol )
else if ( section == mMCol )
return QVariant( tr( "m" ) );
else if ( section == mRCol )
return QVariant( tr( "r" ) );
Expand Down
2 changes: 1 addition & 1 deletion src/app/nodetool/qgsnodeeditor.h
Original file line number Diff line number Diff line change