fix server/app files and sipify test

qgis · May 28, 2018 · 637f59d · 637f59d
1 parent 65bb60e
commit 637f59d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 18 deletions.
diff --git a/python/server/auto_generated/qgsfeaturefilter.sip.in b/python/server/auto_generated/qgsfeaturefilter.sip.in
@@ -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"

diff --git a/python/server/auto_generated/qgsfeaturefilterprovidergroup.sip.in b/python/server/auto_generated/qgsfeaturefilterprovidergroup.sip.in
@@ -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"

diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
@@ -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() */
+     * \see unregisterCustomDropHandler()
-    * \since QGIS 3.0
+     * \since QGIS 3.0
+     */
     void registerCustomDropHandler( QgsCustomDropHandler *handler ) override;
 
     /**

diff --git a/src/app/qgsattributetypedialog.h b/src/app/qgsattributetypedialog.h
@@ -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();
 
     /**

diff --git a/src/server/qgsfeaturefilter.h b/src/server/qgsfeaturefilter.h
@@ -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:

diff --git a/src/server/qgsfeaturefilterprovidergroup.h b/src/server/qgsfeaturefilterprovidergroup.h
@@ -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:

diff --git a/tests/code_layout/sipifyheader.expected.sip b/tests/code_layout/sipifyheader.expected.sip
@@ -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