generated sip file

qgis · Mar 29, 2018 · e0a539a · e0a539a
1 parent 0554739
commit e0a539a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/python/core/qgsattributeeditorelement.sip.in b/python/core/qgsattributeeditorelement.sip.in
@@ -268,24 +268,35 @@ This element will load a relation editor onto the form.
 %End
   public:
 
-    QgsAttributeEditorRelation( const QString &name, const QString &relationId, QgsAttributeEditorElement *parent );
+ QgsAttributeEditorRelation( const QString &name, const QString &relationId, QgsAttributeEditorElement *parent );
+%Docstring
+
+.. deprecated:: since QGIS 3.0.2. The name parameter is not used for anything and overwritten by the relationId internally.
+%End
+
+ QgsAttributeEditorRelation( const QString &name, const QgsRelation &relation, QgsAttributeEditorElement *parent );
+%Docstring
+
+.. deprecated:: since QGIS 3.0.2. The name parameter is not used for anything and overwritten by the relationId internally.
+%End
+
+    QgsAttributeEditorRelation( const QString &relationId, QgsAttributeEditorElement *parent );
 %Docstring
 Creates a new element which embeds a relation.
 
-:param name:         The name of this element
 :param relationId:   The id of the relation to embed
 :param parent:       The parent (used as container)
 %End
 
-    QgsAttributeEditorRelation( const QString &name, const QgsRelation &relation, QgsAttributeEditorElement *parent );
+    QgsAttributeEditorRelation( const QgsRelation &relation, QgsAttributeEditorElement *parent );
 %Docstring
 Creates a new element which embeds a relation.
 
-:param name:         The name of this element
 :param relation:     The relation to embed
 :param parent:       The parent (used as container)
 %End
 
+
     const QgsRelation &relation() const;
 %Docstring
 Get the id of the relation which shall be embedded

diff --git a/src/app/qgsattributesformproperties.h b/src/app/qgsattributesformproperties.h
@@ -122,6 +122,7 @@ class APP_EXPORT QgsAttributesFormProperties : public QWidget, private Ui_QgsAtt
         Type mType = Field;
         QString mName;
         QString mDisplayName;
+
         int mColumnCount = 1;
         bool mShowAsGroupBox = false;
         bool mShowLabel = true;

diff --git a/src/core/qgsattributeeditorelement.h b/src/core/qgsattributeeditorelement.h
@@ -364,6 +364,7 @@ class CORE_EXPORT QgsAttributeEditorRelation : public QgsAttributeEditorElement
       , mShowUnlinkButton( true )
     {}
 
+
     /**
      * Get the id of the relation which shall be embedded
      *