Skip to content

Commit

Permalink
fix server/app files and sipify test
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed May 28, 2018
1 parent 65bb60e commit 637f59d
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 18 deletions.
7 changes: 4 additions & 3 deletions python/server/auto_generated/qgsfeaturefilter.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@



* \since QGIS 3.0
class QgsFeatureFilter : QgsFeatureFilterProvider
{
%Docstring
A feature filter provider allowing to set filter expressions on a per-layer basis.

.. versionadded:: 3.0
%End
class QgsFeatureFilter : QgsFeatureFilterProvider
{

%TypeHeaderCode
#include "qgsfeaturefilter.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@



* \since QGIS 3.0
class QgsFeatureFilterProviderGroup : QgsFeatureFilterProvider
{
%Docstring
A filter filter provider grouping several filter providers.

.. versionadded:: 3.0
%End
class QgsFeatureFilterProviderGroup : QgsFeatureFilterProvider
{

%TypeHeaderCode
#include "qgsfeaturefilterprovidergroup.h"
Expand Down
5 changes: 3 additions & 2 deletions src/app/qgisappinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,9 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
* Register a new custom drop \a handler.
* \note Ownership of the factory is not transferred, and the factory must
* be unregistered when plugin is unloaded.
* \see unregisterCustomDropHandler() */
* \since QGIS 3.0
* \see unregisterCustomDropHandler()
* \since QGIS 3.0
*/
void registerCustomDropHandler( QgsCustomDropHandler *handler ) override;

/**
Expand Down
8 changes: 4 additions & 4 deletions src/app/qgsattributetypedialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,15 @@ class APP_EXPORT QgsAttributeTypeDialog: public QWidget, private Ui::QgsAttribut
/**
* Setter for constraint expression description
* \param desc the expression description
**/
* \since QGIS 2.16
* \since QGIS 2.16
*/
void setConstraintExpressionDescription( const QString &desc );

/**
* Getter for constraint expression description
* \returns the expression description
**/
* \since QGIS 2.16
* \since QGIS 2.16
*/
QString constraintExpressionDescription();

/**
Expand Down
4 changes: 2 additions & 2 deletions src/server/qgsfeaturefilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class QgsExpression;
* \ingroup server
* \class QgsFeatureFilter
* \brief A feature filter provider allowing to set filter expressions on a per-layer basis.
**/
* \since QGIS 3.0
* \since QGIS 3.0
*/
class SERVER_EXPORT QgsFeatureFilter : public QgsFeatureFilterProvider
{
public:
Expand Down
4 changes: 2 additions & 2 deletions src/server/qgsfeaturefilterprovidergroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
* \ingroup server
* \class QgsFeatureFilterProviderGroup
* \brief A filter filter provider grouping several filter providers.
**/
* \since QGIS 3.0
* \since QGIS 3.0
*/
class SERVER_EXPORT QgsFeatureFilterProviderGroup : public QgsFeatureFilterProvider
{
public:
Expand Down
4 changes: 2 additions & 2 deletions tests/code_layout/sipifyheader.expected.sip
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ Documentation goes here

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

.. versionadded:: 3.0

.. note::

some other note

.. versionadded:: 3.0
%End

%TypeHeaderCode
Expand Down

0 comments on commit 637f59d

Please sign in to comment.