Skip to content

Commit

Permalink
run sipify
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Jan 17, 2018
1 parent fe5a001 commit 458cab7
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion python/core/auth/qgsauthcertutils.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ Get short strings describing an SSL error

static QList<QSslError> validateCertChain( const QList<QSslCertificate> &certificateChain,
const QString &hostName = QString(),
bool trustRootCa = false ) ;
bool trustRootCa = false );
%Docstring
validateCertChain validates the given ``certificateChain``

Expand Down
4 changes: 2 additions & 2 deletions python/core/qgsrange.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ Returns true if this range overlaps another range.
};


typedef QgsTemporalRange< QDate > QgsDateRange ;
typedef QgsTemporalRange< QDate > QgsDateRange;
@TEMPLATE_DOCSTRING@%Docstring
@TEMPLATE_DOCSTRING@QgsRange which stores a range of dates.
@TEMPLATE_DOCSTRING@
Expand All @@ -260,7 +260,7 @@ typedef QgsTemporalRange< QDate > QgsDateRange ;
@TEMPLATE_DOCSTRING@.. seealso:: :py:class:`QgsDateTimeRange`
@TEMPLATE_DOCSTRING@%End

typedef QgsTemporalRange< QDateTime > QgsDateTimeRange ;
typedef QgsTemporalRange< QDateTime > QgsDateTimeRange;
@TEMPLATE_DOCSTRING@%Docstring
@TEMPLATE_DOCSTRING@QgsRange which stores a range of date times.
@TEMPLATE_DOCSTRING@
Expand Down
4 changes: 2 additions & 2 deletions python/core/qgsrunprocess.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ process and displays them in a dialog box.
void dialogGone();

private:
QgsRunProcess( const QString &action, bool capture ) ;
~QgsRunProcess() ;
QgsRunProcess( const QString &action, bool capture );
~QgsRunProcess();
};

/************************************************************************
Expand Down
6 changes: 3 additions & 3 deletions python/core/symbology/qgsmarkersymbollayer.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ Calculates the marker offset and rotation.


private:
virtual void draw( QgsSymbolRenderContext &context, QgsSimpleMarkerSymbolLayerBase::Shape shape, const QPolygonF &polygon, const QPainterPath &path ) = 0 ;
virtual void draw( QgsSymbolRenderContext &context, QgsSimpleMarkerSymbolLayerBase::Shape shape, const QPolygonF &polygon, const QPainterPath &path ) = 0;
%Docstring
Derived classes must implement draw() to handle drawing the generated shape onto the painter surface.

Expand Down Expand Up @@ -467,7 +467,7 @@ Prepares cache image


private:
virtual void draw( QgsSymbolRenderContext &context, QgsSimpleMarkerSymbolLayerBase::Shape shape, const QPolygonF &polygon, const QPainterPath &path ) ;
virtual void draw( QgsSymbolRenderContext &context, QgsSimpleMarkerSymbolLayerBase::Shape shape, const QPolygonF &polygon, const QPainterPath &path );

};

Expand Down Expand Up @@ -532,7 +532,7 @@ Creates a new QgsFilledMarkerSymbolLayer.

private:
QgsFilledMarkerSymbolLayer( const QgsFilledMarkerSymbolLayer & );
virtual void draw( QgsSymbolRenderContext &context, QgsSimpleMarkerSymbolLayerBase::Shape shape, const QPolygonF &polygon, const QPainterPath &path ) ;
virtual void draw( QgsSymbolRenderContext &context, QgsSimpleMarkerSymbolLayerBase::Shape shape, const QPolygonF &polygon, const QPainterPath &path );

};

Expand Down
2 changes: 1 addition & 1 deletion python/core/symbology/qgspointclusterrenderer.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Creates a QgsPointClusterRenderer from an existing renderer.
private:
QgsPointClusterRenderer( const QgsPointClusterRenderer & );
QgsPointClusterRenderer &operator=( const QgsPointClusterRenderer & );
virtual void drawGroup( QPointF centerPoint, QgsRenderContext &context, const QgsPointDistanceRenderer::ClusteredGroup &group ) ;
virtual void drawGroup( QPointF centerPoint, QgsRenderContext &context, const QgsPointDistanceRenderer::ClusteredGroup &group );

};

Expand Down
2 changes: 1 addition & 1 deletion python/core/symbology/qgspointdisplacementrenderer.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ Creates a QgsPointDisplacementRenderer from an existing renderer.
private:
QgsPointDisplacementRenderer( const QgsPointDisplacementRenderer & );
QgsPointDisplacementRenderer &operator=( const QgsPointDisplacementRenderer & );
virtual void drawGroup( QPointF centerPoint, QgsRenderContext &context, const QgsPointDistanceRenderer::ClusteredGroup &group ) ;
virtual void drawGroup( QPointF centerPoint, QgsRenderContext &context, const QgsPointDistanceRenderer::ClusteredGroup &group );

};

Expand Down
2 changes: 1 addition & 1 deletion python/core/symbology/qgspointdistancerenderer.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ Renders the labels for a group.
%End

private:
virtual void drawGroup( QPointF centerPoint, QgsRenderContext &context, const ClusteredGroup &group ) = 0 ;
virtual void drawGroup( QPointF centerPoint, QgsRenderContext &context, const ClusteredGroup &group ) = 0;
%Docstring
Draws a group of clustered points.

Expand Down
2 changes: 1 addition & 1 deletion python/core/symbology/qgssymbol.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ Will take ownership.
%End

private:
QgsSymbolRenderContext( const QgsSymbolRenderContext &rh ) ;
QgsSymbolRenderContext( const QgsSymbolRenderContext &rh );
};


Expand Down
44 changes: 22 additions & 22 deletions python/gui/qgsrasterformatsaveoptionswidget.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@ Reloads profiles list from QGIS settings
%End

private slots:
void mProfileNewButton_clicked() ;
void mProfileDeleteButton_clicked() ;
void mProfileResetButton_clicked() ;
void mOptionsAddButton_clicked() ;
void mOptionsDeleteButton_clicked() ;
void mOptionsLineEdit_editingFinished() ;
void optionsTableChanged() ;
void optionsTableEnableDeleteButton() ;
void updateOptions() ;
void swapOptionsUI( int newIndex = -1 ) ;
void updateControls() ;
void mProfileNewButton_clicked();
void mProfileDeleteButton_clicked();
void mProfileResetButton_clicked();
void mOptionsAddButton_clicked();
void mOptionsDeleteButton_clicked();
void mOptionsLineEdit_editingFinished();
void optionsTableChanged();
void optionsTableEnableDeleteButton();
void updateOptions();
void swapOptionsUI( int newIndex = -1 );
void updateControls();
protected:
virtual void showEvent( QShowEvent *event );

Expand All @@ -124,17 +124,17 @@ Reloads profiles list from QGIS settings
void optionsChanged();

private:
QString settingsKey( QString profile ) const ;
QString currentProfileKey() const ;
QString createOptions( const QString &profile ) const ;
void deleteCreateOptions( const QString &profile ) ;
void setCreateOptions() ;
void setCreateOptions( const QString &profile, const QString &options ) ;
void setCreateOptions( const QString &profile, const QStringList &list ) ;
QStringList profiles() const ;
virtual bool eventFilter( QObject *obj, QEvent *event ) ;

QString pseudoFormat() const ;
QString settingsKey( QString profile ) const;
QString currentProfileKey() const;
QString createOptions( const QString &profile ) const;
void deleteCreateOptions( const QString &profile );
void setCreateOptions();
void setCreateOptions( const QString &profile, const QString &options );
void setCreateOptions( const QString &profile, const QStringList &list );
QStringList profiles() const;
virtual bool eventFilter( QObject *obj, QEvent *event );

QString pseudoFormat() const;
};


Expand Down
8 changes: 4 additions & 4 deletions python/gui/qgsrasterpyramidsoptionswidget.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ Constructor for QgsRasterPyramidsOptionsWidget
void checkAllLevels( bool checked );

private slots:
void cbxPyramidsLevelsCustom_toggled( bool toggled ) ;
void cbxPyramidsFormat_currentIndexChanged( int index ) ;
void setOverviewList() ;
void updateUi() ;
void cbxPyramidsLevelsCustom_toggled( bool toggled );
void cbxPyramidsFormat_currentIndexChanged( int index );
void setOverviewList();
void updateUi();
signals:
void overviewListChanged();
void someValueChanged(); /* emitted when any other setting changes */
Expand Down
2 changes: 1 addition & 1 deletion python/gui/symbology/qgs25drendererwidget.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Constructor


private:
virtual void apply() ;
virtual void apply();

};

Expand Down
10 changes: 5 additions & 5 deletions python/gui/symbology/qgsrendererwidget.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Change marker angles of selected symbols
virtual void paste();

private:
virtual void apply() ;
virtual void apply();
%Docstring
This will be called whenever the renderer is set on a layer.
This can be overwritten in subclasses.
Expand Down Expand Up @@ -195,10 +195,10 @@ Returns the vector layer associated with the widget.
void init( int propertyKey ); // needed in children ctor to call virtual

private:
QgsProperty symbolDataDefined() const ;
virtual QgsProperty symbolDataDefined( const QgsSymbol * ) const = 0 ;
virtual double value( const QgsSymbol * ) const = 0 ;
virtual void setDataDefined( QgsSymbol *symbol, const QgsProperty &dd ) = 0 ;
QgsProperty symbolDataDefined() const;
virtual QgsProperty symbolDataDefined( const QgsSymbol * ) const = 0;
virtual double value( const QgsSymbol * ) const = 0;
virtual void setDataDefined( QgsSymbol *symbol, const QgsProperty &dd ) = 0;
};

class QgsDataDefinedSizeDialog : QgsDataDefinedValueDialog
Expand Down
2 changes: 1 addition & 1 deletion python/server/qgsbufferserverresponse.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Return body


private:
QgsBufferServerResponse( const QgsBufferServerResponse & ) ;
QgsBufferServerResponse( const QgsBufferServerResponse & );
};

/************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion python/server/qgsconfigcache.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ path. If the project is not available, then a None is returned.
%End

private:
QgsConfigCache() ;
QgsConfigCache();
};

/************************************************************************
Expand Down

0 comments on commit 458cab7

Please sign in to comment.