sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix SIP_SKIP and SIP_FORCE being left alone

Browse Source
This commit is contained in:
Denis Rouzaud 2024-12-06 09:38:28 +01:00 committed by Nyall Dawson
parent d5b8c7e003
commit 5fdf6dd77a
33 changed files with 184 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/PyQt6/gui/auto_additions/qgscodeeditor.py
View File

@ -57,7 +57,7 @@ QgsCodeEditor.Flags = lambda flags=0: QgsCodeEditor.Flag(flags)
QgsCodeEditor.Flags.baseClass = QgsCodeEditor
Flags = QgsCodeEditor # dirty hack since SIP seems to introduce the flags in module
try:
QgsCodeEditor.__attribute_docs__ = {'SEARCH_RESULT_INDICATOR': 'Indicator index for search results', 'sessionHistoryCleared': 'Emitted when the history of commands run in the current session is cleared.\n\n.. versionadded:: 3.30\n', 'persistentHistoryCleared': 'Emitted when the persistent history of commands run in the editor is cleared.\n\n.. versionadded:: 3.30\n', 'helpRequested': 'Emitted when documentation was requested for the specified ``word``.\n\n.. versionadded:: 3.42\n'}
QgsCodeEditor.__attribute_docs__ = {'sessionHistoryCleared': 'Emitted when the history of commands run in the current session is cleared.\n\n.. versionadded:: 3.30\n', 'persistentHistoryCleared': 'Emitted when the persistent history of commands run in the editor is cleared.\n\n.. versionadded:: 3.30\n', 'helpRequested': 'Emitted when documentation was requested for the specified ``word``.\n\n.. versionadded:: 3.42\n'}
QgsCodeEditor.languageToString = staticmethod(QgsCodeEditor.languageToString)
QgsCodeEditor.defaultColor = staticmethod(QgsCodeEditor.defaultColor)
QgsCodeEditor.color = staticmethod(QgsCodeEditor.color)

11
python/PyQt6/gui/auto_additions/qgsprojectionselectionwidget.py
View File

@ -6,17 +6,6 @@ QgsProjectionSelectionWidget.CurrentCrs = QgsProjectionSelectionWidget.CrsOption
QgsProjectionSelectionWidget.DefaultCrs = QgsProjectionSelectionWidget.CrsOption.DefaultCrs
QgsProjectionSelectionWidget.RecentCrs = QgsProjectionSelectionWidget.CrsOption.RecentCrs
QgsProjectionSelectionWidget.CrsNotSet = QgsProjectionSelectionWidget.CrsOption.CrsNotSet
QgsProjectionSelectionWidget.CrsOptions = lambda flags=0: QgsProjectionSelectionWidget.CrsOption(flags)
from enum import Enum
def _force_int(v): return int(v.value) if isinstance(v, Enum) else v
QgsProjectionSelectionWidget.CrsOption.__bool__ = lambda flag: bool(_force_int(flag))
QgsProjectionSelectionWidget.CrsOption.__eq__ = lambda flag1, flag2: _force_int(flag1) == _force_int(flag2)
QgsProjectionSelectionWidget.CrsOption.__and__ = lambda flag1, flag2: _force_int(flag1) & _force_int(flag2)
QgsProjectionSelectionWidget.CrsOption.__or__ = lambda flag1, flag2: QgsProjectionSelectionWidget.CrsOption(_force_int(flag1) | _force_int(flag2))
try:
QgsProjectionSelectionWidget.__attribute_docs__ = {'crsChanged': 'Emitted when the selected CRS is changed\n', 'cleared': 'Emitted when the not set option is selected.\n'}
QgsProjectionSelectionWidget.__signal_arguments__ = {'crsChanged': ['crs: QgsCoordinateReferenceSystem']}

6
python/PyQt6/gui/auto_generated/codeeditors/qgscodeeditor.sip.in
View File

@ -98,7 +98,11 @@ A text editor based on QScintilla2.
typedef QFlags<QgsCodeEditor::Flag> Flags;
static const int SEARCH_RESULT_INDICATOR;
static const int SEARCH_RESULT_INDICATOR
%Docstring
Indicator index for search results
%End
= QsciScintilla::INDIC_MAX - 1;
QgsCodeEditor( QWidget *parent /TransferThis/ = 0, const QString &title = QString(), bool folding = false, bool margin = false, QgsCodeEditor::Flags flags = QgsCodeEditor::Flags(), QgsCodeEditor::Mode mode = QgsCodeEditor::Mode::ScriptEditor );
%Docstring

8
python/PyQt6/gui/auto_generated/layout/qgslayoutview.sip.in
View File

@ -270,15 +270,7 @@ Returns the delta (in layout coordinates) by which to move items
for the given key ``event``.
%End
void setPaintingEnabled( bool enabled );
%Docstring
Sets whether widget repainting should be allowed for the view. This is
used to temporarily halt painting while exporting layouts.
.. note::
Not available in Python bindings.
%End
void setSectionLabel( const QString &label );
%Docstring
Sets a section ``label``, to display above the first page shown in the

32
python/PyQt6/gui/auto_generated/maptools/qgsmaptoolcapture.sip.in
View File

@ -329,10 +329,34 @@ Stop capturing
%End
private:
virtual void geometryCaptured( const QgsGeometry &geometry );
%Docstring
Called when the geometry is captured
A more specific handler is also called afterwards (pointCaptured, lineCaptured or polygonCaptured)
.. versionadded:: 3.26
%End
virtual void pointCaptured( const QgsPoint &point );
%Docstring
Called when a point is captured
geometryCaptured is called just before
.. versionadded:: 3.26
%End
virtual void lineCaptured( const QgsCurve *line );
%Docstring
Called when a line is captured
geometryCaptured is called just before
.. versionadded:: 3.26
%End
virtual void polygonCaptured( const QgsCurvePolygon *polygon );
%Docstring
Called when a polygon is captured
geometryCaptured is called just before
.. versionadded:: 3.26
%End
};
QFlags<QgsMapToolCapture::Capability> operator|(QgsMapToolCapture::Capability f1, QFlags<QgsMapToolCapture::Capability> f2);

24
python/PyQt6/gui/auto_generated/maptools/qgsmaptoolcapturelayergeometry.sip.in
View File

@ -28,10 +28,26 @@ Constructor
%End
private:
virtual void layerGeometryCaptured( const QgsGeometry &geometry );
%Docstring
Called when the geometry is captured
A more specific handler is also called afterwards (layerPointCaptured, layerLineCaptured or layerPolygonCaptured)
%End
virtual void layerPointCaptured( const QgsPoint &point );
%Docstring
Called when a point is captured
The generic :py:func:`~QgsMapToolCaptureLayerGeometry.geometryCaptured` signal will be emitted immediately before this point-specific signal.
%End
virtual void layerLineCaptured( const QgsCurve *line );
%Docstring
Called when a line is captured
The generic :py:func:`~QgsMapToolCaptureLayerGeometry.geometryCaptured` signal will be emitted immediately before this line-specific signal.
%End
virtual void layerPolygonCaptured( const QgsCurvePolygon *polygon );
%Docstring
Called when a polygon is captured
The generic :py:func:`~QgsMapToolCaptureLayerGeometry.geometryCaptured` signal will be emitted immediately before this polygon-specific signal.
%End
};
/************************************************************************

7
python/PyQt6/gui/auto_generated/maptools/qgsmaptooldigitizefeature.sip.in
View File

@ -90,7 +90,12 @@ Check if CaptureMode matches layer type. Default is ``True``.
%End
private:
virtual void featureDigitized( const QgsFeature &feature );
%Docstring
Called when the feature has been digitized
.. versionadded:: 3.26
%End
};
/************************************************************************

7
python/PyQt6/gui/auto_generated/proj/qgsprojectionselectionwidget.sip.in
View File

@ -32,10 +32,7 @@ A widget for selecting a projection.
CrsNotSet,
};
typedef QFlags<QgsProjectionSelectionWidget::CrsOption> CrsOptions;
explicit QgsProjectionSelectionWidget( QWidget *parent /TransferThis/ = 0, QgsCoordinateReferenceSystemProxyModel::Filters filters = QgsCoordinateReferenceSystemProxyModel::FilterHorizontal | QgsCoordinateReferenceSystemProxyModel::FilterCompound );
explicit QgsProjectionSelectionWidget( QWidget *parent /TransferThis/ = 0, QgsCoordinateReferenceSystemProxyModel::Filters filters = QgsCoordinateReferenceSystemProxyModel::FilterHorizontal | QgsCoordinateReferenceSystemProxyModel::FilterCompound );
%Docstring
Constructor for QgsProjectionSelectionWidget, with the specified ``parent`` widget.
@ -213,8 +210,6 @@ Opens the dialog for selecting a new CRS
};
QFlags<QgsProjectionSelectionWidget::CrsOption> operator|(QgsProjectionSelectionWidget::CrsOption f1, QFlags<QgsProjectionSelectionWidget::CrsOption> f2);

2
python/gui/auto_additions/qgscodeeditor.py
View File

@ -56,7 +56,7 @@ QgsCodeEditor.Flag.baseClass = QgsCodeEditor
QgsCodeEditor.Flags.baseClass = QgsCodeEditor
Flags = QgsCodeEditor # dirty hack since SIP seems to introduce the flags in module
try:
QgsCodeEditor.__attribute_docs__ = {'SEARCH_RESULT_INDICATOR': 'Indicator index for search results', 'sessionHistoryCleared': 'Emitted when the history of commands run in the current session is cleared.\n\n.. versionadded:: 3.30\n', 'persistentHistoryCleared': 'Emitted when the persistent history of commands run in the editor is cleared.\n\n.. versionadded:: 3.30\n', 'helpRequested': 'Emitted when documentation was requested for the specified ``word``.\n\n.. versionadded:: 3.42\n'}
QgsCodeEditor.__attribute_docs__ = {'sessionHistoryCleared': 'Emitted when the history of commands run in the current session is cleared.\n\n.. versionadded:: 3.30\n', 'persistentHistoryCleared': 'Emitted when the persistent history of commands run in the editor is cleared.\n\n.. versionadded:: 3.30\n', 'helpRequested': 'Emitted when documentation was requested for the specified ``word``.\n\n.. versionadded:: 3.42\n'}
QgsCodeEditor.languageToString = staticmethod(QgsCodeEditor.languageToString)
QgsCodeEditor.defaultColor = staticmethod(QgsCodeEditor.defaultColor)
QgsCodeEditor.color = staticmethod(QgsCodeEditor.color)

6
python/gui/auto_generated/codeeditors/qgscodeeditor.sip.in
View File

@ -98,7 +98,11 @@ A text editor based on QScintilla2.
typedef QFlags<QgsCodeEditor::Flag> Flags;
static const int SEARCH_RESULT_INDICATOR;
static const int SEARCH_RESULT_INDICATOR
%Docstring
Indicator index for search results
%End
= QsciScintilla::INDIC_MAX - 1;
QgsCodeEditor( QWidget *parent /TransferThis/ = 0, const QString &title = QString(), bool folding = false, bool margin = false, QgsCodeEditor::Flags flags = QgsCodeEditor::Flags(), QgsCodeEditor::Mode mode = QgsCodeEditor::Mode::ScriptEditor );
%Docstring

8
python/gui/auto_generated/layout/qgslayoutview.sip.in
View File

@ -270,15 +270,7 @@ Returns the delta (in layout coordinates) by which to move items
for the given key ``event``.
%End
void setPaintingEnabled( bool enabled );
%Docstring
Sets whether widget repainting should be allowed for the view. This is
used to temporarily halt painting while exporting layouts.
.. note::
Not available in Python bindings.
%End
void setSectionLabel( const QString &label );
%Docstring
Sets a section ``label``, to display above the first page shown in the

32
python/gui/auto_generated/maptools/qgsmaptoolcapture.sip.in
View File

@ -329,10 +329,34 @@ Stop capturing
%End
private:
virtual void geometryCaptured( const QgsGeometry &geometry );
%Docstring
Called when the geometry is captured
A more specific handler is also called afterwards (pointCaptured, lineCaptured or polygonCaptured)
.. versionadded:: 3.26
%End
virtual void pointCaptured( const QgsPoint &point );
%Docstring
Called when a point is captured
geometryCaptured is called just before
.. versionadded:: 3.26
%End
virtual void lineCaptured( const QgsCurve *line );
%Docstring
Called when a line is captured
geometryCaptured is called just before
.. versionadded:: 3.26
%End
virtual void polygonCaptured( const QgsCurvePolygon *polygon );
%Docstring
Called when a polygon is captured
geometryCaptured is called just before
.. versionadded:: 3.26
%End
};
QFlags<QgsMapToolCapture::Capability> operator|(QgsMapToolCapture::Capability f1, QFlags<QgsMapToolCapture::Capability> f2);

24
python/gui/auto_generated/maptools/qgsmaptoolcapturelayergeometry.sip.in
View File

@ -28,10 +28,26 @@ Constructor
%End
private:
virtual void layerGeometryCaptured( const QgsGeometry &geometry );
%Docstring
Called when the geometry is captured
A more specific handler is also called afterwards (layerPointCaptured, layerLineCaptured or layerPolygonCaptured)
%End
virtual void layerPointCaptured( const QgsPoint &point );
%Docstring
Called when a point is captured
The generic :py:func:`~QgsMapToolCaptureLayerGeometry.geometryCaptured` signal will be emitted immediately before this point-specific signal.
%End
virtual void layerLineCaptured( const QgsCurve *line );
%Docstring
Called when a line is captured
The generic :py:func:`~QgsMapToolCaptureLayerGeometry.geometryCaptured` signal will be emitted immediately before this line-specific signal.
%End
virtual void layerPolygonCaptured( const QgsCurvePolygon *polygon );
%Docstring
Called when a polygon is captured
The generic :py:func:`~QgsMapToolCaptureLayerGeometry.geometryCaptured` signal will be emitted immediately before this polygon-specific signal.
%End
};
/************************************************************************

7
python/gui/auto_generated/maptools/qgsmaptooldigitizefeature.sip.in
View File

@ -90,7 +90,12 @@ Check if CaptureMode matches layer type. Default is ``True``.
%End
private:
virtual void featureDigitized( const QgsFeature &feature );
%Docstring
Called when the feature has been digitized
.. versionadded:: 3.26
%End
};
/************************************************************************

7
python/gui/auto_generated/proj/qgsprojectionselectionwidget.sip.in
View File

@ -32,10 +32,7 @@ A widget for selecting a projection.
CrsNotSet,
};
typedef QFlags<QgsProjectionSelectionWidget::CrsOption> CrsOptions;
explicit QgsProjectionSelectionWidget( QWidget *parent /TransferThis/ = 0, QgsCoordinateReferenceSystemProxyModel::Filters filters = QgsCoordinateReferenceSystemProxyModel::FilterHorizontal | QgsCoordinateReferenceSystemProxyModel::FilterCompound );
explicit QgsProjectionSelectionWidget( QWidget *parent /TransferThis/ = 0, QgsCoordinateReferenceSystemProxyModel::Filters filters = QgsCoordinateReferenceSystemProxyModel::FilterHorizontal | QgsCoordinateReferenceSystemProxyModel::FilterCompound );
%Docstring
Constructor for QgsProjectionSelectionWidget, with the specified ``parent`` widget.
@ -213,8 +210,6 @@ Opens the dialog for selecting a new CRS
};
QFlags<QgsProjectionSelectionWidget::CrsOption> operator|(QgsProjectionSelectionWidget::CrsOption f1, QFlags<QgsProjectionSelectionWidget::CrsOption> f2);

2
scripts/sipify.py
View File

@ -2503,6 +2503,8 @@ while CONTEXT.line_idx < CONTEXT.line_count:
if match:
flags = match.group(2)
flag = CONTEXT.qflag_hash.get(flags)
if flag is None:
exit_with_error(f"error reading flags: {flags}")
CONTEXT.current_line = (
f"{match.group(1)}QFlags<{flag}> operator|({flag} f1, QFlags<{flag}> f2);\n"
)

3
src/gui/codeeditors/qgscodeeditor.h
View File

@ -154,7 +154,8 @@ class GUI_EXPORT QgsCodeEditor : public QsciScintilla
Q_FLAG( Flags )
//! Indicator index for search results
static constexpr int SEARCH_RESULT_INDICATOR = QsciScintilla::INDIC_MAX - 1;
static constexpr int SEARCH_RESULT_INDICATOR
= QsciScintilla::INDIC_MAX - 1;
/**
* Construct a new code editor.

5
src/gui/editorwidgets/core/qgseditorwidgetfactory.h
View File

@ -105,7 +105,10 @@ class GUI_EXPORT QgsEditorWidgetFactory
* \returns A map of widget type names and weight values
* \note not available in Python bindings
*/
virtual QHash<const char *, int> supportedWidgetTypes() SIP_SKIP { return QHash<const char *, int>(); }
virtual QHash<const char *, int> supportedWidgetTypes() SIP_SKIP
{
return QHash<const char *, int>();
}
/**
* This method allows disabling this editor widget type for a certain field.

5
src/gui/editorwidgets/core/qgswidgetwrapper.h
View File

@ -180,7 +180,10 @@ class GUI_EXPORT QgsWidgetWrapper : public QObject
*
* \note not available in Python bindings
*/
QgsPropertyCollection &dataDefinedProperties() SIP_SKIP { return mPropertyCollection; }
QgsPropertyCollection &dataDefinedProperties() SIP_SKIP
{
return mPropertyCollection;
}
/**
* Returns a reference to the editor widget's property collection, used for data defined overrides.

3
src/gui/layout/qgslayoutview.h
View File

@ -285,8 +285,7 @@ class GUI_EXPORT QgsLayoutView : public QGraphicsView
* used to temporarily halt painting while exporting layouts.
* \note Not available in Python bindings.
*/
void setPaintingEnabled( bool enabled );
SIP_SKIP
void setPaintingEnabled( bool enabled ) SIP_SKIP;
/**
* Sets a section \a label, to display above the first page shown in the

12
src/gui/maptools/qgsmaptoolcapture.h
View File

@ -342,32 +342,28 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
* A more specific handler is also called afterwards (pointCaptured, lineCaptured or polygonCaptured)
* \since QGIS 3.26
*/
virtual void geometryCaptured( const QgsGeometry &geometry ) { Q_UNUSED( geometry ) }
SIP_FORCE
virtual void geometryCaptured( const QgsGeometry &geometry ) SIP_FORCE { Q_UNUSED( geometry ) }
/**
* Called when a point is captured
* geometryCaptured is called just before
* \since QGIS 3.26
*/
virtual void pointCaptured( const QgsPoint &point ) { Q_UNUSED( point ) }
SIP_FORCE
virtual void pointCaptured( const QgsPoint &point ) SIP_FORCE { Q_UNUSED( point ) }
/**
* Called when a line is captured
* geometryCaptured is called just before
* \since QGIS 3.26
*/
virtual void lineCaptured( const QgsCurve *line ) { Q_UNUSED( line ) }
SIP_FORCE
virtual void lineCaptured( const QgsCurve *line ) SIP_FORCE { Q_UNUSED( line ) }
/**
* Called when a polygon is captured
* geometryCaptured is called just before
* \since QGIS 3.26
*/
virtual void polygonCaptured( const QgsCurvePolygon *polygon ) { Q_UNUSED( polygon ) }
SIP_FORCE
virtual void polygonCaptured( const QgsCurvePolygon *polygon ) SIP_FORCE { Q_UNUSED( polygon ) }
//! whether tracing has been requested by the user
bool tracingEnabled();

12
src/gui/maptools/qgsmaptoolcapturelayergeometry.h
View File

@ -43,29 +43,25 @@ class GUI_EXPORT QgsMapToolCaptureLayerGeometry : public QgsMapToolCapture
* Called when the geometry is captured
* A more specific handler is also called afterwards (layerPointCaptured, layerLineCaptured or layerPolygonCaptured)
*/
virtual void layerGeometryCaptured( const QgsGeometry &geometry ) { Q_UNUSED( geometry ) }
SIP_FORCE
virtual void layerGeometryCaptured( const QgsGeometry &geometry ) SIP_FORCE { Q_UNUSED( geometry ) }
/**
* Called when a point is captured
* The generic geometryCaptured() signal will be emitted immediately before this point-specific signal.
*/
virtual void layerPointCaptured( const QgsPoint &point ) { Q_UNUSED( point ) }
SIP_FORCE
virtual void layerPointCaptured( const QgsPoint &point ) SIP_FORCE { Q_UNUSED( point ) }
/**
* Called when a line is captured
* The generic geometryCaptured() signal will be emitted immediately before this line-specific signal.
*/
virtual void layerLineCaptured( const QgsCurve *line ) { Q_UNUSED( line ) }
SIP_FORCE
virtual void layerLineCaptured( const QgsCurve *line ) SIP_FORCE { Q_UNUSED( line ) }
/**
* Called when a polygon is captured
* The generic geometryCaptured() signal will be emitted immediately before this polygon-specific signal.
*/
virtual void layerPolygonCaptured( const QgsCurvePolygon *polygon ) { Q_UNUSED( polygon ) }
SIP_FORCE
virtual void layerPolygonCaptured( const QgsCurvePolygon *polygon ) SIP_FORCE { Q_UNUSED( polygon ) }
};
#endif // QGSMAPTOOLCAPTURELAYERGEOMETRY_H

6
src/gui/maptools/qgsmaptooldigitizefeature.h
View File

@ -102,13 +102,13 @@ class GUI_EXPORT QgsMapToolDigitizeFeature : public QgsMapToolCaptureLayerGeomet
* Called when the feature has been digitized
* \since QGIS 3.26
*/
virtual void featureDigitized( const QgsFeature &feature ) { Q_UNUSED( feature ) }
SIP_FORCE
virtual void featureDigitized( const QgsFeature &feature ) SIP_FORCE { Q_UNUSED( feature ) }
/**
* individual layer per digitizing session
*/
QgsMapLayer *mLayer = nullptr;
QgsMapLayer *mLayer
= nullptr;
/**
* layer used before digitizing session

5
src/gui/processing/qgsprocessingtoolboxmodel.h
View File

@ -100,7 +100,10 @@ class GUI_EXPORT QgsProcessingToolboxModelNode : public QObject
* Returns a list of children belonging to the node.
* \note Not available in Python bindings
*/
QList<QgsProcessingToolboxModelNode *> children() const SIP_SKIP { return mChildren; }
QList<QgsProcessingToolboxModelNode *> children() const SIP_SKIP
{
return mChildren;
}
/**
* Removes the specified \a node from this node's children, and gives

11
src/gui/proj/qgsprojectionselectionwidget.h
View File

@ -64,17 +64,16 @@ class GUI_EXPORT QgsProjectionSelectionWidget : public QWidget
* Flags for predefined CRS options shown in widget.
* \since QGIS 3.36
*/
Q_DECLARE_FLAGS( CrsOptions, CrsOption )
SIP_SKIP;
SIP_SKIP Q_DECLARE_FLAGS( CrsOptions, CrsOption )
/**
/**
* Constructor for QgsProjectionSelectionWidget, with the specified \a parent widget.
*
* Since QGIS 3.36, the optional \a filter argument can be used to specify filters on the systems
* shown in the widget. The default is to show all horizontal and compound CRS in order to match
* the behavior of older QGIS releases. The \a filter can be altered to also include vertical CRS if desired.
*/
explicit QgsProjectionSelectionWidget( QWidget *parent SIP_TRANSFERTHIS = nullptr, QgsCoordinateReferenceSystemProxyModel::Filters filters = QgsCoordinateReferenceSystemProxyModel::FilterHorizontal | QgsCoordinateReferenceSystemProxyModel::FilterCompound );
explicit QgsProjectionSelectionWidget( QWidget *parent SIP_TRANSFERTHIS = nullptr, QgsCoordinateReferenceSystemProxyModel::Filters filters = QgsCoordinateReferenceSystemProxyModel::FilterHorizontal | QgsCoordinateReferenceSystemProxyModel::FilterCompound );
/**
* Returns the currently selected CRS for the widget
@ -260,9 +259,7 @@ class GUI_EXPORT QgsProjectionSelectionWidget : public QWidget
void updateWarning();
};
Q_DECLARE_OPERATORS_FOR_FLAGS( QgsProjectionSelectionWidget::CrsOptions )
SIP_SKIP
SIP_SKIP Q_DECLARE_OPERATORS_FOR_FLAGS( QgsProjectionSelectionWidget::CrsOptions );
///@cond PRIVATE

5
src/gui/qgscheckablecombobox.h
View File

@ -209,7 +209,10 @@ class GUI_EXPORT QgsCheckableComboBox : public QComboBox
* \see QgsCheckableItemModel
* \since QGIS 3.16
*/
QgsCheckableItemModel *model() const SIP_SKIP { return mModel; }
QgsCheckableItemModel *model() const SIP_SKIP
{
return mModel;
}
/**
* Hides the list of items in the combobox if it is currently

5
src/gui/qgsexpressionstoredialog.h
View File

@ -56,7 +56,10 @@ class GUI_EXPORT QgsExpressionStoreDialog : public QDialog, private Ui::QgsExpre
* Returns whether the label text was modified either manually by the user,
* or automatically because it contained slashes or leading/trailing whitespace characters
*/
bool isLabelModified() const SIP_SKIP { return mLabel->text() != mOriginalLabel; }
bool isLabelModified() const SIP_SKIP
{
return mLabel->text() != mOriginalLabel;
}
private:
QStringList mExistingLabels;

6
src/gui/qgslayerpropertiesdialog.h
View File

@ -197,12 +197,14 @@ class GUI_EXPORT QgsLayerPropertiesDialog : public QgsOptionsDialogBase SIP_ABST
/**
* Resets the dialog to the current layer state.
*/
virtual void syncToLayer() SIP_SKIP = 0;
virtual void syncToLayer() SIP_SKIP
= 0;
/**
* Applies the dialog settings to the layer.
*/
virtual void apply() SIP_SKIP = 0;
virtual void apply() SIP_SKIP
= 0;
/**
* Rolls back changes made to the layer.

5
src/gui/qgsmapcanvas.h
View File

@ -766,7 +766,10 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView, public QgsExpressionContex
* \see defaultExpressionContextScope()
* \note not available in Python bindings
*/
const QgsExpressionContextScope &expressionContextScope() const SIP_SKIP { return mExpressionContextScope; }
const QgsExpressionContextScope &expressionContextScope() const SIP_SKIP
{
return mExpressionContextScope;
}
/**
* Creates a new scope which contains default variables and functions relating to the map canvas.

5
src/gui/qgsmapcanvasannotationitem.h
View File

@ -77,7 +77,10 @@ class GUI_EXPORT QgsMapCanvasAnnotationItem : public QObject, public QgsMapCanva
* Returns the item's annotation.
* \note not available in Python bindings
*/
const QgsAnnotation *annotation() const SIP_SKIP { return mAnnotation; }
const QgsAnnotation *annotation() const SIP_SKIP
{
return mAnnotation;
}
/**
* Returns the item's annotation.

5
src/gui/qgsoptionswidgetfactory.h
View File

@ -54,7 +54,10 @@ class GUI_EXPORT QgsOptionsPageWidget : public QWidget
* Returns the registered highlight widgets used to search and highlight text in
* options dialogs.
*/
QHash<QWidget *, QgsOptionsDialogHighlightWidget *> registeredHighlightWidgets() SIP_SKIP { return mHighlightWidgets; }
QHash<QWidget *, QgsOptionsDialogHighlightWidget *> registeredHighlightWidgets() SIP_SKIP
{
return mHighlightWidgets;
}
/**
* Validates the current state of the widget.

5
src/gui/qgspropertyoverridebutton.h
View File

@ -209,7 +209,10 @@ class GUI_EXPORT QgsPropertyOverrideButton : public QToolButton
* by the widget. If not specified, a default created symbol will be used instead.
* \note not available in Python bindings
*/
void setSymbol( std::shared_ptr<QgsSymbol> symbol ) SIP_SKIP { mSymbol = symbol; }
void setSymbol( std::shared_ptr<QgsSymbol> symbol ) SIP_SKIP
{
mSymbol = symbol;
}
public slots:

3
src/gui/qgssourceselectprovider.h
View File

@ -60,7 +60,8 @@ class GUI_EXPORT QgsSourceSelectProvider
Q_DECLARE_FLAGS( Capabilities, Capability )
Q_FLAG( Capabilities )
virtual ~QgsSourceSelectProvider() = default;
virtual ~QgsSourceSelectProvider()
= default;
//! Data Provider key
virtual QString providerKey() const = 0;