sip fixes

qgis · Jan 27, 2014 · d647354 · d647354
1 parent c4b4d6f
commit d647354
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
@@ -65,9 +65,7 @@ class QgsExpression
     //! Return the expression string that was given when created.
     const QString expression() const;
 
-    //! Return the a debugging string of the expression.
-    //! This can be used for debugging. Use {@link expression()}
-    //! if you need the full expression string.
+    //! Return the expression string that represents this QgsExpression.
     QString dump() const;
 
     //! Return calculator used for distance and area calculations

diff --git a/python/core/qgsfeature.sip b/python/core/qgsfeature.sip
@@ -338,7 +338,7 @@ class QgsFeature
      *                        Python: Defaults to true
      *  @note added in 2.0
      */
-    void setFields( const QgsFields* fields, bool initAttributes = false );
+    void setFields( const QgsFields* fields, bool initAttributes = true );
 
     /** Get associated field map. may be NULL
      *  @note added in 2.0

diff --git a/python/core/qgsrectangle.sip b/python/core/qgsrectangle.sip
@@ -57,6 +57,7 @@ class QgsRectangle
     //! Center point of the rectangle
     QgsPoint center() const;
     //! Scale the rectangle around its center point
+    void scale( double scaleFactor, const QgsPoint *c = 0 );
     void scale( double scaleFactor, double centerX, double centerY );
     /** Get rectangle enlarged by buffer.
      * @note added in 2.1 */

diff --git a/python/core/symbology-ng/qgssvgcache.sip b/python/core/symbology-ng/qgssvgcache.sip
@@ -15,7 +15,7 @@ class QgsSvgCacheEntry
      * @param fill color of fill
      * @param outline color of outline
      */
-    QgsSvgCacheEntry( const QString& file, double size, double outlineWidth, double widthScaleFactor, double rasterScaleFctor, const QColor& fill, const QColor& outline );
+    QgsSvgCacheEntry( const QString& file, double size, double outlineWidth, double widthScaleFactor, double rasterScaleFactor, const QColor& fill, const QColor& outline );
     ~QgsSvgCacheEntry();
 
     QString file;

diff --git a/python/gui/symbology-ng/qgscolorrampcombobox.sip b/python/gui/symbology-ng/qgscolorrampcombobox.sip
@@ -17,7 +17,8 @@ class QgsColorRampComboBox : QComboBox
     //! return new instance of the current color ramp or NULL if there is no active color ramp
     QgsVectorColorRampV2* currentColorRamp();
 
-    static QSize rampIconSize;
+    //! @note not available in python bindings
+    // static QSize rampIconSize;
 
     void setShowGradientOnly( bool gradientOnly );
 

diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -152,6 +152,7 @@ class CORE_EXPORT QgsExpression
 
     int scale() {return mScale; }
 
+    //! Return the expression string that was given when created.
     const QString expression() const { return dump(); }
 
     //! Return the expression string that represents this QgsExpression.

diff --git a/src/core/symbology-ng/qgssvgcache.h b/src/core/symbology-ng/qgssvgcache.h
@@ -41,7 +41,7 @@ class CORE_EXPORT QgsSvgCacheEntry
      * @param fill color of fill
      * @param outline color of outline
      */
-    QgsSvgCacheEntry( const QString& file, double size, double outlineWidth, double widthScaleFactor, double rasterScaleFctor, const QColor& fill, const QColor& outline );
+    QgsSvgCacheEntry( const QString& file, double size, double outlineWidth, double widthScaleFactor, double rasterScaleFactor, const QColor& fill, const QColor& outline );
     ~QgsSvgCacheEntry();
 
     QString file;

diff --git a/src/gui/symbology-ng/qgscolorrampcombobox.h b/src/gui/symbology-ng/qgscolorrampcombobox.h
@@ -37,6 +37,7 @@ class GUI_EXPORT QgsColorRampComboBox : public QComboBox
     //! return new instance of the current color ramp or NULL if there is no active color ramp
     QgsVectorColorRampV2* currentColorRamp();
 
+    //! @note not available in python bindings
     static QSize rampIconSize;
 
     void setShowGradientOnly( bool gradientOnly ) { mShowGradientOnly = gradientOnly; }