Skip to content

Commit 42676dc

Browse files
committed
Move some getters which are incorrectly marked as slots,
remove some unnecessary 'const's from signals Thanks to clazy const-signal-or-slot check
1 parent 3d8440c commit 42676dc

21 files changed

+968
-969
lines changed

python/core/auth/qgsauthmanager.sip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ The display name of the Authentication Manager
700700
\param level Message log level
701701
%End
702702

703-
void passwordHelperMessageOut( const QString &message, const QString &tag = QgsAuthManager::AUTH_MAN_TAG, QgsAuthManager::MessageLevel level = QgsAuthManager::INFO ) const;
703+
void passwordHelperMessageOut( const QString &message, const QString &tag = QgsAuthManager::AUTH_MAN_TAG, QgsAuthManager::MessageLevel level = QgsAuthManager::INFO );
704704
%Docstring
705705
Custom logging signal to inform the user about master password <-> password manager interactions
706706
@see QgsMessageLog
@@ -710,18 +710,18 @@ The display name of the Authentication Manager
710710
%End
711711

712712

713-
void masterPasswordVerified( bool verified ) const;
713+
void masterPasswordVerified( bool verified );
714714
%Docstring
715715
Emitted when a password has been verify (or not)
716716
\param verified The state of password's verification
717717
%End
718718

719-
void authDatabaseEraseRequested() const;
719+
void authDatabaseEraseRequested();
720720
%Docstring
721721
Emitted when a user has indicated they may want to erase the authentication db.
722722
%End
723723

724-
void authDatabaseChanged() const;
724+
void authDatabaseChanged();
725725
%Docstring
726726
Emitted when the authentication db is significantly changed, e.g. large record removal, erased, etc.
727727
%End

python/core/composer/qgscomposition.sip

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,24 @@ Prepare the printer for printing in a PDF
971971
:rtype: QRectF
972972
%End
973973

974+
virtual QgsExpressionContext createExpressionContext() const;
975+
976+
%Docstring
977+
Creates an expression context relating to the compositions's current state. The context includes
978+
scopes for global, project, composition and atlas properties.
979+
.. versionadded:: 2.12
980+
:rtype: QgsExpressionContext
981+
%End
982+
983+
QgsPropertyCollection &dataDefinedProperties();
984+
%Docstring
985+
Returns a reference to the composition's property collection, used for data defined overrides.
986+
.. versionadded:: 3.0
987+
.. seealso:: setDataDefinedProperties()
988+
:rtype: QgsPropertyCollection
989+
%End
990+
991+
974992
public slots:
975993
void sendItemAddedSignal( QgsComposerItem *item );
976994
%Docstring
@@ -1018,24 +1036,6 @@ Casts object to the proper subclass type and calls corresponding itemAdded signa
10181036
.. versionadded:: 2.5
10191037
%End
10201038

1021-
virtual QgsExpressionContext createExpressionContext() const;
1022-
1023-
%Docstring
1024-
Creates an expression context relating to the compositions's current state. The context includes
1025-
scopes for global, project, composition and atlas properties.
1026-
.. versionadded:: 2.12
1027-
:rtype: QgsExpressionContext
1028-
%End
1029-
1030-
QgsPropertyCollection &dataDefinedProperties();
1031-
%Docstring
1032-
Returns a reference to the composition's property collection, used for data defined overrides.
1033-
.. versionadded:: 3.0
1034-
.. seealso:: setDataDefinedProperties()
1035-
:rtype: QgsPropertyCollection
1036-
%End
1037-
1038-
10391039
void setDataDefinedProperties( const QgsPropertyCollection &collection );
10401040
%Docstring
10411041
Sets the composition's property collection, used for data defined overrides.

python/core/qgsbrowsermodel.sip

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,12 @@ Refresh item children
134134
virtual void fetchMore( const QModelIndex &parent );
135135

136136

137+
bool initialized( ) const;
138+
%Docstring
139+
Returns true if the model has been initialized
140+
:rtype: bool
141+
%End
142+
137143
signals:
138144
void stateChanged( const QModelIndex &index, QgsDataItem::State oldState );
139145
%Docstring
@@ -179,12 +185,6 @@ Reload the whole model
179185
Hide the given path in the browser model
180186
%End
181187

182-
bool initialized( ) const;
183-
%Docstring
184-
Returns true if the model has been initialized
185-
:rtype: bool
186-
%End
187-
188188
void initialize();
189189
%Docstring
190190
Delayed initialization, needed because the provider registry must be already populated

python/core/qgsdataprovider.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ Current time stamp of data source
391391
feature ids should be invalidated.
392392
%End
393393

394-
void notify( const QString &msg ) const;
394+
void notify( const QString &msg );
395395
%Docstring
396396
Emitted when datasource issues a notification
397397

python/core/qgsmaplayer.sip

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -906,6 +906,22 @@ Time stamp of data source in the moment when data/metadata were loaded by provid
906906
:rtype: set of QgsMapLayerDependency
907907
%End
908908

909+
QString refreshOnNotifyMessage() const;
910+
%Docstring
911+
Returns the message that should be notified by the provider to triggerRepaint
912+
913+
.. versionadded:: 3.0
914+
:rtype: str
915+
%End
916+
917+
bool isRefreshOnNotifyEnabled() const;
918+
%Docstring
919+
Returns true if the refresh on provider nofification is enabled
920+
921+
.. versionadded:: 3.0
922+
:rtype: bool
923+
%End
924+
909925
public slots:
910926

911927
void setMinimumScale( double scale );
@@ -988,23 +1004,6 @@ Time stamp of data source in the moment when data/metadata were loaded by provid
9881004
.. versionadded:: 3.0
9891005
%End
9901006

991-
QString refreshOnNotifyMessage() const;
992-
%Docstring
993-
Returns the message that should be notified by the provider to triggerRepaint
994-
995-
.. versionadded:: 3.0
996-
:rtype: str
997-
%End
998-
999-
bool isRefreshOnNotifyEnabled() const;
1000-
%Docstring
1001-
Returns true if the refresh on provider nofification is enabled
1002-
1003-
.. versionadded:: 3.0
1004-
:rtype: bool
1005-
%End
1006-
1007-
10081007
signals:
10091008

10101009
void statusChanged( const QString &status );

python/core/qgsvectordataprovider.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ Returns a list of available encodings
533533
.. versionadded:: 3.0
534534
:rtype: bool
535535
%End
536+
536537
signals:
537538

538539
void raiseError( const QString &msg ) const;

python/core/qgsvectorlayer.sip

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,6 +1755,14 @@ Returns the current blending mode for features
17551755
source has no metadata, false if it's the data provider which determines
17561756
it.
17571757

1758+
.. versionadded:: 3.0
1759+
:rtype: bool
1760+
%End
1761+
1762+
bool isEditCommandActive() const;
1763+
%Docstring
1764+
Test if an edit command is active
1765+
17581766
.. versionadded:: 3.0
17591767
:rtype: bool
17601768
%End
@@ -1821,14 +1829,6 @@ Returns the current blending mode for features
18211829
:rtype: bool
18221830
%End
18231831

1824-
bool isEditCommandActive() const;
1825-
%Docstring
1826-
Test if an edit command is active
1827-
1828-
.. versionadded:: 3.0
1829-
:rtype: bool
1830-
%End
1831-
18321832
signals:
18331833

18341834
void selectionChanged( const QgsFeatureIds &selected, const QgsFeatureIds &deselected, const bool clearAndSelect );

0 commit comments

Comments
 (0)