Skip to content

Commit 637f59d

Browse files
committed
fix server/app files and sipify test
1 parent 65bb60e commit 637f59d

File tree

7 files changed

+21
-18
lines changed

7 files changed

+21
-18
lines changed

python/server/auto_generated/qgsfeaturefilter.sip.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111

1212

1313

14-
* \since QGIS 3.0
14+
class QgsFeatureFilter : QgsFeatureFilterProvider
15+
{
1516
%Docstring
1617
A feature filter provider allowing to set filter expressions on a per-layer basis.
18+
19+
.. versionadded:: 3.0
1720
%End
18-
class QgsFeatureFilter : QgsFeatureFilterProvider
19-
{
2021

2122
%TypeHeaderCode
2223
#include "qgsfeaturefilter.h"

python/server/auto_generated/qgsfeaturefilterprovidergroup.sip.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010

1111

1212

13-
* \since QGIS 3.0
13+
class QgsFeatureFilterProviderGroup : QgsFeatureFilterProvider
14+
{
1415
%Docstring
1516
A filter filter provider grouping several filter providers.
17+
18+
.. versionadded:: 3.0
1619
%End
17-
class QgsFeatureFilterProviderGroup : QgsFeatureFilterProvider
18-
{
1920

2021
%TypeHeaderCode
2122
#include "qgsfeaturefilterprovidergroup.h"

src/app/qgisappinterface.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,9 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
330330
* Register a new custom drop \a handler.
331331
* \note Ownership of the factory is not transferred, and the factory must
332332
* be unregistered when plugin is unloaded.
333-
* \see unregisterCustomDropHandler() */
334-
* \since QGIS 3.0
333+
* \see unregisterCustomDropHandler()
334+
* \since QGIS 3.0
335+
*/
335336
void registerCustomDropHandler( QgsCustomDropHandler *handler ) override;
336337

337338
/**

src/app/qgsattributetypedialog.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ class APP_EXPORT QgsAttributeTypeDialog: public QWidget, private Ui::QgsAttribut
136136
/**
137137
* Setter for constraint expression description
138138
* \param desc the expression description
139-
**/
140-
* \since QGIS 2.16
139+
* \since QGIS 2.16
140+
*/
141141
void setConstraintExpressionDescription( const QString &desc );
142142

143143
/**
144144
* Getter for constraint expression description
145145
* \returns the expression description
146-
**/
147-
* \since QGIS 2.16
146+
* \since QGIS 2.16
147+
*/
148148
QString constraintExpressionDescription();
149149

150150
/**

src/server/qgsfeaturefilter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ class QgsExpression;
2929
* \ingroup server
3030
* \class QgsFeatureFilter
3131
* \brief A feature filter provider allowing to set filter expressions on a per-layer basis.
32-
**/
33-
* \since QGIS 3.0
32+
* \since QGIS 3.0
33+
*/
3434
class SERVER_EXPORT QgsFeatureFilter : public QgsFeatureFilterProvider
3535
{
3636
public:

src/server/qgsfeaturefilterprovidergroup.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
* \ingroup server
2828
* \class QgsFeatureFilterProviderGroup
2929
* \brief A filter filter provider grouping several filter providers.
30-
**/
31-
* \since QGIS 3.0
30+
* \since QGIS 3.0
31+
*/
3232
class SERVER_EXPORT QgsFeatureFilterProviderGroup : public QgsFeatureFilterProvider
3333
{
3434
public:

tests/code_layout/sipifyheader.expected.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ Documentation goes here
5353

5454
Here's some comment mentioning another class QgsAutoAwesomemater.makeAwesome.
5555

56-
.. versionadded:: 3.0
57-
5856
.. note::
5957

6058
some other note
59+
60+
.. versionadded:: 3.0
6161
%End
6262

6363
%TypeHeaderCode

0 commit comments

Comments
 (0)