Skip to content

Commit 2454e56

Browse files
3nids3nids
committedJun 9, 2017
sipify gui attribute table
·
ltr-3_40final-3_0_0
1 parent f5c3b8a commit 2454e56

19 files changed

+1294
-866
lines changed
 

‎python/auto_sip.blacklist

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,6 @@ core/composer/qgspaperitem.sip
4141
core/composer/qgsscalebarstyle.sip
4242
core/composer/qgssingleboxscalebarstyle.sip
4343
core/composer/qgsticksscalebarstyle.sip
44-
gui/attributetable/qgsattributetabledelegate.sip
45-
gui/attributetable/qgsattributetablefiltermodel.sip
46-
gui/attributetable/qgsattributetablemodel.sip
47-
gui/attributetable/qgsattributetableview.sip
48-
gui/attributetable/qgsdualview.sip
49-
gui/attributetable/qgsfeaturelistmodel.sip
50-
gui/attributetable/qgsfeaturelistview.sip
51-
gui/attributetable/qgsfeaturelistviewdelegate.sip
52-
gui/attributetable/qgsfeaturemodel.sip
53-
gui/attributetable/qgsfeatureselectionmodel.sip
54-
gui/attributetable/qgsfieldconditionalformatwidget.sip
55-
gui/attributetable/qgsifeatureselectionmanager.sip
56-
gui/attributetable/qgsorganizetablecolumnsdialog.sip
5744
gui/symbology-ng/qgs25drendererwidget.sip
5845
gui/symbology-ng/qgsarrowsymbollayerwidget.sip
5946
gui/symbology-ng/qgsbrushstylecombobox.sip

‎python/gui/attributetable/qgsattributetabledelegate.sip

Lines changed: 74 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,86 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsattributetabledelegate.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsAttributeTableDelegate : QItemDelegate
214
{
3-
%TypeHeaderCode
4-
#include <qgsattributetabledelegate.h>
15+
%Docstring
16+
A delegate item class for QgsAttributeTable (see Qt documentation for
17+
QItemDelegate).
518
%End
6-
QgsVectorLayer *layer( const QAbstractItemModel *model ) const;
719

20+
%TypeHeaderCode
21+
#include "qgsattributetabledelegate.h"
22+
%End
823
public:
9-
/** Constructor
10-
* @param parent parent object
11-
*/
24+
1225
QgsAttributeTableDelegate( QObject *parent /TransferThis/ = 0 );
13-
/** Used to create an editor for when the user tries to
14-
* change the contents of a cell */
15-
QWidget * createEditor(
16-
QWidget *parent,
17-
const QStyleOptionViewItem &option,
18-
const QModelIndex &index ) const;
19-
20-
/** Overloads the paint method form the QItemDelegate bas class */
21-
void paint(
22-
QPainter * painter,
23-
const QStyleOptionViewItem & option,
24-
const QModelIndex &index ) const;
25-
26-
/**
27-
* Sets data from editor back to model. Overloads default method
28-
* @param editor editor which was created by create editor function in this class
29-
* @param model model where data should be updated
30-
* @param index index of field which is to be modified
31-
*/
32-
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const;
33-
34-
/**
35-
* Sets data from model into the editor. Overloads default method
36-
* @param editor editor which was created by create editor function in this class
37-
* @param index index of field which is to be retrieved
38-
*/
39-
void setEditorData( QWidget *editor, const QModelIndex &index ) const;
26+
%Docstring
27+
Constructor
28+
\param parent parent object
29+
%End
30+
31+
virtual QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
32+
33+
%Docstring
34+
Used to create an editor for when the user tries to
35+
change the contents of a cell
36+
:rtype: QWidget
37+
%End
38+
39+
virtual void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
40+
41+
%Docstring
42+
Overloads the paint method form the QItemDelegate base class
43+
%End
44+
45+
virtual void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const;
46+
47+
%Docstring
48+
Sets data from editor back to model. Overloads default method
49+
\param editor editor which was created by create editor function in this class
50+
\param model model where data should be updated
51+
\param index index of field which is to be modified
52+
%End
53+
54+
virtual void setEditorData( QWidget *editor, const QModelIndex &index ) const;
55+
56+
%Docstring
57+
Sets data from model into the editor. Overloads default method
58+
\param editor editor which was created by create editor function in this class
59+
\param index index of field which is to be retrieved
60+
%End
4061

4162
void setFeatureSelectionModel( QgsFeatureSelectionModel *featureSelectionModel );
4263

4364
signals:
44-
/**
45-
* Is emitted when an action column item is painted.
46-
* The consumer of this signal can initialize the index widget.
47-
*
48-
* @note This signal is emitted repeatedly whenever the item is being painted.
49-
* It is the consumers responsibility to check if initialization has already
50-
* happened before.
51-
*/
65+
5266
void actionColumnItemPainted( const QModelIndex &index ) const;
67+
%Docstring
68+
Is emitted when an action column item is painted.
69+
The consumer of this signal can initialize the index widget.
70+
71+
.. note::
72+
73+
This signal is emitted repeatedly whenever the item is being painted.
74+
It is the consumers responsibility to check if initialization has already
75+
happened before.
76+
%End
77+
5378
};
79+
80+
/************************************************************************
81+
* This file has been generated automatically from *
82+
* *
83+
* src/gui/attributetable/qgsattributetabledelegate.h *
84+
* *
85+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
86+
************************************************************************/

‎python/gui/attributetable/qgsattributetablefiltermodel.sip

Lines changed: 182 additions & 140 deletions
Large diffs are not rendered by default.

‎python/gui/attributetable/qgsattributetablemodel.sip

Lines changed: 214 additions & 153 deletions
Large diffs are not rendered by default.

‎python/gui/attributetable/qgsattributetableview.sip

Lines changed: 120 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,150 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsattributetableview.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
13+
114
class QgsAttributeTableView : QTableView
215
{
3-
%TypeHeaderCode
4-
#include <qgsattributetableview.h>
16+
%Docstring
17+
\brief
18+
Provides a table view of features of a QgsVectorLayer.
19+
20+
This can either be used as a standalone widget. QgsBrowser features a reference implementation.
21+
Or this can be used within the QgsDualView stacked widget.
522
%End
623

24+
%TypeHeaderCode
25+
#include "qgsattributetableview.h"
26+
%End
727
public:
828
QgsAttributeTableView( QWidget *parent /TransferThis/ = 0 );
9-
virtual ~QgsAttributeTableView();
1029

1130
virtual void setModel( QgsAttributeTableFilterModel *filterModel );
1231

13-
/**
14-
* @brief setFeatureSelectionManager
15-
* @param featureSelectionManager We will take ownership
16-
*/
1732
void setFeatureSelectionManager( QgsIFeatureSelectionManager *featureSelectionManager /Transfer/ );
33+
%Docstring
34+
setFeatureSelectionManager
35+
\param featureSelectionManager We will take ownership
36+
%End
1837

19-
/**
20-
* This event filter is installed on the verticalHeader to intercept mouse press and release
21-
* events. These are used to disable / enable live synchronisation with the map canvas selection
22-
* which can be slow due to recurring canvas repaints.
23-
*
24-
* @param object The object which is the target of the event.
25-
* @param event The intercepted event
26-
*
27-
* @return Returns always false, so the event gets processed
28-
*/
2938
virtual bool eventFilter( QObject *object, QEvent *event );
39+
%Docstring
40+
This event filter is installed on the verticalHeader to intercept mouse press and release
41+
events. These are used to disable / enable live synchronisation with the map canvas selection
42+
which can be slow due to recurring canvas repaints.
43+
44+
\param object The object which is the target of the event.
45+
\param event The intercepted event
46+
47+
:return: Returns always false, so the event gets processed
48+
:rtype: bool
49+
%End
3050

31-
/**
32-
* Set the attribute table config which should be used to control
33-
* the appearance of the attribute table.
34-
* @note added in QGIS 2.16
35-
*/
3651
void setAttributeTableConfig( const QgsAttributeTableConfig &config );
52+
%Docstring
53+
Set the attribute table config which should be used to control
54+
the appearance of the attribute table.
55+
.. versionadded:: 2.16
56+
%End
3757

3858
protected:
39-
/**
40-
* Called for mouse press events on a table cell.
41-
* Disables selection change for these events.
42-
*
43-
* @param event The mouse event
44-
*/
45-
void mousePressEvent( QMouseEvent *event );
46-
47-
/**
48-
* Called for mouse release events on a table cell.
49-
* Disables selection change for these events.
50-
*
51-
* @param event The mouse event
52-
*/
53-
void mouseReleaseEvent( QMouseEvent *event );
54-
55-
/**
56-
* Called for mouse move events on a table cell.
57-
* Disables selection change for these events.
58-
*
59-
* @param event The mouse event
60-
*/
61-
void mouseMoveEvent( QMouseEvent *event );
62-
63-
/**
64-
* Called for key press events
65-
* Disables selection change by only pressing an arrow key
66-
*
67-
* @param event The mouse event
68-
*/
69-
void keyPressEvent( QKeyEvent *event );
70-
71-
/**
72-
* @brief
73-
* Is called when the context menu will be shown. Emits a @link willShowContextMenu @endlink signal,
74-
* so the menu can be populated by other parts of the application.
75-
*
76-
* @param event The associated event object.
77-
*/
78-
void contextMenuEvent( QContextMenuEvent *event );
79-
80-
/**
81-
* Saves geometry to the settings on close
82-
* @param event not used
83-
*/
84-
void closeEvent( QCloseEvent *event );
59+
60+
virtual void mousePressEvent( QMouseEvent *event );
61+
62+
%Docstring
63+
Called for mouse press events on a table cell.
64+
Disables selection change for these events.
65+
66+
\param event The mouse event
67+
%End
68+
69+
virtual void mouseReleaseEvent( QMouseEvent *event );
70+
71+
%Docstring
72+
Called for mouse release events on a table cell.
73+
Disables selection change for these events.
74+
75+
\param event The mouse event
76+
%End
77+
78+
virtual void mouseMoveEvent( QMouseEvent *event );
79+
80+
%Docstring
81+
Called for mouse move events on a table cell.
82+
Disables selection change for these events.
83+
84+
\param event The mouse event
85+
%End
86+
87+
virtual void keyPressEvent( QKeyEvent *event );
88+
89+
%Docstring
90+
Called for key press events
91+
Disables selection change by only pressing an arrow key
92+
93+
\param event The mouse event
94+
%End
95+
96+
virtual void contextMenuEvent( QContextMenuEvent *event );
97+
98+
%Docstring
99+
\brief
100+
Is called when the context menu will be shown. Emits a willShowContextMenu() signal,
101+
so the menu can be populated by other parts of the application.
102+
103+
\param event The associated event object.
104+
%End
105+
106+
virtual void closeEvent( QCloseEvent *event );
107+
108+
%Docstring
109+
Saves geometry to the settings on close
110+
\param event not used
111+
%End
85112

86113
signals:
87-
/**
88-
* @brief
89-
* Is emitted, in order to provide a hook to add additional* menu entries to the context menu.
90-
*
91-
* @param menu If additional QMenuItems are added, they will show up in the context menu.
92-
* @param atIndex The QModelIndex, to which the context menu belongs. Relative to the source model.
93-
* In most cases, this will be a @link QgsAttributeTableFilterModel @endlink
94-
*/
114+
95115
void willShowContextMenu( QMenu *menu, const QModelIndex &atIndex );
116+
%Docstring
117+
\brief
118+
Is emitted, in order to provide a hook to add additional* menu entries to the context menu.
96119

97-
void finished();
120+
\param menu If additional QMenuItems are added, they will show up in the context menu.
121+
\param atIndex The QModelIndex, to which the context menu belongs. Relative to the source model.
122+
In most cases, this will be a QgsAttributeTableFilterModel
123+
%End
98124

99-
/** Emitted when a column in the view has been resized.
100-
* @param column column index (starts at 0)
101-
* @param width new width in pixel
102-
* @note added in QGIS 2.16
103-
*/
104125
void columnResized( int column, int width );
126+
%Docstring
127+
Emitted when a column in the view has been resized.
128+
\param column column index (starts at 0)
129+
\param width new width in pixel
130+
.. versionadded:: 2.16
131+
%End
132+
133+
void finished();
105134

106135
public slots:
107136
void repaintRequested( const QModelIndexList &indexes );
108137
void repaintRequested();
109138
virtual void selectAll();
110139
virtual void selectRow( int row );
111140
virtual void _q_selectRow( int row );
141+
112142
};
143+
144+
/************************************************************************
145+
* This file has been generated automatically from *
146+
* *
147+
* src/gui/attributetable/qgsattributetableview.h *
148+
* *
149+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
150+
************************************************************************/

‎python/gui/attributetable/qgsdualview.sip

Lines changed: 193 additions & 146 deletions
Large diffs are not rendered by default.

‎python/gui/attributetable/qgsfeaturelistmodel.sip

Lines changed: 88 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsfeaturelistmodel.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel
214
{
15+
316
%TypeHeaderCode
4-
#include <qgsfeaturelistmodel.h>
17+
#include "qgsfeaturelistmodel.h"
518
%End
619
public:
720
struct FeatureInfo
821
{
9-
public:
10-
FeatureInfo();
11-
bool isNew;
12-
bool isEdited;
22+
public:
23+
FeatureInfo();
24+
25+
bool isNew;
26+
bool isEdited;
1327
};
1428

1529
enum Role
@@ -24,64 +38,111 @@ class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel
2438

2539
virtual void setSourceModel( QgsAttributeTableFilterModel *sourceModel );
2640
QgsVectorLayerCache *layerCache();
41+
%Docstring
42+
:rtype: QgsVectorLayerCache
43+
%End
2744
virtual QVariant data( const QModelIndex &index, int role ) const;
2845
virtual Qt::ItemFlags flags( const QModelIndex &index ) const;
2946

30-
/**
31-
* @brief If true is specified, a NULL value will be injected
32-
* @param injectNull state of null value injection
33-
* @note added in 2.9
34-
*/
3547
void setInjectNull( bool injectNull );
48+
%Docstring
49+
If true is specified, a NULL value will be injected
50+
\param injectNull state of null value injection
51+
.. versionadded:: 2.9
52+
%End
3653

37-
/**
38-
* @brief Returns the current state of null value injection
39-
* @return If a NULL value is added
40-
* @note added in 2.9
41-
*/
4254
bool injectNull();
55+
%Docstring
56+
Returns the current state of null value injection
57+
:return: If a NULL value is added
58+
.. versionadded:: 2.9
59+
:rtype: bool
60+
%End
4361

4462
QgsAttributeTableModel *masterModel();
63+
%Docstring
64+
:rtype: QgsAttributeTableModel
65+
%End
4566

46-
/**
47-
* @param expression A {@link QgsExpression} compatible string.
48-
* @return true if the expression could be set, false if there was a parse error.
49-
* If it fails, the old expression will still be applied. Call {@link parserErrorString()}
50-
* for a meaningful error message.
51-
*/
5267
bool setDisplayExpression( const QString &expression );
68+
%Docstring
69+
\param expression A QgsExpression compatible string.
70+
:return: true if the expression could be set, false if there was a parse error.
71+
If it fails, the old expression will still be applied. Call parserErrorString()
72+
for a meaningful error message.
73+
:rtype: bool
74+
%End
5375

54-
/**
55-
* @brief Returns a detailed message about errors while parsing a QgsExpression.
56-
* @return A message containing information about the parser error.
57-
*/
5876
QString parserErrorString();
77+
%Docstring
78+
Returns a detailed message about errors while parsing a QgsExpression.
79+
:return: A message containing information about the parser error.
80+
:rtype: str
81+
%End
5982

6083
QString displayExpression() const;
84+
%Docstring
85+
:rtype: str
86+
%End
6187
bool featureByIndex( const QModelIndex &index, QgsFeature &feat );
88+
%Docstring
89+
:rtype: bool
90+
%End
6291
QgsFeatureId idxToFid( const QModelIndex &index ) const;
92+
%Docstring
93+
:rtype: QgsFeatureId
94+
%End
6395
QModelIndex fidToIdx( const QgsFeatureId fid ) const;
96+
%Docstring
97+
:rtype: QModelIndex
98+
%End
6499

65100
virtual QModelIndex mapToSource( const QModelIndex &proxyIndex ) const;
66101
virtual QModelIndex mapFromSource( const QModelIndex &sourceIndex ) const;
67102

68103
virtual QModelIndex mapToMaster( const QModelIndex &proxyIndex ) const;
104+
%Docstring
105+
:rtype: QModelIndex
106+
%End
69107
virtual QModelIndex mapFromMaster( const QModelIndex &sourceIndex ) const;
108+
%Docstring
109+
:rtype: QModelIndex
110+
%End
70111

71112
virtual QItemSelection mapSelectionFromMaster( const QItemSelection &selection ) const;
113+
%Docstring
114+
:rtype: QItemSelection
115+
%End
72116
virtual QItemSelection mapSelectionToMaster( const QItemSelection &selection ) const;
117+
%Docstring
118+
:rtype: QItemSelection
119+
%End
73120

74121
virtual QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const;
75122
virtual QModelIndex parent( const QModelIndex &child ) const;
76-
virtual int columnCount( const QModelIndex&parent = QModelIndex() ) const;
123+
virtual int columnCount( const QModelIndex &parent = QModelIndex() ) const;
77124
virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const;
78125

79-
QModelIndex fidToIndex( QgsFeatureId fid );
126+
virtual QModelIndex fidToIndex( QgsFeatureId fid );
127+
80128
QModelIndexList fidToIndexList( QgsFeatureId fid );
129+
%Docstring
130+
:rtype: QModelIndexList
131+
%End
81132

82133
public slots:
83134
void onBeginRemoveRows( const QModelIndex &parent, int first, int last );
84135
void onEndRemoveRows( const QModelIndex &parent, int first, int last );
85136
void onBeginInsertRows( const QModelIndex &parent, int first, int last );
86137
void onEndInsertRows( const QModelIndex &parent, int first, int last );
138+
87139
};
140+
141+
142+
/************************************************************************
143+
* This file has been generated automatically from *
144+
* *
145+
* src/gui/attributetable/qgsfeaturelistmodel.h *
146+
* *
147+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
148+
************************************************************************/

‎python/gui/attributetable/qgsfeaturelistview.sip

Lines changed: 117 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,107 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsfeaturelistview.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113
class QgsFeatureListView : QListView
214
{
15+
%Docstring
16+
Shows a list of features and renders a edit button next to each feature.
17+
18+
Accepts a display expression to define the way, features are rendered.
19+
Uses a QgsFeatureListModel as source model.
20+
%End
21+
322
%TypeHeaderCode
4-
#include <qgsfeaturelistview.h>
23+
#include "qgsfeaturelistview.h"
524
%End
625
public:
7-
/**
8-
* Creates a feature list view
9-
*
10-
* @param parent owner
11-
*/
26+
1227
explicit QgsFeatureListView( QWidget *parent /TransferThis/ = 0 );
28+
%Docstring
29+
Creates a feature list view
1330

14-
/**
15-
* Destructor
16-
*/
17-
virtual ~QgsFeatureListView();
31+
\param parent owner
32+
%End
1833

19-
/**
20-
* Returns the layer cache
21-
* @return the layer cache used as backend
22-
*/
2334
QgsVectorLayerCache *layerCache();
35+
%Docstring
36+
Returns the layer cache
37+
:return: the layer cache used as backend
38+
:rtype: QgsVectorLayerCache
39+
%End
2440

25-
/**
26-
* Set the {@link QgsFeatureListModel} which is used to retrieve information
27-
*
28-
* @param featureListModel The model to use
29-
*/
3041
virtual void setModel( QgsFeatureListModel *featureListModel );
31-
/**
32-
* Get the featureListModel used by this view
33-
*
34-
* @return The model in use
35-
*/
42+
%Docstring
43+
Set the QgsFeatureListModel which is used to retrieve information
44+
45+
\param featureListModel The model to use
46+
%End
47+
3648
QgsFeatureListModel *featureListModel();
49+
%Docstring
50+
Get the featureListModel used by this view
51+
52+
:return: The model in use
53+
:rtype: QgsFeatureListModel
54+
%End
55+
56+
bool setDisplayExpression( const QString &displayExpression );
57+
%Docstring
58+
The display expression is an expression used to render the fields into a single string
59+
which is displaied.
60+
61+
\param displayExpression The expression used to render the feature
62+
63+
.. seealso:: QgsExpression
64+
:rtype: bool
65+
%End
3766

38-
/**
39-
* The display expression is an expression used to render the fields into a single string
40-
* which is displaied.
41-
*
42-
* @param displayExpression The expression used to render the feature
43-
*
44-
* @see QgsExpression
45-
*/
46-
bool setDisplayExpression( const QString displayExpression );
47-
48-
/**
49-
* Returns the expression which is currently used to render the features.
50-
*
51-
* @return A string containing the currend display expression
52-
*
53-
* @see QgsExpression
54-
*/
5567
const QString displayExpression() const;
68+
%Docstring
69+
Returns the expression which is currently used to render the features.
70+
71+
:return: A string containing the currend display expression
72+
73+
.. seealso:: QgsExpression
74+
:rtype: str
75+
%End
5676

57-
/**
58-
* Returns a detailed message about errors while parsing a QgsExpression.
59-
*
60-
* @return A message containing information about the parser error.
61-
*/
6277
QString parserErrorString();
78+
%Docstring
79+
Returns a detailed message about errors while parsing a QgsExpression.
80+
81+
:return: A message containing information about the parser error.
82+
:rtype: str
83+
%End
6384

64-
/**
65-
* Get the currentEditSelection
66-
*
67-
* @return A list of edited feature ids
68-
*/
6985
QgsFeatureIds currentEditSelection();
86+
%Docstring
87+
Get the currentEditSelection
88+
89+
:return: A list of edited feature ids
90+
:rtype: QgsFeatureIds
91+
%End
7092

71-
/**
72-
* Sets if the currently shown form has received any edit events so far.
73-
*
74-
* @param state The state
75-
*/
7693
void setCurrentFeatureEdited( bool state );
94+
%Docstring
95+
Sets if the currently shown form has received any edit events so far.
96+
97+
\param state The state
98+
%End
7799

78-
/**
79-
* @brief setFeatureSelectionManager
80-
* @param featureSelectionManager We will take ownership
81-
*/
82100
void setFeatureSelectionManager( QgsIFeatureSelectionManager *featureSelectionManager /Transfer/ );
101+
%Docstring
102+
setFeatureSelectionManager
103+
\param featureSelectionManager We will take ownership
104+
%End
83105

84106
protected:
85107
virtual void mouseMoveEvent( QMouseEvent *event );
@@ -89,42 +111,52 @@ class QgsFeatureListView : QListView
89111
virtual void contextMenuEvent( QContextMenuEvent *event );
90112

91113
signals:
92-
/**
93-
* Is emitted, whenever the current edit selection has been changed.
94-
*
95-
* @param feat the feature, which will be edited.
96-
*/
114+
97115
void currentEditSelectionChanged( QgsFeature &feat );
116+
%Docstring
117+
Is emitted, whenever the current edit selection has been changed.
118+
119+
\param feat the feature, which will be edited.
120+
%End
98121

99-
/**
100-
* Is emitted, whenever the display expression is successfully changed
101-
* @param expression The expression that was applied
102-
*/
103122
void displayExpressionChanged( const QString &expression );
123+
%Docstring
124+
Is emitted, whenever the display expression is successfully changed
125+
\param expression The expression that was applied
126+
%End
104127

105-
//void aboutToChangeEditSelection( bool &ok );
106128

107129
public slots:
108-
/**
109-
* Set the feature(s) to be edited
110-
*
111-
* @param fids A list of features to be edited
112-
*/
130+
113131
void setEditSelection( const QgsFeatureIds &fids );
132+
%Docstring
133+
Set the feature(s) to be edited
134+
135+
\param fids A list of features to be edited
136+
%End
114137

115-
/**
116-
* Set the feature(s) to be edited
117-
*
118-
* @param index The selection to set
119-
* @param command selection update mode
120-
*/
121138
void setEditSelection( const QModelIndex &index, QItemSelectionModel::SelectionFlags command );
139+
%Docstring
140+
Set the feature(s) to be edited
141+
142+
\param index The selection to set
143+
\param command selection update mode
144+
%End
122145

123-
/**
124-
* Select all currently visible features
125-
*/
126146
virtual void selectAll();
147+
%Docstring
148+
Select all currently visible features
149+
%End
127150

128-
void repaintRequested( QModelIndexList indexes );
151+
void repaintRequested( const QModelIndexList &indexes );
129152
void repaintRequested();
153+
130154
};
155+
156+
/************************************************************************
157+
* This file has been generated automatically from *
158+
* *
159+
* src/gui/attributetable/qgsfeaturelistview.h *
160+
* *
161+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
162+
************************************************************************/

‎python/gui/attributetable/qgsfeaturelistviewdelegate.sip

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsfeaturelistviewdelegate.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
111
class QgsFeatureListViewDelegate : QItemDelegate
212
{
13+
314
%TypeHeaderCode
4-
#include <qgsfeaturelistviewdelegate.h>
15+
#include "qgsfeaturelistviewdelegate.h"
516
%End
617
public:
718
static const int ICON_SIZE;
@@ -17,6 +28,9 @@ class QgsFeatureListViewDelegate : QItemDelegate
1728
void setEditSelectionModel( QItemSelectionModel *editSelectionModel );
1829

1930
Element positionToElement( QPoint pos );
31+
%Docstring
32+
:rtype: Element
33+
%End
2034

2135
void setFeatureSelectionModel( QgsFeatureSelectionModel *featureSelectionModel );
2236

@@ -28,4 +42,13 @@ class QgsFeatureListViewDelegate : QItemDelegate
2842
protected:
2943
virtual QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const;
3044
virtual void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
45+
3146
};
47+
48+
/************************************************************************
49+
* This file has been generated automatically from *
50+
* *
51+
* src/gui/attributetable/qgsfeaturelistviewdelegate.h *
52+
* *
53+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
54+
************************************************************************/

‎python/gui/attributetable/qgsfeaturemodel.sip

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsfeaturemodel.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
110
class QgsFeatureModel
211
{
12+
313
%TypeHeaderCode
4-
#include <qgsfeaturemodel.h>
14+
#include "qgsfeaturemodel.h"
515
%End
616
public:
717
virtual ~QgsFeatureModel();
18+
819
virtual QModelIndex fidToIndex( QgsFeatureId fid ) = 0;
20+
%Docstring
21+
:rtype: QModelIndex
22+
%End
923
};
24+
25+
/************************************************************************
26+
* This file has been generated automatically from *
27+
* *
28+
* src/gui/attributetable/qgsfeaturemodel.h *
29+
* *
30+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
31+
************************************************************************/

‎python/gui/attributetable/qgsfeatureselectionmodel.sip

Lines changed: 78 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,103 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsfeatureselectionmodel.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
112
class QgsFeatureSelectionModel : QItemSelectionModel
213
{
14+
315
%TypeHeaderCode
4-
#include <attributetable/qgsfeatureselectionmodel.h>
16+
#include "qgsfeatureselectionmodel.h"
517
%End
618
public:
719
explicit QgsFeatureSelectionModel( QAbstractItemModel *model, QgsFeatureModel *featureModel, QgsIFeatureSelectionManager *featureSelectionHandler, QObject *parent /TransferThis/ );
820

9-
/**
10-
* Enables or disables synchronisation to the {@link QgsVectorLayer}
11-
* When synchronisation is disabled, any selection change will be buffered inside this selection model.
12-
* When enabled, any buffered changes are communicated to the layer and the buffer is emptied.
13-
* Mainly to be used for performance reasons, because selection change on the layer can cost time as it
14-
* repaints the layer.
15-
*
16-
* @param enable The synchronisation status to set.
17-
*/
1821
void enableSync( bool enable );
22+
%Docstring
23+
Enables or disables synchronisation to the QgsVectorLayer
24+
When synchronisation is disabled, any selection change will be buffered inside this selection model.
25+
When enabled, any buffered changes are communicated to the layer and the buffer is emptied.
26+
Mainly to be used for performance reasons, because selection change on the layer can cost time as it
27+
repaints the layer.
28+
29+
\param enable The synchronisation status to set.
30+
%End
1931

20-
/**
21-
* Returns the selection status of a given feature id.
22-
*
23-
* @param fid The featureid to determine the selection status of
24-
*
25-
* @return The selection status
26-
*/
2732

2833
virtual bool isSelected( QgsFeatureId fid );
29-
/**
30-
* Returns the selection status of a given QModelIndex.
31-
*
32-
* @param index The index to determine the selection status of
33-
*
34-
* @return The selection status
35-
*/
34+
%Docstring
35+
Returns the selection status of a given feature id.
36+
37+
\param fid The featureid to determine the selection status of
38+
39+
:return: The selection status
40+
:rtype: bool
41+
%End
42+
3643
virtual bool isSelected( const QModelIndex &index );
44+
%Docstring
45+
Returns the selection status of a given QModelIndex.
46+
47+
\param index The index to determine the selection status of
48+
49+
:return: The selection status
50+
:rtype: bool
51+
%End
3752

3853
signals:
39-
/**
40-
* Request a repaint of a list of model indexes.
41-
* Views using this model should connect to and properly process this signal.
42-
*
43-
* @param indexes The model indexes which need to be repainted
44-
*/
54+
4555
void requestRepaint( const QModelIndexList &indexes );
56+
%Docstring
57+
Request a repaint of a list of model indexes.
58+
Views using this model should connect to and properly process this signal.
59+
60+
\param indexes The model indexes which need to be repainted
61+
%End
4662

47-
/**
48-
* Request a repaint of the visible items of connected views.
49-
* Views using this model should connect to and properly process this signal.
50-
*/
5163
void requestRepaint();
64+
%Docstring
65+
Request a repaint of the visible items of connected views.
66+
Views using this model should connect to and properly process this signal.
67+
%End
5268

5369
public slots:
54-
/**
55-
* Overwritten to do NOTHING (we handle selection ourselves)
56-
*
57-
* @see selectFeatures( const QItemSelection&, SelectionFlags )
58-
*/
70+
5971
virtual void select( const QModelIndex &index, SelectionFlags command );
72+
%Docstring
73+
Overwritten to do NOTHING (we handle selection ourselves)
74+
75+
.. seealso:: selectFeatures( const QItemSelection&, SelectionFlags )
76+
%End
6077

61-
/**
62-
* Overwritten to do NOTHING (we handle selection ourselves)
63-
*
64-
* @see selectFeatures( const QItemSelection&, SelectionFlags )
65-
*/
6678
virtual void select( const QItemSelection &selection, SelectionFlags command );
79+
%Docstring
80+
Overwritten to do NOTHING (we handle selection ourselves)
6781

68-
/**
69-
* Select features on this table. Is to be used in favor of the stock select methods.
70-
*
71-
* @param selection The QItemSelection which will be selected
72-
* @param command The command to apply. Select, Deselect and ClearAndSelect are processed.
73-
*/
74-
virtual void selectFeatures( const QItemSelection &selection, const SelectionFlags &command );
82+
.. seealso:: selectFeatures( const QItemSelection&, SelectionFlags )
83+
%End
84+
85+
virtual void selectFeatures( const QItemSelection &selection, SelectionFlags command );
86+
%Docstring
87+
Select features on this table. Is to be used in favor of the stock select methods.
88+
89+
\param selection The QItemSelection which will be selected
90+
\param command The command to apply. Select, Deselect and ClearAndSelect are processed.
91+
%End
92+
93+
virtual void setFeatureSelectionManager( QgsIFeatureSelectionManager *featureSelectionManager /Transfer/ );
7594

76-
virtual void setFeatureSelectionManager( QgsIFeatureSelectionManager *featureSelectionManager );
7795
};
96+
97+
/************************************************************************
98+
* This file has been generated automatically from *
99+
* *
100+
* src/gui/attributetable/qgsfeatureselectionmodel.h *
101+
* *
102+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
103+
************************************************************************/

‎python/gui/attributetable/qgsfieldconditionalformatwidget.sip

Lines changed: 64 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,93 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsfieldconditionalformatwidget.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
112

2-
/** \ingroup gui
3-
* \class QgsFieldConditionalFormatWidget
4-
* A widget for customising conditional formatting options.
5-
* \note added in QGIS 2.12
6-
*/
713
class QgsFieldConditionalFormatWidget : QWidget
814
{
9-
%TypeHeaderCode
10-
#include <attributetable/qgsfieldconditionalformatwidget.h>
15+
%Docstring
16+
A widget for customising conditional formatting options.
17+
.. versionadded:: 2.12
1118
%End
1219

20+
%TypeHeaderCode
21+
#include "qgsfieldconditionalformatwidget.h"
22+
%End
1323
public:
1424

15-
/** Constructor for QgsFieldConditionalFormatWidget.
16-
* @param parent parent widget
17-
*/
1825
explicit QgsFieldConditionalFormatWidget( QWidget *parent /TransferThis/ = 0 );
26+
%Docstring
27+
Constructor for QgsFieldConditionalFormatWidget.
28+
\param parent parent widget
29+
%End
1930

2031
~QgsFieldConditionalFormatWidget();
2132

22-
/** Switches the widget to the rules page.
23-
*/
2433
void viewRules();
34+
%Docstring
35+
Switches the widget to the rules page.
36+
%End
2537

26-
/** Sets the vector layer associated with the widget.
27-
* @param layer vector layer
28-
*/
2938
void setLayer( QgsVectorLayer *layer );
39+
%Docstring
40+
Sets the vector layer associated with the widget.
41+
\param layer vector layer
42+
%End
3043

31-
/** Switches the widget to the edit style mode for the specified style.
32-
* @param index index of conditional style to edit
33-
* @param style initial conditional styling options
34-
*/
3544
void editStyle( int index, const QgsConditionalStyle &style );
45+
%Docstring
46+
Switches the widget to the edit style mode for the specified style.
47+
\param index index of conditional style to edit
48+
\param style initial conditional styling options
49+
%End
3650

37-
/**
38-
* @param style initial conditional styling options
39-
*/
4051
void loadStyle( const QgsConditionalStyle &style );
52+
%Docstring
53+
\param style initial conditional styling options
54+
%End
4155

42-
/** Resets the formatting options to their default state.
43-
*/
4456
void reset();
57+
%Docstring
58+
Resets the formatting options to their default state.
59+
%End
4560

46-
/**
47-
* @brief Set the presets that can be used for quick pick
48-
* @param styles A list of styles used as presets
49-
*/
5061
void setPresets( const QList<QgsConditionalStyle> &styles );
62+
%Docstring
63+
Set the presets that can be used for quick pick
64+
\param styles A list of styles used as presets
65+
%End
5166

52-
/**
53-
* @brief The default presets for the widget. Normally set when the widget is
54-
* created however called setPresets will override the default styles.
55-
* @return List of default presets.
56-
*/
5767
QList<QgsConditionalStyle> defaultPresets() const;
68+
%Docstring
69+
The default presets for the widget. Normally set when the widget is
70+
created however called setPresets will override the default styles.
71+
:return: List of default presets.
72+
:rtype: list of QgsConditionalStyle
73+
%End
5874

5975
signals:
6076

61-
/** Emitted when the conditional styling rules are updated.
62-
* @param fieldName name of field whose rules have been modified.
63-
*/
6477
void rulesUpdated( const QString &fieldName );
78+
%Docstring
79+
Emitted when the conditional styling rules are updated.
80+
\param fieldName name of field whose rules have been modified.
81+
%End
82+
83+
public slots:
84+
6585
};
86+
87+
/************************************************************************
88+
* This file has been generated automatically from *
89+
* *
90+
* src/gui/attributetable/qgsfieldconditionalformatwidget.h *
91+
* *
92+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
93+
************************************************************************/

‎python/gui/attributetable/qgsifeatureselectionmanager.sip

Lines changed: 64 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,84 @@
1-
/***************************************************************************
2-
qgsifeatureselectionmanager.sip
3-
--------------------------------------
4-
Date : 6.6.2013
5-
Copyright : (C) 2013 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-
***************************************************************************/
15-
16-
/**
17-
* Is an interface class to abstract feature selection handling.
18-
*
19-
* e.g. { @link QgsVectorLayer } implements this interface to manage its selections.
20-
*/
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsifeatureselectionmanager.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
2112

2213
class QgsIFeatureSelectionManager : QObject
2314
{
15+
%Docstring
16+
Is an interface class to abstract feature selection handling.
17+
18+
e.g. QgsVectorLayer implements this interface to manage its selections.
19+
%End
20+
2421
%TypeHeaderCode
25-
#include <qgsifeatureselectionmanager.h>
22+
#include "qgsifeatureselectionmanager.h"
2623
%End
2724
public:
2825
QgsIFeatureSelectionManager( QObject *parent /TransferThis/ );
29-
30-
/**
31-
* The number of features that are selected in this layer
32-
*
33-
* @return See description
34-
*/
3526
virtual int selectedFeatureCount() = 0;
27+
%Docstring
28+
The number of features that are selected in this layer
29+
30+
:return: See description
31+
:rtype: int
32+
%End
3633

37-
/**
38-
* Select features
39-
*
40-
* @param ids Feature ids to select
41-
*/
4234
virtual void select( const QgsFeatureIds &ids ) = 0;
35+
%Docstring
36+
Select features
37+
38+
\param ids Feature ids to select
39+
%End
4340

44-
/**
45-
* Deselect features
46-
*
47-
* @param ids Feature ids to deselect
48-
*/
4941
virtual void deselect( const QgsFeatureIds &ids ) = 0;
42+
%Docstring
43+
Deselect features
44+
45+
\param ids Feature ids to deselect
46+
%End
5047

51-
/**
52-
* Change selection to the new set of features. Dismisses the current selection.
53-
* Will emit the { @link selectionChanged( const QgsFeatureIds&, const QgsFeatureIds&, bool ) } signal with the
54-
* clearAndSelect flag set.
55-
*
56-
* @param ids The ids which will be the new selection
57-
*/
5848
virtual void setSelectedFeatures( const QgsFeatureIds &ids ) = 0;
49+
%Docstring
50+
Change selection to the new set of features. Dismisses the current selection.
51+
Will emit the selectionChanged( const QgsFeatureIds&, const QgsFeatureIds&, bool ) signal with the
52+
clearAndSelect flag set.
53+
54+
\param ids The ids which will be the new selection
55+
%End
5956

60-
/**
61-
* Return reference to identifiers of selected features
62-
*
63-
* @return A list of { @link QgsFeatureId } 's
64-
* @see selectedFeatures()
65-
*/
6657
virtual const QgsFeatureIds &selectedFeatureIds() const = 0;
58+
%Docstring
59+
Return reference to identifiers of selected features
60+
61+
:return: A list of QgsFeatureId's
62+
.. seealso:: selectedFeatures()
63+
:rtype: QgsFeatureIds
64+
%End
6765

6866
signals:
69-
/**
70-
* This signal is emitted when selection was changed
71-
*
72-
* @param selected Newly selected feature ids
73-
* @param deselected Ids of all features which have previously been selected but are not any more
74-
* @param clearAndSelect In case this is set to true, the old selection was dismissed and the new selection corresponds to selected
75-
*/
67+
7668
void selectionChanged( const QgsFeatureIds &selected, const QgsFeatureIds &deselected, const bool clearAndSelect );
69+
%Docstring
70+
This signal is emitted when selection was changed
71+
72+
\param selected Newly selected feature ids
73+
\param deselected Ids of all features which have previously been selected but are not any more
74+
\param clearAndSelect In case this is set to true, the old selection was dismissed and the new selection corresponds to selected
75+
%End
7776
};
77+
78+
/************************************************************************
79+
* This file has been generated automatically from *
80+
* *
81+
* src/gui/attributetable/qgsifeatureselectionmanager.h *
82+
* *
83+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
84+
************************************************************************/

‎python/gui/attributetable/qgsorganizetablecolumnsdialog.sip

Lines changed: 47 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,62 @@
1-
/** /class QgsOrganizeTableColumnsDialog
2-
* /ingroup gui
3-
* Dialog for organising (hiding and reordering) columns in the attributes table.
4-
* /note added in QGIS 2.16
5-
*/
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/gui/attributetable/qgsorganizetablecolumnsdialog.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
613

714
class QgsOrganizeTableColumnsDialog : QDialog
815
{
9-
%TypeHeaderCode
10-
#include <qgsorganizetablecolumnsdialog.h>
16+
%Docstring
17+
Dialog for organising (hiding and reordering) columns in the attributes table.
18+
.. versionadded:: 2.16
1119
%End
1220

21+
%TypeHeaderCode
22+
#include "qgsorganizetablecolumnsdialog.h"
23+
%End
1324
public:
14-
/**
15-
* Constructor
16-
* @param vl The concerned vector layer
17-
* @param visible the current list of visible fields name
18-
* @param parent parent object
19-
* @param flags window flags
20-
*/
21-
QgsOrganizeTableColumnsDialog(const QgsVectorLayer *vl, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags flags = Qt::Window );
22-
23-
/**
24-
* Destructor
25-
*/
25+
26+
QgsOrganizeTableColumnsDialog( const QgsVectorLayer *vl, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags flags = Qt::Window );
27+
%Docstring
28+
Constructor
29+
\param vl The concerned vector layer
30+
\param parent parent object
31+
\param flags window flags
32+
%End
33+
2634
~QgsOrganizeTableColumnsDialog();
2735

28-
/**
29-
* Get the updated configuration
30-
*/
3136
QgsAttributeTableConfig config() const;
37+
%Docstring
38+
Get the updated configuration
39+
:rtype: QgsAttributeTableConfig
40+
%End
3241

3342
public slots:
34-
/**
35-
* showAll checks all the fields to show them all in the attribute table
36-
*/
43+
3744
void showAll();
45+
%Docstring
46+
showAll checks all the fields to show them all in the attribute table
47+
%End
3848

39-
/**
40-
* hideAll unchecks all the fields to hide them all in the attribute table
41-
*/
4249
void hideAll();
50+
%Docstring
51+
hideAll unchecks all the fields to hide them all in the attribute table
52+
%End
53+
4354
};
55+
56+
/************************************************************************
57+
* This file has been generated automatically from *
58+
* *
59+
* src/gui/attributetable/qgsorganizetablecolumnsdialog.h *
60+
* *
61+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
62+
************************************************************************/

‎src/gui/attributetable/qgsfeaturelistview.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ class GUI_EXPORT QgsFeatureListView : public QListView
119119
* \param featureSelectionManager We will take ownership
120120
*/
121121
void setFeatureSelectionManager( QgsIFeatureSelectionManager *featureSelectionManager SIP_TRANSFER );
122+
122123
protected:
123124
virtual void mouseMoveEvent( QMouseEvent *event ) override;
124125
virtual void mousePressEvent( QMouseEvent *event ) override;

‎src/gui/attributetable/qgsfeaturelistviewdelegate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class GUI_EXPORT QgsFeatureListViewDelegate : public QItemDelegate
3232
Q_OBJECT
3333

3434
public:
35-
static int const ICON_SIZE = 24;
35+
static const int ICON_SIZE = 24;
3636

3737
enum Element
3838
{

‎src/gui/attributetable/qgsfeaturemodel.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
#ifndef QGSFEATUREMODEL_H
1616
#define QGSFEATUREMODEL_H
1717

18+
#include "qgis_gui.h"
1819
#include "qgsfeature.h" // QgsFeatureId
1920
#include <QModelIndex>
2021

2122
/** \ingroup gui
2223
* \class QgsFeatureModel
2324
*/
24-
class QgsFeatureModel
25+
class GUI_EXPORT QgsFeatureModel
2526
{
2627
public:
2728
virtual ~QgsFeatureModel() = default;

‎src/gui/attributetable/qgsfeatureselectionmodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class GUI_EXPORT QgsFeatureSelectionModel : public QItemSelectionModel
104104
*/
105105
virtual void selectFeatures( const QItemSelection &selection, SelectionFlags command );
106106

107-
virtual void setFeatureSelectionManager( QgsIFeatureSelectionManager *featureSelectionManager );
107+
virtual void setFeatureSelectionManager( QgsIFeatureSelectionManager *featureSelectionManager SIP_TRANSFER );
108108

109109
private slots:
110110
virtual void layerSelectionChanged( const QgsFeatureIds &selected, const QgsFeatureIds &deselected, bool clearAndSelect );

‎src/gui/attributetable/qgsorganizetablecolumnsdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class GUI_EXPORT QgsOrganizeTableColumnsDialog : public QDialog, private Ui::Qgs
4343
* \param parent parent object
4444
* \param flags window flags
4545
*/
46-
QgsOrganizeTableColumnsDialog( const QgsVectorLayer *vl, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::Window );
46+
QgsOrganizeTableColumnsDialog( const QgsVectorLayer *vl, QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags flags = Qt::Window );
4747

4848
~QgsOrganizeTableColumnsDialog();
4949

0 commit comments

Comments
 (0)
Please sign in to comment.