Updated Python bindings for lable and composeritem

qgis · Jul 4, 2011 · 21d9226 · 21d9226
1 parent 82d8cff
commit 21d9226
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/python/core/qgscomposeritem.sip b/python/core/qgscomposeritem.sip
@@ -147,7 +147,7 @@ class QgsComposerItem: QObject, QGraphicsRectItem
 
     /** \brief Set selected, selected item should be highlighted */
     virtual void setSelected( bool s );
-
+sipCppRet
     /** \brief Is selected */
     virtual bool selected();
 
@@ -256,6 +256,16 @@ class QgsComposerItem: QObject, QGraphicsRectItem
     /**Updates item, with the possibility to do custom update for subclasses*/
     virtual void updateItem();
 
+    /**Get label identification name
+      @note this method was added in version 1.7*/
+    QString id() const;
+
+    /**Set label identification name
+      @note this method was added in version 1.7
+                      This method was moved from qgscomposerlabel so that every object can have a
+                       id (NathanW)*/
+    void setId( const QString& id );
+
   public slots:
     virtual void setRotation( double r);
 

diff --git a/python/core/qgscomposerlabel.sip b/python/core/qgscomposerlabel.sip
@@ -48,12 +48,4 @@ class QgsComposerLabel: QgsComposerItem
        * @param node is Dom node corresponding to 'ComposerLabel' tag
        */
     bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
-
-    /**Get label identification number
-      @note this method was added in version 1.7*/
-    QString id() const;
-
-    /**Set label identification number
-      @note this method was added in version 1.7*/
-    void setId( const QString& id );
 };