[QGIS Commit] r10275 - in trunk/qgis/python: core gui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-03-13 16:46:02 -0400 (Fri, 13 Mar 2009)
New Revision: 10275

Modified:
   trunk/qgis/python/core/qgscomposerlegend.sip
   trunk/qgis/python/core/qgscomposermap.sip
   trunk/qgis/python/core/qgscomposerpicture.sip
   trunk/qgis/python/core/qgscomposition.sip
   trunk/qgis/python/core/qgsscalebarstyle.sip
   trunk/qgis/python/gui/qgscomposerview.sip
Log:
Remove the private members from the composer sip files as they cannot be used from Python anyway

Modified: trunk/qgis/python/core/qgscomposerlegend.sip
===================================================================
--- trunk/qgis/python/core/qgscomposerlegend.sip	2009-03-13 20:43:34 UTC (rev 10274)
+++ trunk/qgis/python/core/qgscomposerlegend.sip	2009-03-13 20:46:02 UTC (rev 10275)
@@ -71,27 +71,4 @@
   public slots:
     /**Data changed*/
     void synchronizeWithModel();
-
-  protected:
-
-
-  private:
-    QgsComposerLegend(); //forbidden
-
-    /**Draws child items of a layer item
-       @param layerItem parent model item (layer)
-       @param currentYCoord in/out: current y position of legend item
-       @param maxXCoord in/out: maximum x-coordinate of the whole legend
-    */
-    void drawLayerChildItems( QPainter* p, QStandardItem* layerItem, double& currentYCoord, double& maxXCoord );
-
-    /**Draws a symbol at the current y position and returns the new x position. Returns real symbol height, because for points,
-     it is possible that it differs from mSymbolHeight*/
-    void drawSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, double& symbolHeight ) const;
-    void drawPointSymbol( QPainter*, QgsSymbol* s, double currentYCoord, double& currentXPosition, double& symbolHeight ) const;
-    void drawLineSymbol( QPainter*, QgsSymbol* s, double currentYCoord, double& currentXPosition ) const;
-    void drawPolygonSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition ) const;
-
-    /**Helper function that lists ids of layers contained in map canvas*/
-    QStringList layerIdList() const;
 };

Modified: trunk/qgis/python/core/qgscomposermap.sip
===================================================================
--- trunk/qgis/python/core/qgscomposermap.sip	2009-03-13 20:43:34 UTC (rev 10274)
+++ trunk/qgis/python/core/qgscomposermap.sip	2009-03-13 20:46:02 UTC (rev 10275)
@@ -105,13 +105,4 @@
   signals:
     /**Is emitted when width/height is changed as a result of user interaction*/
     void extentChanged();
-
-  private:
-
-    /**Establishes signal/slot connection for update in case of layer change*/
-    void connectUpdateSlot();
-
-    /**Returns the zoom factor of the graphics view. If no
-     graphics view exists, the default 1 is returned*/
-    double horizontalViewScaleFactor() const;
 };

Modified: trunk/qgis/python/core/qgscomposerpicture.sip
===================================================================
--- trunk/qgis/python/core/qgscomposerpicture.sip	2009-03-13 20:43:34 UTC (rev 10274)
+++ trunk/qgis/python/core/qgscomposerpicture.sip	2009-03-13 20:46:02 UTC (rev 10275)
@@ -38,13 +38,6 @@
       */
     bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
 
-  private:
-
-    //default constructor is forbidden
-    QgsComposerPicture();
-    /**Updates content of current image using svg generator*/
-    void updateImageFromSvg();
-
   signals:
     /**Tell the configuration widget that the settings need to be updated*/
     void settingsChanged();

Modified: trunk/qgis/python/core/qgscomposition.sip
===================================================================
--- trunk/qgis/python/core/qgscomposition.sip	2009-03-13 20:43:34 UTC (rev 10274)
+++ trunk/qgis/python/core/qgscomposition.sip	2009-03-13 20:46:02 UTC (rev 10275)
@@ -125,19 +125,4 @@
 
     /**Snaps a scene coordinate point to grid*/
     QPointF snapPointToGrid( const QPointF& scenePoint ) const;
-
-  private:
-   
-
-    QgsComposition(); //default constructor is forbidden
-
-    /**Reset z-values of items based on position in z list*/
-    void updateZValues();
-
-    /**Returns the bounding rectangle of the selected items in scene coordinates
-     @return 0 in case of success*/
-    int boundingRectOfSelectedItems( QRectF& bRect );
-
-    void loadGridAppearanceSettings();
-    void saveGridAppearanceSettings();
-};
\ No newline at end of file
+};

Modified: trunk/qgis/python/core/qgsscalebarstyle.sip
===================================================================
--- trunk/qgis/python/core/qgsscalebarstyle.sip	2009-03-13 20:43:34 UTC (rev 10274)
+++ trunk/qgis/python/core/qgsscalebarstyle.sip	2009-03-13 20:46:02 UTC (rev 10275)
@@ -18,7 +18,4 @@
     virtual QRectF calculateBoxSize() const; //default implementation provided
     virtual QString name() const = 0; //return name of the style
     //virtual QIcon styleIcon() const = 0;
-
-  private:
-    QgsScaleBarStyle(); //default constructor forbidden
-};
\ No newline at end of file
+};

Modified: trunk/qgis/python/gui/qgscomposerview.sip
===================================================================
--- trunk/qgis/python/gui/qgscomposerview.sip	2009-03-13 20:43:34 UTC (rev 10274)
+++ trunk/qgis/python/gui/qgscomposerview.sip	2009-03-13 20:46:02 UTC (rev 10275)
@@ -64,8 +64,6 @@
     void keyReleaseEvent( QKeyEvent * e );
 
     void wheelEvent( QWheelEvent* event );
-
-  private:
     
 
   public slots: