Skip to content

Commit 694c811

Browse files
3nids3nids
committedMay 24, 2017
sipify gui part 1
·
ltr-3_40final-3_0_0
1 parent 5c6ab71 commit 694c811

14 files changed

+1626
-698
lines changed
 

‎python/auto_sip.blacklist

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,18 +134,6 @@ core/symbology-ng/qgssymbollayerutils.sip
134134
core/symbology-ng/qgsvectorfieldsymbollayer.sip
135135
core/symbology-ng/qgsarrowsymbollayer.sip
136136
core/dxf/qgsdxfexport.sip
137-
gui/qgsblendmodecombobox.sip
138-
gui/qgisinterface.sip
139-
gui/qgsactionmenu.sip
140-
gui/qgsadvanceddigitizingcanvasitem.sip
141-
gui/qgsattributedialog.sip
142-
gui/qgsattributeeditorcontext.sip
143-
gui/qgsattributeform.sip
144-
gui/qgsattributeformeditorwidget.sip
145-
gui/qgsattributeforminterface.sip
146-
gui/qgsattributetypeloaddialog.sip
147-
gui/qgsbrowsertreeview.sip
148-
gui/qgsbusyindicatordialog.sip
149137
gui/qgscodeeditor.sip
150138
gui/qgscodeeditorpython.sip
151139
gui/qgscodeeditorsql.sip

‎python/gui/qgisinterface.sip

Lines changed: 918 additions & 262 deletions
Large diffs are not rendered by default.

‎python/gui/qgsactionmenu.sip

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
1-
/**
2-
* This class is a menu that is populated automatically with the actions defined for a given layer.
3-
*/
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsactionmenu.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
413

514
class QgsActionMenu : QMenu
615
{
7-
%TypeHeaderCode
8-
#include <qgsactionmenu.h>
16+
%Docstring
17+
This class is a menu that is populated automatically with the actions defined for a given layer.
918
%End
1019

20+
%TypeHeaderCode
21+
#include "qgsactionmenu.h"
22+
%End
1123
public:
1224
enum ActionType
1325
{
14-
Invalid, //!< Invalid
15-
MapLayerAction, //!< Standard actions (defined by core or plugins)
16-
AttributeAction //!< Custom actions (manually defined in layer properties)
26+
Invalid,
27+
MapLayerAction,
28+
AttributeAction
1729
};
1830

1931
struct ActionData
@@ -22,47 +34,52 @@ class QgsActionMenu : QMenu
2234
ActionData( const QgsAction &action, QgsFeatureId featureId, QgsMapLayer *mapLayer );
2335
ActionData( QgsMapLayerAction *action, QgsFeatureId featureId, QgsMapLayer *mapLayer );
2436

25-
QgsActionMenu::ActionType actionType;
37+
ActionType actionType;
2638
QVariant actionData;
2739
QgsFeatureId featureId;
2840
QgsMapLayer *mapLayer;
2941
};
3042

31-
/**
32-
* Constructs a new QgsActionMenu
33-
*
34-
* @param layer The layer that this action will be run upon.
35-
* @param feature The feature that this action will be run upon. Make sure that this feature is available
36-
* for the lifetime of this object.
37-
* @param parent The usual QWidget parent.
38-
* @param actionScope The action scope this menu will run in
39-
*/
4043
explicit QgsActionMenu( QgsVectorLayer *layer, const QgsFeature &feature, const QString &actionScope, QWidget *parent /TransferThis/ = 0 );
44+
%Docstring
45+
Constructs a new QgsActionMenu
46+
47+
\param layer The layer that this action will be run upon.
48+
\param feature The feature that this action will be run upon. Make sure that this feature is available
49+
for the lifetime of this object.
50+
\param parent The usual QWidget parent.
51+
\param actionScope The action scope this menu will run in
52+
%End
4153

42-
/**
43-
* Constructs a new QgsActionMenu
44-
*
45-
* @param layer The layer that this action will be run upon.
46-
* @param fid The feature id of the feature for which this action will be run.
47-
* @param parent The usual QWidget parent.
48-
* @param actionScope The action scope this menu will run in
49-
*/
5054
explicit QgsActionMenu( QgsVectorLayer *layer, const QgsFeatureId fid, const QString &actionScope, QWidget *parent /TransferThis/ = 0 );
55+
%Docstring
56+
Constructs a new QgsActionMenu
57+
58+
\param layer The layer that this action will be run upon.
59+
\param fid The feature id of the feature for which this action will be run.
60+
\param parent The usual QWidget parent.
61+
\param actionScope The action scope this menu will run in
62+
%End
5163

52-
/**
53-
* Destructor
54-
*/
55-
~QgsActionMenu();
56-
57-
/**
58-
* Change the feature on which actions are performed
59-
*
60-
* @param feature A feature. Will not take ownership. It's the callers responsibility to keep the feature
61-
* as long as the menu is displayed and the action is running.
62-
*/
6364
void setFeature( const QgsFeature &feature );
65+
%Docstring
66+
Change the feature on which actions are performed
67+
68+
\param feature A feature. Will not take ownership. It's the callers responsibility to keep the feature
69+
as long as the menu is displayed and the action is running.
70+
%End
6471

6572
signals:
6673
void reinit();
6774

6875
};
76+
77+
78+
79+
/************************************************************************
80+
* This file has been generated automatically from *
81+
* *
82+
* src/gui/qgsactionmenu.h *
83+
* *
84+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
85+
************************************************************************/

‎python/gui/qgsadvanceddigitizingcanvasitem.sip

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,38 @@
1-
/**
2-
* @brief The QgsAdvancedDigitizingCanvasItem class draws the graphical elements of the CAD tools (@see QgsAdvancedDigitizingDockWidget) on the map canvas.
3-
*/
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsadvanceddigitizingcanvasitem.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
412

513
class QgsAdvancedDigitizingCanvasItem : QgsMapCanvasItem
614
{
15+
%Docstring
16+
.. seealso:: QgsAdvancedDigitizingDockWidget) on the map canvas.
17+
%End
18+
719
%TypeHeaderCode
8-
#include <qgsadvanceddigitizingcanvasitem.h>
20+
#include "qgsadvanceddigitizingcanvasitem.h"
921
%End
1022
public:
11-
1223
explicit QgsAdvancedDigitizingCanvasItem( QgsMapCanvas *canvas, QgsAdvancedDigitizingDockWidget *cadDockWidget );
13-
~QgsAdvancedDigitizingCanvasItem();
1424

15-
void paint( QPainter *painter );
25+
virtual void paint( QPainter *painter );
26+
27+
28+
protected:
29+
1630
};
31+
32+
/************************************************************************
33+
* This file has been generated automatically from *
34+
* *
35+
* src/gui/qgsadvanceddigitizingcanvasitem.h *
36+
* *
37+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
38+
************************************************************************/

‎python/gui/qgsattributedialog.sip

Lines changed: 83 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,114 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsattributedialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAttributeDialog : QDialog
214
{
15+
316
%TypeHeaderCode
4-
#include <qgsattributedialog.h>
17+
#include "qgsattributedialog.h"
518
%End
6-
719
public:
820

9-
/**
10-
* Create an attribute dialog for a given layer and feature
11-
*
12-
* @param vl The layer for which the dialog will be generated
13-
* @param thepFeature A feature for which the dialog will be generated
14-
* @param featureOwner Set to true, if the dialog should take ownership of the feature
15-
* @param parent A parent widget for the dialog
16-
* @param showDialogButtons True: Show the dialog buttons accept/cancel
17-
* @param context The context in which this dialog is created
18-
*
19-
*/
2021
QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeature, bool featureOwner, QWidget *parent /TransferThis/ = 0, bool showDialogButtons = true, const QgsAttributeEditorContext &context = QgsAttributeEditorContext() );
22+
%Docstring
23+
Create an attribute dialog for a given layer and feature
24+
25+
\param vl The layer for which the dialog will be generated
26+
\param thepFeature A feature for which the dialog will be generated
27+
\param featureOwner Set to true, if the dialog should take ownership of the feature
28+
\param parent A parent widget for the dialog
29+
\param showDialogButtons True: Show the dialog buttons accept/cancel
30+
\param context The context in which this dialog is created
31+
%End
32+
33+
~QgsAttributeDialog();
2134

22-
/** Saves the size and position for the next time
23-
* this dialog box will be used.
24-
*/
2535
void saveGeometry();
36+
%Docstring
37+
Saves the size and position for the next time
38+
this dialog box will be used.
39+
%End
2640

27-
/** Restores the size and position from the last time
28-
* this dialog box was used.
29-
*/
3041
void restoreGeometry();
42+
%Docstring
43+
Restores the size and position from the last time
44+
this dialog box was used.
45+
%End
3146

32-
/**
33-
* @brief setHighlight
34-
* @param h The highlight. Ownership is taken.
35-
*/
3647
void setHighlight( QgsHighlight *h );
48+
%Docstring
49+
setHighlight
50+
\param h The highlight. Ownership is taken.
51+
%End
3752

3853
QgsAttributeForm *attributeForm();
54+
%Docstring
55+
:rtype: QgsAttributeForm
56+
%End
3957

4058
const QgsFeature *feature();
59+
%Docstring
60+
:rtype: QgsFeature
61+
%End
4162

42-
/**
43-
* Is this dialog editable?
44-
*
45-
* @return returns true, if this dialog was created in an editable manner.
46-
*/
4763
bool editable();
64+
%Docstring
65+
Is this dialog editable?
66+
67+
:return: returns true, if this dialog was created in an editable manner.
68+
:rtype: bool
69+
%End
4870

49-
/**
50-
* Toggles the form mode.
51-
* @param mode form mode. For example, if set to QgsAttributeForm::AddFeatureMode, the dialog will be editable even with an invalid feature and
52-
* will add a new feature when the form is accepted.
53-
*/
5471
void setMode( QgsAttributeForm::Mode mode );
72+
%Docstring
73+
Toggles the form mode.
74+
\param mode form mode. For example, if set to QgsAttributeForm.AddFeatureMode, the dialog will be editable even with an invalid feature and
75+
will add a new feature when the form is accepted.
76+
%End
5577

56-
/**
57-
* Sets the edit command message (Undo) that will be used when the dialog is accepted
58-
*
59-
* @param message The message
60-
*/
6178
void setEditCommandMessage( const QString &message );
79+
%Docstring
80+
Sets the edit command message (Undo) that will be used when the dialog is accepted
81+
82+
\param message The message
83+
%End
6284

63-
/**
64-
* Intercept window activate/deactive events to show/hide the highlighted feature.
65-
*
66-
* @param e The event
67-
*
68-
* @return The same as the parent QDialog
69-
*/
7085
virtual bool event( QEvent *e );
86+
%Docstring
87+
Intercept window activate/deactive events to show/hide the highlighted feature.
88+
89+
\param e The event
90+
91+
:return: The same as the parent QDialog
92+
:rtype: bool
93+
%End
7194

7295
public slots:
73-
void accept();
96+
virtual void accept();
7497

75-
//! Show the dialog non-blocking. Reparents this dialog to be a child of the dialog form and is deleted when
76-
//! closed.
77-
void show();
98+
virtual void reject();
7899

79-
int exec();
80100

81-
protected:
82-
bool eventFilter( QObject *obj, QEvent *e );
101+
void show();
102+
%Docstring
103+
Show the dialog non-blocking. Reparents this dialog to be a child of the dialog form
104+
%End
105+
83106
};
107+
108+
/************************************************************************
109+
* This file has been generated automatically from *
110+
* *
111+
* src/gui/qgsattributedialog.h *
112+
* *
113+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
114+
************************************************************************/

‎python/gui/qgsattributeeditorcontext.sip

Lines changed: 73 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,34 @@
1-
/**
2-
* This class contains context information for attribute editor widgets.
3-
* It will be passed to embedded widgets whenever this occurs (e.g. when
4-
* showing an embedded form due to relations)
5-
*/
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsattributeeditorcontext.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
613

714
class QgsAttributeEditorContext
815
{
16+
%Docstring
17+
This class contains context information for attribute editor widgets.
18+
It will be passed to embedded widgets whenever this occurs (e.g. when
19+
showing an embedded form due to relations)
20+
%End
21+
922
%TypeHeaderCode
1023
#include "qgsattributeeditorcontext.h"
1124
%End
1225
public:
13-
/**
14-
* Determines in which direction a relation was resolved.
15-
*/
26+
1627
enum RelationMode
1728
{
18-
Undefined, //!< This context is not defined by a relation
19-
Multiple, //!< When showing a list of features (e.g. houses as an embedded form in a district form)
20-
Single //!< When showing a single feature (e.g. district information when looking at the form of a house)
29+
Undefined,
30+
Multiple,
31+
Single
2132
};
2233

2334
enum FormMode
@@ -28,45 +39,77 @@ class QgsAttributeEditorContext
2839
};
2940

3041
QgsAttributeEditorContext();
42+
3143
QgsAttributeEditorContext( const QgsAttributeEditorContext &parentContext, FormMode formMode );
32-
QgsAttributeEditorContext( const QgsAttributeEditorContext &parentContext, const QgsRelation &relation, RelationMode relationMode, FormMode formMode );
3344

45+
QgsAttributeEditorContext( const QgsAttributeEditorContext &parentContext, const QgsRelation &relation, RelationMode relationMode, FormMode widgetMode );
3446

3547
void setDistanceArea( const QgsDistanceArea &distanceArea );
48+
3649
const QgsDistanceArea &distanceArea() const;
50+
%Docstring
51+
:rtype: QgsDistanceArea
52+
%End
3753

3854
void setVectorLayerTools( QgsVectorLayerTools *vlTools );
3955
const QgsVectorLayerTools *vectorLayerTools() const;
56+
%Docstring
57+
:rtype: QgsVectorLayerTools
58+
%End
4059

4160
void setRelation( const QgsRelation &relation, RelationMode mode );
4261
const QgsRelation &relation() const;
62+
%Docstring
63+
:rtype: QgsRelation
64+
%End
4365
RelationMode relationMode() const;
66+
%Docstring
67+
:rtype: RelationMode
68+
%End
4469

45-
/** Returns the form mode.
46-
* @see setFormMode()
47-
*/
4870
FormMode formMode() const;
71+
%Docstring
72+
Returns the form mode.
73+
.. seealso:: setFormMode()
74+
:rtype: FormMode
75+
%End
4976

50-
/** Sets the form mode.
51-
* @param mode form mode
52-
* @see formMode()
53-
* @note added in QGIS 2.16
54-
*/
5577
void setFormMode( FormMode mode );
78+
%Docstring
79+
Sets the form mode.
80+
\param mode form mode
81+
.. seealso:: formMode()
82+
.. versionadded:: 2.16
83+
%End
5684

57-
/** Returns true if the attribute editor should permit use of custom UI forms.
58-
* @see setAllowCustomUi()
59-
* @note added in QGIS 2.16
60-
*/
6185
bool allowCustomUi() const;
86+
%Docstring
87+
Returns true if the attribute editor should permit use of custom UI forms.
88+
.. seealso:: setAllowCustomUi()
89+
.. versionadded:: 2.16
90+
:rtype: bool
91+
%End
6292

63-
/** Sets whether the attribute editor should permit use of custom UI forms.
64-
* @param allow set to true to allow custom UI forms, or false to disable them and use default generated
65-
* QGIS forms
66-
* @see allowCustomUi()
67-
* @note added in QGIS 2.16
68-
*/
6993
void setAllowCustomUi( bool allow );
94+
%Docstring
95+
Sets whether the attribute editor should permit use of custom UI forms.
96+
\param allow set to true to allow custom UI forms, or false to disable them and use default generated
97+
QGIS forms
98+
.. seealso:: allowCustomUi()
99+
.. versionadded:: 2.16
100+
%End
70101

71102
const QgsAttributeEditorContext *parentContext() const;
103+
%Docstring
104+
:rtype: QgsAttributeEditorContext
105+
%End
106+
72107
};
108+
109+
/************************************************************************
110+
* This file has been generated automatically from *
111+
* *
112+
* src/gui/qgsattributeeditorcontext.h *
113+
* *
114+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
115+
************************************************************************/

‎python/gui/qgsattributeform.sip

Lines changed: 160 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -1,210 +1,227 @@
1-
/***************************************************************************
2-
qgsattributeform.h
3-
--------------------------------------
4-
Date : 3.5.2014
5-
Copyright : (C) 2014 Matthias Kuhn
6-
Email : matthias at opengis dot ch
7-
***************************************************************************
8-
* *
9-
* This program is free software; you can redistribute it and/or modify *
10-
* it under the terms of the GNU General Public License as published by *
11-
* the Free Software Foundation; either version 2 of the License, or *
12-
* (at your option) any later version. *
13-
* *
14-
***************************************************************************/
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsattributeform.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
1513

1614
class QgsAttributeForm : QWidget
1715
{
16+
1817
%TypeHeaderCode
19-
#include <qgsattributeform.h>
18+
#include "qgsattributeform.h"
2019
%End
21-
2220
public:
2321

24-
//! Form modes
2522
enum Mode
2623
{
27-
SingleEditMode, /*!< Single edit mode, for editing a single feature */
28-
AddFeatureMode, /*!< Add feature mode, for setting attributes for a new feature. In this mode the dialog will be editable even with an invalid feature and
29-
will add a new feature when the form is accepted. */
30-
MultiEditMode, /*!< Multi edit mode, for editing fields of multiple features at once */
31-
SearchMode, /*!< Form values are used for searching/filtering the layer */
24+
SingleEditMode,
25+
AddFeatureMode,
26+
MultiEditMode,
27+
SearchMode,
3228
};
3329

34-
//! Filter types
3530
enum FilterType
3631
{
37-
ReplaceFilter, /*!< Filter should replace any existing filter */
38-
FilterAnd, /*!< Filter should be combined using "AND" */
39-
FilterOr, /*!< Filter should be combined using "OR" */
32+
ReplaceFilter,
33+
FilterAnd,
34+
FilterOr,
4035
};
4136

42-
explicit QgsAttributeForm( QgsVectorLayer *vl, const QgsFeature &feature = QgsFeature(), const QgsAttributeEditorContext &context = QgsAttributeEditorContext(), QWidget *parent /TransferThis/ = 0 );
37+
explicit QgsAttributeForm( QgsVectorLayer *vl, const QgsFeature &feature = QgsFeature(),
38+
const QgsAttributeEditorContext &context = QgsAttributeEditorContext(), QWidget *parent = 0 );
4339
~QgsAttributeForm();
4440

4541
const QgsFeature &feature();
42+
%Docstring
43+
:rtype: QgsFeature
44+
%End
4645

47-
/**
48-
* Hides the button box (Ok/Cancel) and enables auto-commit
49-
*/
5046
void hideButtonBox();
5147

52-
/**
53-
* Shows the button box (Ok/Cancel) and disables auto-commit
54-
*/
5548
void showButtonBox();
5649

57-
/**
58-
* Disconnects the button box (Ok/Cancel) from the accept/resetValues slots
59-
* If this method is called, you have to create these connections from outside
60-
*/
6150
void disconnectButtonBox();
6251

63-
/**
64-
* Takes ownership
65-
* @param iface
66-
*/
6752
void addInterface( QgsAttributeFormInterface *iface /Transfer/ );
53+
%Docstring
54+
Takes ownership
55+
\param iface
56+
%End
6857

69-
/**
70-
* Returns the layer for which this form is shown
71-
*
72-
* @return Layer
73-
*/
7458
QgsVectorLayer *layer();
59+
%Docstring
60+
Returns the layer for which this form is shown
61+
62+
:return: Layer
63+
:rtype: QgsVectorLayer
64+
%End
7565

76-
/**
77-
* Returns if the form is currently in editable mode.
78-
*
79-
* @return Editable mode of this form
80-
*/
8166
bool editable();
67+
%Docstring
68+
Returns if the form is currently in editable mode.
69+
70+
:return: Editable mode of this form
71+
:rtype: bool
72+
%End
8273

83-
/** Returns the current mode of the form.
84-
* @note added in QGIS 2.16
85-
* @see setMode()
86-
*/
8774
Mode mode() const;
75+
%Docstring
76+
Returns the current mode of the form.
77+
.. versionadded:: 2.16
78+
.. seealso:: setMode()
79+
:rtype: Mode
80+
%End
8881

89-
/** Sets the current mode of the form.
90-
* @param mode form mode
91-
* @note added in QGIS 2.16
92-
* @see mode()
93-
*/
9482
void setMode( Mode mode );
83+
%Docstring
84+
Sets the current mode of the form.
85+
\param mode form mode
86+
.. versionadded:: 2.16
87+
.. seealso:: mode()
88+
%End
9589

96-
/**
97-
* Sets the edit command message (Undo) that will be used when the dialog is accepted
98-
*
99-
* @param message The message
100-
*/
10190
void setEditCommandMessage( const QString &message );
91+
%Docstring
92+
Sets the edit command message (Undo) that will be used when the dialog is accepted
93+
94+
\param message The message
95+
%End
96+
97+
virtual bool eventFilter( QObject *object, QEvent *event );
98+
99+
%Docstring
100+
Intercepts keypress on custom form (escape should not close it)
101+
102+
\param object The object for which the event has been sent
103+
\param event The event which is being filtered
104+
105+
:return: true if the event has been handled (key was ESC)
106+
:rtype: bool
107+
%End
102108

103-
/**
104-
* Intercepts keypress on custom form (escape should not close it)
105-
*
106-
* @param object The object for which the event has been sent
107-
* @param event The event which is being filtered
108-
*
109-
* @return true if the event has been handled (key was ESC)
110-
*/
111-
bool eventFilter( QObject *object, QEvent *event );
112-
113-
/** Sets all feature IDs which are to be edited if the form is in multiedit mode
114-
* @param fids feature ID list
115-
* @note added in QGIS 2.16
116-
*/
117109
void setMultiEditFeatureIds( const QgsFeatureIds &fids );
110+
%Docstring
111+
Sets all feature IDs which are to be edited if the form is in multiedit mode
112+
\param fids feature ID list
113+
.. versionadded:: 2.16
114+
%End
118115

119-
/** Sets the message bar to display feedback from the form in. This is used in the search/filter
120-
* mode to display the count of selected features.
121-
* @param messageBar target message bar
122-
* @note added in QGIS 2.16
123-
*/
124116
void setMessageBar( QgsMessageBar *messageBar );
117+
%Docstring
118+
Sets the message bar to display feedback from the form in. This is used in the search/filter
119+
mode to display the count of selected features.
120+
\param messageBar target message bar
121+
.. versionadded:: 2.16
122+
%End
125123

126124
signals:
127-
/**
128-
* Notifies about changes of attributes
129-
*
130-
* @param attribute The name of the attribute that changed.
131-
* @param value The new value of the attribute.
132-
*/
125+
133126
void attributeChanged( const QString &attribute, const QVariant &value );
127+
%Docstring
128+
Notifies about changes of attributes
129+
130+
\param attribute The name of the attribute that changed.
131+
\param value The new value of the attribute.
132+
%End
133+
134+
void beforeSave( bool &ok );
135+
%Docstring
136+
Will be emitted before the feature is saved. Use this signal to perform sanity checks.
137+
You can set the parameter ok to false to notify the form that you don't want it to be saved.
138+
If you want the form to be saved, leave the parameter untouched.
139+
140+
\param ok Set this parameter to false if you don't want the form to be saved
141+
.. note::
142+
143+
not available in Python bindings
144+
%End
134145

135-
/**
136-
* Will be emitted before the feature is saved. Use this signal to perform sanity checks.
137-
* You can set the parameter ok to false to notify the form that you don't want it to be saved.
138-
* If you want the form to be saved, leave the parameter untouched.
139-
*
140-
* @param ok Set this parameter to false if you don't want the form to be saved
141-
* @note not available in python bindings
142-
*/
143-
// void beforeSave( bool &ok );
144-
145-
/**
146-
* Is emitted, when a feature is changed or added
147-
*/
148146
void featureSaved( const QgsFeature &feature );
147+
%Docstring
148+
Is emitted, when a feature is changed or added
149+
%End
149150

150-
/** Is emitted when a filter expression is set using the form.
151-
* @param expression filter expression
152-
* @param type filter type
153-
* @note added in QGIS 2.16
154-
*/
155151
void filterExpressionSet( const QString &expression, QgsAttributeForm::FilterType type );
152+
%Docstring
153+
Is emitted when a filter expression is set using the form.
154+
\param expression filter expression
155+
\param type filter type
156+
.. versionadded:: 2.16
157+
%End
156158

157-
/** Emitted when the form changes mode.
158-
* @param mode new mode
159-
*/
160159
void modeChanged( QgsAttributeForm::Mode mode );
160+
%Docstring
161+
Emitted when the form changes mode.
162+
\param mode new mode
163+
%End
161164

162-
/** Emitted when the user selects the close option from the form's button bar.
163-
* @note added in QGIS 2.16
164-
*/
165165
void closed();
166+
%Docstring
167+
Emitted when the user selects the close option from the form's button bar.
168+
.. versionadded:: 2.16
169+
%End
166170

167-
/**
168-
* Emitted when the user chooses to zoom to a filtered set of features.
169-
* @note added in QGIS 3.0
170-
*/
171171
void zoomToFeatures( const QString &filter );
172+
%Docstring
173+
Emitted when the user chooses to zoom to a filtered set of features.
174+
.. versionadded:: 3.0
175+
%End
172176

173177
public slots:
174-
/**
175-
* Call this to change the content of a given attribute. Will update the editor(s) related to this field.
176-
*
177-
* @param field The field to change
178-
* @param value The new value
179-
*/
178+
180179
void changeAttribute( const QString &field, const QVariant &value );
180+
%Docstring
181+
Call this to change the content of a given attribute. Will update the editor(s) related to this field.
182+
183+
\param field The field to change
184+
\param value The new value
185+
%End
181186

182-
/**
183-
* Update all editors to correspond to a different feature.
184-
*
185-
* @param feature The feature which will be represented by the form
186-
*/
187187
void setFeature( const QgsFeature &feature );
188+
%Docstring
189+
Update all editors to correspond to a different feature.
190+
191+
\param feature The feature which will be represented by the form
192+
%End
188193

189-
/**
190-
* Save all the values from the editors to the layer.
191-
*
192-
* @return True if successful
193-
*/
194194
bool save();
195+
%Docstring
196+
Save all the values from the editors to the layer.
197+
198+
:return: True if successful
199+
:rtype: bool
200+
%End
195201

196-
/**
197-
* Sets all values to the values of the current feature
198-
*/
199202
void resetValues();
203+
%Docstring
204+
Sets all values to the values of the current feature
205+
%End
200206

201-
/** Resets the search/filter form values.
202-
* @note added in QGIS 2.16
203-
*/
204207
void resetSearch();
208+
%Docstring
209+
Resets the search/filter form values.
210+
.. versionadded:: 2.16
211+
%End
205212

206-
/**
207-
* reload current feature
208-
*/
209213
void refreshFeature();
214+
%Docstring
215+
reload current feature
216+
%End
217+
210218
};
219+
220+
221+
/************************************************************************
222+
* This file has been generated automatically from *
223+
* *
224+
* src/gui/qgsattributeform.h *
225+
* *
226+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
227+
************************************************************************/

‎python/gui/qgsattributeformeditorwidget.sip

Lines changed: 123 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,170 @@
1-
/** \ingroup gui
2-
* \class QgsAttributeFormEditorWidget
3-
* A widget consisting of both an editor widget and additional widgets for controlling the behavior
4-
* of the editor widget depending on a number of possible modes. For instance, if the parent attribute
5-
* form is in the multi edit mode, this widget will show both the editor widget and a tool button for
6-
* controlling the multi edit results.
7-
* \note Added in version 2.16
8-
*/
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsattributeformeditorwidget.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
912
class QgsAttributeFormEditorWidget : QWidget
1013
{
11-
%TypeHeaderCode
12-
#include <qgsattributeformeditorwidget.h>
14+
%Docstring
15+
A widget consisting of both an editor widget and additional widgets for controlling the behavior
16+
of the editor widget depending on a number of possible modes. For instance, if the parent attribute
17+
form is in the multi edit mode, this widget will show both the editor widget and a tool button for
18+
controlling the multi edit results.
19+
.. versionadded:: 2.16
1320
%End
1421

22+
%TypeHeaderCode
23+
#include "qgsattributeformeditorwidget.h"
24+
%End
1525
public:
1626

17-
//! Widget modes
1827
enum Mode
1928
{
20-
DefaultMode, /*!< Default mode, only the editor widget is shown */
21-
MultiEditMode, /*!< Multi edit mode, both the editor widget and a QgsMultiEditToolButton is shown */
22-
SearchMode, /*!< Layer search/filter mode */
29+
DefaultMode,
30+
MultiEditMode,
31+
SearchMode,
2332
};
2433

25-
/** Constructor for QgsAttributeFormEditorWidget.
26-
* @param editorWidget associated editor widget wrapper (for default/edit modes)
27-
* @param form parent attribute form
28-
*/
29-
explicit QgsAttributeFormEditorWidget( QgsEditorWidgetWrapper* editorWidget,
34+
explicit QgsAttributeFormEditorWidget( QgsEditorWidgetWrapper *editorWidget,
3035
QgsAttributeForm *form /TransferThis/ );
36+
%Docstring
37+
Constructor for QgsAttributeFormEditorWidget.
38+
\param editorWidget associated editor widget wrapper (for default/edit modes)
39+
\param form parent attribute form
40+
%End
41+
3142
~QgsAttributeFormEditorWidget();
3243

33-
/** Creates the search widget wrappers for the widget used when the form is in
34-
* search mode.
35-
* @param widgetId id of the widget type to create a search wrapper for
36-
* @param fieldIdx index of field associated with widget
37-
* @param config configuration which should be used for the widget creation
38-
* @param context editor context (not available in python bindings)
39-
*/
40-
void createSearchWidgetWrappers( const QString& widgetId, int fieldIdx,
41-
const QVariantMap& config,
42-
const QgsAttributeEditorContext &context = QgsAttributeEditorContext() );
43-
44-
/** Sets the current mode for the widget. The widget will adapt its state and visible widgets to
45-
* reflect the updated mode. For example, showing multi edit tool buttons if the mode is set to MultiEditMode.
46-
* @param mode widget mode
47-
* @see mode()
48-
*/
44+
4945
void setMode( Mode mode );
46+
%Docstring
47+
Sets the current mode for the widget. The widget will adapt its state and visible widgets to
48+
reflect the updated mode. For example, showing multi edit tool buttons if the mode is set to MultiEditMode.
49+
\param mode widget mode
50+
.. seealso:: mode()
51+
%End
5052

51-
/** Returns the current mode for the widget.
52-
* @see setMode()
53-
*/
5453
Mode mode() const;
54+
%Docstring
55+
Returns the current mode for the widget.
56+
.. seealso:: setMode()
57+
:rtype: Mode
58+
%End
5559

56-
/** Resets the widget to an initial value.
57-
* @param initialValue initial value to show in widget
58-
* @param mixedValues set to true to initially show the mixed values state
59-
*/
6060
void initialize( const QVariant &initialValue, bool mixedValues = false );
61+
%Docstring
62+
Resets the widget to an initial value.
63+
\param initialValue initial value to show in widget
64+
\param mixedValues set to true to initially show the mixed values state
65+
%End
6166

62-
/** Returns true if the widget's value has been changed since it was initialized.
63-
* @see initialize()
64-
*/
6567
bool hasChanged() const;
68+
%Docstring
69+
Returns true if the widget's value has been changed since it was initialized.
70+
.. seealso:: initialize()
71+
:rtype: bool
72+
%End
6673

67-
/** Returns the current value of the attached editor widget.
68-
*/
6974
QVariant currentValue() const;
75+
%Docstring
76+
Returns the current value of the attached editor widget.
77+
:rtype: QVariant
78+
%End
7079

71-
/** Creates an expression matching the current search filter value and
72-
* search properties represented in the widget.
73-
* @note added in QGIS 2.16
74-
*/
7580
QString currentFilterExpression() const;
81+
%Docstring
82+
Creates an expression matching the current search filter value and
83+
search properties represented in the widget.
84+
.. versionadded:: 2.16
85+
:rtype: str
86+
%End
7687

7788
public slots:
7889

79-
/** Sets whether the widget should be displayed in a "mixed values" mode.
80-
* @param mixed set to true to show in a mixed values state
81-
*/
8290
void setIsMixed( bool mixed );
91+
%Docstring
92+
Sets whether the widget should be displayed in a "mixed values" mode.
93+
\param mixed set to true to show in a mixed values state
94+
%End
8395

84-
/* *Called when field values have been committed;
85-
*/
8696
void changesCommitted();
97+
%Docstring
98+
Called when field values have been committed;
99+
%End
87100

88-
/** Resets the search/filter value of the widget.
89-
*/
90101
void resetSearch();
102+
%Docstring
103+
Resets the search/filter value of the widget.
104+
%End
91105

92106
signals:
93107

94-
//! Emitted when the widget's value changes
95-
//! @param value new widget value
96108
void valueChanged( const QVariant &value );
109+
%Docstring
110+
\param value new widget value
111+
%End
97112

98113
protected:
99114

100-
/** Returns a pointer to the search widget tool button in the widget.
101-
* @note this method is in place for unit testing only, and is not considered
102-
* stable API
103-
*/
104115
QgsSearchWidgetToolButton *searchWidgetToolButton();
116+
%Docstring
117+
Returns a pointer to the search widget tool button in the widget.
118+
.. note::
119+
120+
this method is in place for unit testing only, and is not considered
121+
stable API
122+
:rtype: QgsSearchWidgetToolButton
123+
%End
105124

106-
/** Sets the search widget wrapper for the widget used when the form is in
107-
* search mode.
108-
* @param wrapper search widget wrapper.
109-
* @note the search widget wrapper should be created using searchWidgetFrame()
110-
* as its parent
111-
* @note this method is in place for unit testing only, and is not considered
112-
* stable AP
113-
*/
114125
void setSearchWidgetWrapper( QgsSearchWidgetWrapper *wrapper );
126+
%Docstring
127+
Sets the search widget wrapper for the widget used when the form is in
128+
search mode.
129+
\param wrapper search widget wrapper.
130+
.. note::
131+
132+
the search widget wrapper should be created using searchWidgetFrame()
133+
as its parent
134+
.. note::
135+
136+
this method is in place for unit testing only, and is not considered
137+
stable AP
138+
%End
115139

116-
/** Returns the widget which should be used as a parent during construction
117-
* of the search widget wrapper.
118-
* @note this method is in place for unit testing only, and is not considered
119-
* stable AP
120-
*/
121140
QWidget *searchWidgetFrame();
141+
%Docstring
142+
Returns the widget which should be used as a parent during construction
143+
of the search widget wrapper.
144+
.. note::
145+
146+
this method is in place for unit testing only, and is not considered
147+
stable AP
148+
:rtype: QWidget
149+
%End
122150

123-
/** Returns the search widget wrapper used in this widget. The wrapper must
124-
* first be created using createSearchWidgetWrapper()
125-
* @note this method is in place for unit testing only, and is not considered
126-
* stable AP
127-
*/
128-
QList< QgsSearchWidgetWrapper* > searchWidgetWrappers();
151+
QList< QgsSearchWidgetWrapper * > searchWidgetWrappers();
152+
%Docstring
153+
Returns the search widget wrapper used in this widget. The wrapper must
154+
first be created using createSearchWidgetWrapper()
155+
.. note::
156+
157+
this method is in place for unit testing only, and is not considered
158+
stable AP
159+
:rtype: list of QgsSearchWidgetWrapper
160+
%End
129161

130162
};
163+
164+
/************************************************************************
165+
* This file has been generated automatically from *
166+
* *
167+
* src/gui/qgsattributeformeditorwidget.h *
168+
* *
169+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
170+
************************************************************************/

‎python/gui/qgsattributeforminterface.sip

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,50 @@
1-
/***************************************************************************
2-
qgsattributeforminterface.sip
3-
--------------------------------------
4-
Date : 12.5.2014
5-
Copyright : (C) 2014 Matthias Kuhn
6-
Email : matthias at opengis dot ch
7-
***************************************************************************
8-
* *
9-
* This program is free software; you can redistribute it and/or modify *
10-
* it under the terms of the GNU General Public License as published by *
11-
* the Free Software Foundation; either version 2 of the License, or *
12-
* (at your option) any later version. *
13-
* *
14-
***************************************************************************/
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsattributeforminterface.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
1511

1612
class QgsAttributeFormInterface
1713
{
14+
1815
%TypeHeaderCode
19-
#include <qgsattributeforminterface.h>
16+
#include "qgsattributeforminterface.h"
2017
%End
2118
public:
2219
explicit QgsAttributeFormInterface( QgsAttributeForm *form );
2320

21+
virtual ~QgsAttributeFormInterface();
22+
2423
virtual bool acceptChanges( const QgsFeature &feature );
24+
%Docstring
25+
:rtype: bool
26+
%End
2527

2628
virtual void initForm();
2729

2830
virtual void featureChanged();
2931

3032
QgsAttributeForm *form();
33+
%Docstring
34+
:rtype: QgsAttributeForm
35+
%End
3136

3237
const QgsFeature &feature();
38+
%Docstring
39+
:rtype: QgsFeature
40+
%End
41+
3342
};
43+
44+
/************************************************************************
45+
* This file has been generated automatically from *
46+
* *
47+
* src/gui/qgsattributeforminterface.h *
48+
* *
49+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
50+
************************************************************************/

‎python/gui/qgsattributetypeloaddialog.sip

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,58 @@
1-
class QgsAttributeTypeLoadDialog : QDialog
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsattributetypeloaddialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
13+
class QgsAttributeTypeLoadDialog: QDialog
214
{
15+
316
%TypeHeaderCode
4-
#include <qgsattributetypeloaddialog.h>
17+
#include "qgsattributetypeloaddialog.h"
518
%End
619
public:
720
QgsAttributeTypeLoadDialog( QgsVectorLayer *vl );
8-
~QgsAttributeTypeLoadDialog();
9-
10-
/**
11-
* Overloaded accept method which will write the feature field
12-
* values, then delegate to QDialog::accept()
13-
*/
14-
void accept();
15-
16-
/**
17-
* Sets predefined vector layer for selection of data
18-
* @param layer Vector layer which is to be set as predefined one
19-
*/
21+
22+
virtual void accept();
23+
24+
%Docstring
25+
Overloaded accept method which will write the feature field
26+
values, then delegate to QDialog.accept()
27+
%End
28+
2029
void setVectorLayer( QgsVectorLayer *layer );
30+
%Docstring
31+
Sets predefined vector layer for selection of data
32+
\param layer Vector layer which is to be set as predefined one
33+
%End
2134

22-
/**
23-
* Getter to value map which is currently active
24-
* @return value map of vlues selected from layer
25-
*/
2635
QMap<QString, QVariant> &valueMap();
36+
%Docstring
37+
Getter to value map which is currently active
38+
:return: value map of vlues selected from layer
39+
:rtype: QMap<str, QVariant>
40+
%End
2741

28-
/**
29-
* Returns true if the "Add NULL value" checkbox has been checked.
30-
*
31-
* @return true if the "Add NULL value" checkbox has been checked.
32-
*/
3342
bool insertNull();
43+
%Docstring
44+
Returns true if the "Add NULL value" checkbox has been checked.
45+
46+
:return: true if the "Add NULL value" checkbox has been checked.
47+
:rtype: bool
48+
%End
3449

3550
};
51+
52+
/************************************************************************
53+
* This file has been generated automatically from *
54+
* *
55+
* src/gui/qgsattributetypeloaddialog.h *
56+
* *
57+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
58+
************************************************************************/

‎python/gui/qgsblendmodecombobox.sip

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,50 @@
1-
/** \ingroup gui
2-
* A combobox which lets the user select blend modes from a predefined list
3-
**/
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsblendmodecombobox.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
412
class QgsBlendModeComboBox : QComboBox
513
{
14+
%Docstring
15+
A combobox which lets the user select blend modes from a predefined list
16+
*
17+
%End
18+
619
%TypeHeaderCode
7-
#include <qgsblendmodecombobox.h>
20+
#include "qgsblendmodecombobox.h"
821
%End
922
public:
1023
QgsBlendModeComboBox( QWidget *parent /TransferThis/ = 0 );
11-
virtual ~QgsBlendModeComboBox();
1224

13-
//! Function to read the selected blend mode as QPainter::CompositionMode
1425
QPainter::CompositionMode blendMode();
15-
//! Function to set the selected blend mode from QPainter::CompositionMode
26+
%Docstring
27+
Function to read the selected blend mode as QPainter.CompositionMode
28+
:rtype: QPainter.CompositionMode
29+
%End
1630
void setBlendMode( QPainter::CompositionMode blendMode );
17-
31+
%Docstring
32+
Function to set the selected blend mode from QPainter.CompositionMode
33+
%End
1834
public slots:
35+
1936
void updateModes();
37+
%Docstring
38+
Populates the blend mode combo box, and sets up mapping for
39+
blend modes to combo box indexes
40+
%End
2041

2142
};
43+
44+
/************************************************************************
45+
* This file has been generated automatically from *
46+
* *
47+
* src/gui/qgsblendmodecombobox.h *
48+
* *
49+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
50+
************************************************************************/

‎python/gui/qgsbrowsertreeview.sip

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,49 @@
1-
/**
2-
* The QgsBrowserTreeView class extends QTreeView with save/restore tree state functionality.
3-
*
4-
* @see QgsBrowserModel
5-
* @note added in 2.8
6-
*/
7-
class QgsBrowserTreeView: QTreeView
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsbrowsertreeview.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
class QgsBrowserTreeView : QTreeView
813
{
9-
%TypeHeaderCode
10-
#include <qgsbrowsertreeview.h>
14+
%Docstring
15+
The QgsBrowserTreeView class extends QTreeView with save/restore tree state functionality.
16+
17+
.. seealso:: QgsBrowserModel
18+
.. versionadded:: 2.8
1119
%End
1220

21+
%TypeHeaderCode
22+
#include "qgsbrowsertreeview.h"
23+
%End
1324
public:
1425
QgsBrowserTreeView( QWidget *parent /TransferThis/ = 0 );
15-
~QgsBrowserTreeView();
1626

1727
virtual void setModel( QAbstractItemModel *model );
1828
virtual void showEvent( QShowEvent *e );
1929
virtual void hideEvent( QHideEvent *e );
2030

21-
// returns true if at least one descendat is expanded, used in refresh
2231
bool hasExpandedDescendant( const QModelIndex &index ) const;
32+
%Docstring
33+
:rtype: bool
34+
%End
2335

24-
// Set section where to store settings (because we have 2 browser dock widgets)
2536
void setSettingsSection( const QString &section );
2637

2738
protected slots:
2839
virtual void rowsInserted( const QModelIndex &parentIndex, int start, int end );
40+
2941
};
42+
43+
/************************************************************************
44+
* This file has been generated automatically from *
45+
* *
46+
* src/gui/qgsbrowsertreeview.h *
47+
* *
48+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
49+
************************************************************************/

‎python/gui/qgsbusyindicatordialog.sip

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,48 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/qgsbusyindicatordialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113

2-
/** \ingroup gui
3-
* \class QgsBusyIndicatorDialog
4-
* A simple dialog to show an indeterminate busy progress indicator.
5-
*/
614
class QgsBusyIndicatorDialog : QDialog
715
{
16+
%Docstring
17+
A simple dialog to show an indeterminate busy progress indicator.
18+
%End
19+
820
%TypeHeaderCode
9-
#include <qgsbusyindicatordialog.h>
21+
#include "qgsbusyindicatordialog.h"
1022
%End
1123
public:
12-
/** Constructor
13-
* Modal busy indicator dialog with no buttons.
14-
* @param message Text to show above busy progress indicator.
15-
* @param parent parent object (owner)
16-
* @param fl widget flags
17-
*/
18-
QgsBusyIndicatorDialog( const QString &message = "", QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
19-
~QgsBusyIndicatorDialog();
24+
25+
QgsBusyIndicatorDialog( const QString &message = "", QWidget *parent = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
26+
%Docstring
27+
Constructor
28+
Modal busy indicator dialog with no buttons.
29+
\param message Text to show above busy progress indicator.
30+
\param parent parent object (owner)
31+
\param fl widget flags
32+
%End
2033

2134
QString message() const;
35+
%Docstring
36+
:rtype: str
37+
%End
2238
void setMessage( const QString &message );
39+
2340
};
41+
42+
/************************************************************************
43+
* This file has been generated automatically from *
44+
* *
45+
* src/gui/qgsbusyindicatordialog.h *
46+
* *
47+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
48+
************************************************************************/

‎scripts/sipify.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ sub detect_comment_block{
360360
next;
361361
}
362362
# Skip Q_OBJECT, Q_PROPERTY, Q_ENUM, Q_GADGET
363-
if ($line =~ m/^\s*Q_(OBJECT|ENUMS|PROPERTY|GADGET|DECLARE_METATYPE|DECLARE_TYPEINFO).*?$/){
363+
if ($line =~ m/^\s*Q_(OBJECT|ENUMS|PROPERTY|GADGET|DECLARE_METATYPE|DECLARE_TYPEINFO|DECL_DEPRECATED).*?$/){
364364
next;
365365
}
366366

0 commit comments

Comments
 (0)
Please sign in to comment.