Merged rest of composer branch (9087-9115)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9125 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

python/core/qgscontinuouscolorrenderer.sip

@@ -29,7 +29,7 @@ class QgsContinuousColorRenderer : QgsRenderer
     /** whether to draw a polygon outline*/
     bool drawPolygonOutline() const;
     /**Reads the renderer configuration from an XML file
-     @param rnode the DOM node to read 
+     @param rnode the Dom node to read 
      @param vl the vector layer which will be associated with the renderer*/
     virtual void readXML(const QDomNode& rnode, QgsVectorLayer& vl);
     /**Writes the contents of the renderer to a configuration file

python/core/qgscoordinatereferencesystem.sip

@@ -175,12 +175,12 @@ class QgsCoordinateReferenceSystem
           */
          QString toWkt() const;
 
-         /*! Restores state from the given DOM node.
+         /*! Restores state from the given Dom node.
          * @param theNode The node from which state will be restored
          * @return bool True on success, False on failure
          */
           bool readXML( QDomNode & theNode );
-        /*! Stores state to the given DOM node in the given document.
+        /*! Stores state to the given Dom node in the given document.
          * Below is an example of the generated tag.
          *  <spatialrefsys>
          *      <proj4>+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs </proj4>

python/core/qgscoordinatetransform.sip

@@ -169,13 +169,13 @@ class QgsCoordinateTransform : QObject
     //!initialise is used to actually create the Transformer instance
     void initialise();
 
-    /*! Restores state from the given DOM node.
+    /*! Restores state from the given Dom node.
     * @param theNode The node from which state will be restored
     * @return bool True on success, False on failure
     */
     bool readXML( QDomNode & theNode );
 
-    /*! Stores state to the given DOM node in the given document
+    /*! Stores state to the given Dom node in the given document
     * @param theNode The node in which state will be restored
     * @param theDom The document in which state will be stored
     * @return bool True on success, False on failure

python/core/qgsgraduatedsymbolrenderer.sip

@@ -28,7 +28,7 @@ class QgsGraduatedSymbolRenderer : QgsRenderer
     \param field the number of the field to classify*/
     void setClassificationField(int field);
     /**Reads the renderer configuration from an XML file
-     @param rnode the DOM node to read 
+     @param rnode the Dom node to read 
      @param vl the vector layer which will be associated with the renderer*/
     virtual void readXML(const QDomNode& rnode, QgsVectorLayer& vl);
     /**Writes the contents of the renderer to a configuration file

python/core/qgslabel.sip

@@ -45,12 +45,12 @@ public:
      *  \param sizeScale global scale factor for size in pixels, labels in map units are not scaled
     */
     void renderLabel ( QPainter* painter, QgsRect& viewExtent, 
-                       QgsCoordinateTransform* coordTransform,
+                       QgsCoordinateTransform* coordinateTransform,
                        QgsMapToPixel *transform,
                        QgsFeature &feature, bool selected, QgsLabelAttributes *classAttributes=0, double sizeScale = 1);
 
     /** Reads the renderer configuration from an XML file
-     @param rnode the DOM node to read 
+     @param rnode the Dom node to read 
     */
     void readXML(const QDomNode& node);
 

python/core/qgsmaplayer.sip

@@ -57,12 +57,12 @@ public:
 
     /** Render the layer, to be overridden in child classes
      */
-    virtual bool draw(QgsRenderContext& renderContext);
+    virtual bool draw(QgsRenderContext& rendererContext);
 
     /** Draw labels
      * @TODO to be removed: used only in vector layers
      */
-    virtual void drawLabels(QgsRenderContext& renderContext);
+    virtual void drawLabels(QgsRenderContext& rendererContext);
 
     /** Return the extent of the layer as a QRect */
     const QgsRect extent();
@@ -107,15 +107,15 @@ public:
     /** True if the layer can be edited */
     virtual bool isEditable() const = 0;
 
-    /** sets state from DOM document
-       @param layer_node is DOM node corresponding to ``maplayer'' tag
+    /** sets state from Dom document
+       @param layer_node is Dom node corresponding to ``maplayer'' tag
        @note
 
-       The DOM node corresponds to a DOM document project file XML element read
+       The Dom node corresponds to a Dom document project file XML element read
        by QgsProject.
 
        This, in turn, calls readXml(), which is over-rideable by sub-classes so
-       that they can read their own specific state from the given DOM node.
+       that they can read their own specific state from the given Dom node.
 
        Invoked by QgsProject::read().
 
@@ -124,15 +124,15 @@ public:
     bool readXML(QDomNode & layer_node);
 
 
-    /** stores state in DOM node
-       @param layer_node is DOM node corresponding to ``projectlayers'' tag
+    /** stores state in Dom node
+       @param layer_node is Dom node corresponding to ``projectlayers'' tag
        @note
 
-       The DOM node corresponds to a DOM document project file XML element to be
+       The Dom node corresponds to a Dom document project file XML element to be
        written by QgsProject.
 
        This, in turn, calls writeXml(), which is over-rideable by sub-classes so
-       that they can write their own specific state to the given DOM node.
+       that they can write their own specific state to the given Dom node.
 
        Invoked by QgsProject::write().
 

python/core/qgsmaprenderer.sip

@@ -28,7 +28,7 @@ class QgsMapRenderer : QObject
     //! returns current extent
     QgsRect extent();
 
-    const QgsMapToPixel* coordXForm();
+    const QgsMapToPixel* coordinateTransform();
 
     double scale() const;
     double mupp() const;
@@ -57,13 +57,13 @@ class QgsMapRenderer : QObject
     QgsRect layerExtentToOutputExtent(QgsMapLayer* theLayer, QgsRect extent);
 
     //! transform coordinates from layer's CRS to output CRS
-    QgsPoint layerCoordsToOutputCoords(QgsMapLayer* theLayer, QgsPoint point);
+    QgsPoint layerToMapCoordinates(QgsMapLayer* theLayer, QgsPoint point);
 
     //! transform coordinates from output CRS to layer's CRS
-    QgsPoint outputCoordsToLayerCoords(QgsMapLayer* theLayer, QgsPoint point);
+    QgsPoint mapToLayerCoordinates(QgsMapLayer* theLayer, QgsPoint point);
 
     //! transform rect's coordinates from output CRS to layer's CRS
-    QgsRect outputCoordsToLayerCoords(QgsMapLayer* theLayer, QgsRect rect);
+    QgsRect mapToLayerCoordinates(QgsMapLayer* theLayer, QgsRect rect);
 
     //! sets whether to use projections for this layer set
     void setProjectionsEnabled(bool enabled);

python/core/qgsmaptopixel.sip

@@ -73,7 +73,7 @@ class QgsMapToPixel
     //! Set minimum y value
     void setYmin(double ymin);
     //! set minimum x value
-    void setXmin(double xmin);
+    void setXMinimum(double xmin);
     /*! Set parameters for use in tranfsorming coordinates
     * @param mupp Map units per pixel
     * @param xmin Minimum x value

python/core/qgspoint.sip

@@ -48,10 +48,10 @@ public:
   double y() const;
 
   //! String representation of the point (x,y)
-  QString stringRep() const;
+  QString toString() const;
 
   //! As above but with precision for string representaiton of a point
-  QString stringRep(int thePrecision) const;
+  QString toString(int thePrecision) const;
 
   /*! Return the well known text representation for the point.
    * The wkt is created without an SRID.

python/core/qgsproject.sip

@@ -49,7 +49,7 @@ public:
        write()
      */
     //@{
-    bool dirty() const;
+    bool isDirty() const;
 
     void dirty( bool b );
     //@}
@@ -59,7 +59,7 @@ public:
        Every project has an associated file that contains its XML
      */
     //@{
-    void filename( const QString & name );
+    void setFilename( const QString & name );
 
     /** returns file name */
     QString filename() const;
@@ -100,14 +100,14 @@ public:
     //@}
 
 
-    /** read the layer described in the associated DOM node
+    /** read the layer described in the associated Dom node
 
-        @param layerNode   represents a QgsProject DOM node that maps to a specific layer.
+        @param layerNode   represents a QgsProject Dom node that maps to a specific layer.
 
         QgsProject raises an exception when one of the QgsProject::read()
         implementations fails.  Since the read()s are invoked from qgisapp,
         then qgisapp handles the exception.  It prompts the user for the new
-        location of the data, if any.  If there is a new location, the DOM
+        location of the data, if any.  If there is a new location, the Dom
         node associated with the layer has its <datasource> tag corrected.
         Then that node is passed to this member function to be re-opened.