Skip to content

Commit

Permalink
Apply PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
elpaso committed Apr 15, 2020
1 parent 3ab72da commit 83e42f5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions python/core/auto_generated/qgseditformconfig.sip.in
Expand Up @@ -288,22 +288,22 @@ Create a new edit form config. Normally invoked by :py:class:`QgsVectorLayer`
%Docstring
Set data defined properties for ``fieldName`` to ``properties``

.. versionadded:: 4.14
.. versionadded:: 3.14
%End

QgsPropertyCollection dataDefinedFieldProperties( const QString &fieldName ) const;
%Docstring
Returns data defined properties for ``fieldName``

.. versionadded:: 4.14
.. versionadded:: 3.14
%End


static const QgsPropertiesDefinition &propertyDefinitions();
%Docstring
Returns data defined property definitions.

.. versionadded:: 4.14
.. versionadded:: 3.14
%End

};
Expand Down
1 change: 0 additions & 1 deletion src/core/qgsattributeeditorelement.h
Expand Up @@ -138,7 +138,6 @@ class CORE_EXPORT QgsAttributeEditorElement SIP_ABSTRACT
#ifndef SIP_RUN
AttributeEditorType mType;
QString mName;
//QgsPropertyCollection mDataDefinedProperties;
QgsAttributeEditorElement *mParent = nullptr;
bool mShowLabel;
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/core/qgseditformconfig.h
Expand Up @@ -317,20 +317,20 @@ class CORE_EXPORT QgsEditFormConfig

/**
* Set data defined properties for \a fieldName to \a properties
* \since QGIS 4.14
* \since QGIS 3.14
*/
void setDataDefinedFieldProperties( const QString &fieldName, const QgsPropertyCollection &properties );

/**
* Returns data defined properties for \a fieldName
* \since QGIS 4.14
* \since QGIS 3.14
*/
QgsPropertyCollection dataDefinedFieldProperties( const QString &fieldName ) const;


/**
* Returns data defined property definitions.
* \since QGIS 4.14
* \since QGIS 3.14
*/
static const QgsPropertiesDefinition &propertyDefinitions();

Expand Down

0 comments on commit 83e42f5

Please sign in to comment.