Code layout

qgis · Apr 13, 2020 · 3d43a91 · 3d43a91
1 parent ed55b41
commit 3d43a91
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/python/core/auto_generated/mesh/qgsmeshlayertemporalproperties.sip.in b/python/core/auto_generated/mesh/qgsmeshlayertemporalproperties.sip.in
@@ -21,14 +21,16 @@ The time in a mesh layer is defined by :
 - each dataset is associated with a relative times
 - time extent is defined by the first time and the last time of all dataset
 
-Reference time :          AT
-Dataset 1 time            o-----RT------RT-----RT-----------RT
-Dataset 2 time            o---------RT------RT--------RT
-Dataset 3 time            o------------------------------RT-------RT----------RT
-Time extent of layer      o-----<--------------------------------------------->
-
-AT : absolute time (QDateTime)
-RT : relative time (qint64)
+.. code-block:: unparsed
+
+     Reference time :          AT
+     Dataset 1 time            o-----RT------RT-----RT-----------RT
+     Dataset 2 time            o---------RT------RT--------RT
+     Dataset 3 time            o------------------------------RT-------RT----------RT
+     Time extent of layer      o-----<--------------------------------------------->
+
+     AT : absolute time (QDateTime)
+     RT : relative time (qint64)
 
 .. versionadded:: 3.14
 %End

diff --git a/python/core/auto_generated/qgseditformconfig.sip.in b/python/core/auto_generated/qgseditformconfig.sip.in
@@ -213,16 +213,8 @@ Returns true if the label expression for the label of ``fieldName`` is active an
 
     void setLabelExpression( const QString &fieldName, const QString &labelExpression, bool isActive );
 %Docstring
-Set the label expression for ``fieldName`` to ``labelExpression``, to be evaluated in the form context.
-
-.. seealso:: :py:func:`setLabelExpressionIsActive`
-
-.. versionadded:: 3.14
-%End
-
-    void setLabelExpressionIsActive( const QString &fieldName, bool isActive );
-%Docstring
-Set the label expression active state for ``fieldName`` to ``isActive``
+Set the label expression for ``fieldName`` to ``labelExpression`` and the active state to ``isActive``,
+to be evaluated in the form context.
 
 .. versionadded:: 3.14
 %End

diff --git a/src/core/qgseditformconfig.h b/src/core/qgseditformconfig.h
@@ -234,18 +234,12 @@ class CORE_EXPORT QgsEditFormConfig
     bool labelExpressionIsActive( const QString &fieldName ) const;
 
     /**
-     * Set the label expression for \a fieldName to \a labelExpression, to be evaluated in the form context.
-     * \see setLabelExpressionIsActive() to control its status
+     * Set the label expression for \a fieldName to \a labelExpression and the active state to \a isActive,
+     * to be evaluated in the form context.
      * \since QGIS 3.14
      */
     void setLabelExpression( const QString &fieldName, const QString &labelExpression, bool isActive );
 
-    /**
-     * Set the label expression active state for \a fieldName to \a isActive
-     * \since QGIS 3.14
-     */
-    void setLabelExpressionIsActive( const QString &fieldName, bool isActive );
-
     // Python form init function stuff
 
     /**