Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Sep 27, 2012 · d5f6543 · d5f6543
2 parents db7b26f + 126b897
commit d5f6543
Show file tree

Hide file tree

Showing 31 changed files with 96 additions and 69 deletions.
diff --git a/python/analysis/interpolation/Triangulation.sip b/python/analysis/interpolation/Triangulation.sip
@@ -9,7 +9,7 @@ class Triangulation
     enum forcedCrossBehaviour {SnappingType_VERTICE, DELETE_FIRST, INSERT_VERTICE};
     virtual ~Triangulation();
     /**Adds a line (e.g. a break-, structure- or an isoline) to the triangulation. The class takes ownership of the line object and its points*/
-    virtual void addLine( Line3D* line, bool breakline ) = 0;
+    virtual void addLine( Line3D* line /Transfer/, bool breakline ) = 0;
     /**Adds a point to the triangulation*/
     virtual int addPoint( Point3D* p ) = 0;
     /**Calculates the normal at a point on the surface and assigns it to 'result'. Returns true in case of success and flase in case of failure*/

diff --git a/python/core/composer/qgscomposerlegenditem.sip b/python/core/composer/qgscomposerlegenditem.sip
@@ -50,7 +50,7 @@ class QgsComposerSymbolItem : QgsComposerLegendItem
     virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true );
 
     /**Set symbol (takes ownership)*/
-    void setSymbol( QgsSymbol* s );
+    void setSymbol( QgsSymbol* s /Transfer/ );
     QgsSymbol* symbol();
 
     void setLayerID( const QString& id );
@@ -77,7 +77,7 @@ class QgsComposerSymbolV2Item: QgsComposerLegendItem
     virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true );
 
     /**Set symbol (takes ownership)*/
-    void setSymbolV2( QgsSymbolV2* s );
+    void setSymbolV2( QgsSymbolV2* s /Transfer/ );
     QgsSymbolV2* symbolV2();
 
     ItemType itemType() const;

diff --git a/python/core/gps/qgsgpsconnection.sip b/python/core/gps/qgsgpsconnection.sip
@@ -69,15 +69,15 @@ class QgsGPSConnection: QObject
     /**Constructor
         @param dev input device for the connection (e.g. serial device). The class takes ownership of the object
       */
-    QgsGPSConnection( QIODevice* dev );
+    QgsGPSConnection( QIODevice* dev /Transfer/ );
     virtual ~QgsGPSConnection();
     /**Opens connection to device*/
     bool connect();
     /**Closes connection to device*/
     bool close();
 
     /**Sets the GPS source. The class takes ownership of the device class*/
-    void setSource( QIODevice* source );
+    void setSource( QIODevice* source /Transfer/ );
 
     /**Returns the status. Possible state are not connected, connected, data received*/
     Status status() const;

diff --git a/python/core/qgsoverlayobject.sip b/python/core/qgsoverlayobject.sip
@@ -35,7 +35,7 @@ class QgsOverlayObject
     void setWidth( int width );
     void setRotation( double rotation );
     /**Set geometry. This class takes ownership of the object*/
-    void setGeometry( QgsGeometry* g );
+    void setGeometry( QgsGeometry* g /Transfer/ );
     /**Adds a position in map coordinates*/
     void addPosition( const QgsPoint& position );
 };
diff --git a/python/core/qgsproject.sip b/python/core/qgsproject.sip
@@ -245,7 +245,7 @@ class QgsProject : QObject
     /** Change handler for missing layers.
       Deletes old handler and takes ownership of the new one.
       @note added in 1.4 */
-    void setBadLayerHandler( QgsProjectBadLayerHandler* handler );
+    void setBadLayerHandler( QgsProjectBadLayerHandler* handler /Transfer/ );
 
     /**Returns project file path if layer is embedded from other project file. Returns empty string if layer is not embedded*/
     QString layerIsEmbedded( const QString& id ) const;

diff --git a/python/core/qgspythonrunner.sip b/python/core/qgspythonrunner.sip
@@ -15,7 +15,7 @@ class QgsPythonRunner
     /** assign an instance of python runner so that run() can be used.
       This method should be called during app initialization.
       Takes ownership of the object, deletes previous instance. */
-    static void setInstance( QgsPythonRunner* runner );
+    static void setInstance( QgsPythonRunner* runner /Transfer/ );
 
   protected:
     /** protected constructor: can be instantiated only from children */

diff --git a/python/core/qgsrasterdataprovider.sip b/python/core/qgsrasterdataprovider.sip
@@ -85,7 +85,7 @@ class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface
     virtual QgsRasterInterface * clone() const = 0;
 
     /* It makes no sense to set input on provider */
-    bool setInput( QgsRasterInterface* input /Transfer/ );
+    bool setInput( QgsRasterInterface* input );
 
     /**
      * Add the list of WMS layer names to be rendered by this server

diff --git a/python/core/qgsrasterrenderer.sip b/python/core/qgsrasterrenderer.sip
@@ -28,7 +28,7 @@ class QgsRasterRenderer : QgsRasterInterface
   public:
     QgsRasterRenderer( QgsRasterDataProvider* provider, const QString& type );
     virtual ~QgsRasterRenderer();
-    virtual QgsRasterInterface * clone() const = 0;
+    virtual QgsRasterInterface * clone() const = 0 /Factory/;
 
     virtual QString type() const;
     virtual void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
@@ -65,17 +65,17 @@ class QgsPalettedRasterRenderer: QgsRasterRenderer
 %End
   public:
     /**Renderer owns color array*/
-    QgsPalettedRasterRenderer( QgsRasterDataProvider* provider, int bandNumber, QColor* colorArray, int nColors );
+    QgsPalettedRasterRenderer( QgsRasterDataProvider* provider, int bandNumber, QColor* colorArray /Transfer,Array/, int nColors /ArraySize/ );
     ~QgsPalettedRasterRenderer();
-    QgsRasterInterface * clone();
-    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider );
+    QgsRasterInterface * clone() /Factory/;
+    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 
     void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
 
     /**Returns number of colors*/
     int nColors() const;
     /**Returns copy of color array (caller takes ownership)*/
-    QColor* colors() const;
+    QColor* colors() const /TransferBack/;
 
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
 
@@ -92,9 +92,9 @@ class QgsMultiBandColorRenderer: QgsRasterRenderer
                                QgsContrastEnhancement* redEnhancement = 0, QgsContrastEnhancement* greenEnhancement = 0,
                                QgsContrastEnhancement* blueEnhancement = 0 );
     ~QgsMultiBandColorRenderer();
-    QgsRasterInterface * clone();
+    QgsRasterInterface * clone() /Factory/;
 
-    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider );
+    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 
     void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
 
@@ -107,15 +107,15 @@ class QgsMultiBandColorRenderer: QgsRasterRenderer
 
     const QgsContrastEnhancement* redContrastEnhancement() const;
     /**Takes ownership*/
-    void setRedContrastEnhancement( QgsContrastEnhancement* ce );
+    void setRedContrastEnhancement( QgsContrastEnhancement* ce /Transfer/ );
 
     const QgsContrastEnhancement* greenContrastEnhancement() const;
     /**Takes ownership*/
-    void setGreenContrastEnhancement( QgsContrastEnhancement* ce );
+    void setGreenContrastEnhancement( QgsContrastEnhancement* ce /Transfer/ );
 
     const QgsContrastEnhancement* blueContrastEnhancement() const;
     /**Takes ownership*/
-    void setBlueContrastEnhancement( QgsContrastEnhancement* ce );
+    void setBlueContrastEnhancement( QgsContrastEnhancement* ce /Transfer/ );
 
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
 };
@@ -129,14 +129,14 @@ class QgsSingleBandPseudoColorRenderer: QgsRasterRenderer
     /**Note: takes ownership of QgsRasterShader*/
     QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader /Transfer/ );
     ~QgsSingleBandPseudoColorRenderer();
-    QgsRasterInterface * clone();
+    QgsRasterInterface * clone() /Factory/;
 
-    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider );
+    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 
     void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
 
     /**Takes ownership of the shader*/
-    void setShader( QgsRasterShader* shader );
+    void setShader( QgsRasterShader* shader /Transfer/ );
     QgsRasterShader* shader();
 
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
@@ -152,17 +152,17 @@ class QgsSingleBandGrayRenderer: QgsRasterRenderer
   public:
     QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand );
     ~QgsSingleBandGrayRenderer();
-    QgsRasterInterface * clone();
+    QgsRasterInterface * clone() /Factory/;
 
-    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider );
+    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 
     void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
 
     int grayBand() const;
     void setGrayBand( int band );
     const QgsContrastEnhancement* contrastEnhancement() const;
     /**Takes ownership*/
-    void setContrastEnhancement( QgsContrastEnhancement* ce );
+    void setContrastEnhancement( QgsContrastEnhancement* ce /Transfer/ );
 
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
 
@@ -177,9 +177,9 @@ class QgsSingleBandColorDataRenderer: QgsRasterRenderer
   public:
     QgsSingleBandColorDataRenderer( QgsRasterDataProvider* provider, int band );
     ~QgsSingleBandColorDataRenderer();
-    QgsRasterInterface * clone();
+    QgsRasterInterface * clone() /Factory/;
 
-    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider );
+    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 
     void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
 

diff --git a/python/core/qgsrendercontext.sip b/python/core/qgsrendercontext.sip
@@ -39,7 +39,7 @@ class QgsRenderContext
     //setters
 
     /**Sets coordinate transformation. QgsRenderContext takes ownership and deletes if necessary*/
-    void setCoordinateTransform( QgsCoordinateTransform* t );
+    void setCoordinateTransform( QgsCoordinateTransform* t /Transfer/ );
     void setMapToPixel( const QgsMapToPixel& mtp );
     void setExtent( const QgsRectangle& extent );
     void setDrawEditingInformation( bool b );

diff --git a/python/core/qgssnapper.sip b/python/core/qgssnapper.sip
@@ -76,10 +76,10 @@ class QgsSnapper
     @param snappingResult the list where the results are inserted (everything in map coordinate system)
     @param excludePoints a list with (map coordinate) points that should be excluded in the snapping result. Useful e.g. for vertex moves where a vertex should not be snapped to its original position
     @return 0 in case of success*/
-    int snapPoint( const QPoint& startPoint, QList<QgsSnappingResult>& snappingResult, const QList<QgsPoint>& excludePoints = QList<QgsPoint>() );
+    int snapPoint( const QPoint& startPoint, QList<QgsSnappingResult>& snappingResult /Out/, const QList<QgsPoint>& excludePoints = QList<QgsPoint>() );
 
     //setters
     void setSnapLayers( const QList<QgsSnapper::SnapLayer>& snapLayers );
     void setSnapMode( QgsSnapper::SnappingMode snapMode );
 
-  };
+};
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -193,7 +193,7 @@ class QgsVectorLayer : QgsMapLayer
     void setRenderer( QgsRenderer * r /Transfer/ );
 
     /** Sets diagram rendering object (takes ownership) */
-    void setDiagramRenderer( QgsDiagramRendererV2* r );
+    void setDiagramRenderer( QgsDiagramRendererV2* r /Transfer/ );
     const QgsDiagramRendererV2* diagramRenderer() const;
 
     void setDiagramLayerSettings( const QgsDiagramLayerSettings& s );

diff --git a/python/core/raster/qgsmultibandcolorrenderer.sip b/python/core/raster/qgsmultibandcolorrenderer.sip
@@ -8,9 +8,9 @@ class QgsMultiBandColorRenderer: QgsRasterRenderer
                                QgsContrastEnhancement* redEnhancement = 0, QgsContrastEnhancement* greenEnhancement = 0,
                                QgsContrastEnhancement* blueEnhancement = 0 );
     ~QgsMultiBandColorRenderer();
-    QgsRasterInterface * clone();
+    QgsRasterInterface * clone() /Factory/;
 
-    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider );
+    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 
     void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
 
@@ -23,15 +23,15 @@ class QgsMultiBandColorRenderer: QgsRasterRenderer
 
     const QgsContrastEnhancement* redContrastEnhancement() const;
     /**Takes ownership*/
-    void setRedContrastEnhancement( QgsContrastEnhancement* ce );
+    void setRedContrastEnhancement( QgsContrastEnhancement* ce /Transfer/ );
 
     const QgsContrastEnhancement* greenContrastEnhancement() const;
     /**Takes ownership*/
-    void setGreenContrastEnhancement( QgsContrastEnhancement* ce );
+    void setGreenContrastEnhancement( QgsContrastEnhancement* ce /Transfer/ );
 
     const QgsContrastEnhancement* blueContrastEnhancement() const;
     /**Takes ownership*/
-    void setBlueContrastEnhancement( QgsContrastEnhancement* ce );
+    void setBlueContrastEnhancement( QgsContrastEnhancement* ce /Transfer/ );
 
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
 };
diff --git a/python/core/raster/qgspaletterasterrenderer.sip b/python/core/raster/qgspaletterasterrenderer.sip
@@ -5,17 +5,17 @@ class QgsPalettedRasterRenderer: QgsRasterRenderer
 %End
   public:
     /**Renderer owns color array*/
-    QgsPalettedRasterRenderer( QgsRasterDataProvider* provider, int bandNumber, QColor* colorArray, int nColors );
+    QgsPalettedRasterRenderer( QgsRasterDataProvider* provider, int bandNumber, QColor* colorArray /Array,Transfer/, int nColors /ArraySize/ );
     ~QgsPalettedRasterRenderer();
-    QgsRasterInterface * clone();
-    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider );
+    QgsRasterInterface * clone() /Factory/;
+    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 
     void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
 
     /**Returns number of colors*/
     int nColors() const;
     /**Returns copy of color array (caller takes ownership)*/
-    QColor* colors() const;
+    QColor* colors() const /Factory/;
 
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
 

diff --git a/python/core/raster/qgsrasterlayer.sip b/python/core/raster/qgsrasterlayer.sip
@@ -201,7 +201,7 @@ class QgsRasterLayer : QgsMapLayer
     QgsRasterRenderer* renderer() const;
 
     /**Set raster resample filter. Takes ownership of the resample filter object*/
-    //void setResampleFilter( QgsRasterResampleFilter* resampleFilter );
+    //void setResampleFilter( QgsRasterResampleFilter* resampleFilter /Transfer/ );
     QgsRasterResampleFilter * resampleFilter() const;
 
     /** Get raster pipe */

diff --git a/python/core/raster/qgsrasterrenderer.sip b/python/core/raster/qgsrasterrenderer.sip
@@ -26,7 +26,7 @@ class QgsRasterRenderer : QgsRasterInterface
 %End
 
   public:
-    QgsRasterRenderer( QgsRasterInterface* input /Transfer/ = 0, const QString& type = "" );
+    QgsRasterRenderer( QgsRasterInterface* input = 0, const QString& type = "" );
     virtual ~QgsRasterRenderer();
 
     virtual QgsRasterInterface * clone() const = 0 /Factory/;

diff --git a/python/core/raster/qgsrasterresamplefilter.sip b/python/core/raster/qgsrasterresamplefilter.sip
@@ -22,11 +22,11 @@ class QgsRasterResampleFilter : QgsRasterInterface
     void *readBlock( int bandNo, const QgsRectangle &extent, int width, int height );
 
     /**Set resampler for zoomed in scales. Takes ownership of the object*/
-    void setZoomedInResampler( QgsRasterResampler* r );
+    void setZoomedInResampler( QgsRasterResampler* r /Transfer/ );
     const QgsRasterResampler* zoomedInResampler() const;
 
     /**Set resampler for zoomed out scales. Takes ownership of the object*/
-    void setZoomedOutResampler( QgsRasterResampler* r );
+    void setZoomedOutResampler( QgsRasterResampler* r /Transfer/ );
     const QgsRasterResampler* zoomedOutResampler() const;
 
     void setMaxOversampling( double os );

diff --git a/python/core/raster/qgssinglebandgrayrenderer.sip b/python/core/raster/qgssinglebandgrayrenderer.sip
@@ -6,17 +6,17 @@ class QgsSingleBandGrayRenderer: QgsRasterRenderer
   public:
     QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand );
     ~QgsSingleBandGrayRenderer();
-    QgsRasterInterface * clone();
+    QgsRasterInterface * clone() /Factory/;
 
-    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider );
+    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 
     void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
 
     int grayBand() const;
     void setGrayBand( int band );
     const QgsContrastEnhancement* contrastEnhancement() const;
     /**Takes ownership*/
-    void setContrastEnhancement( QgsContrastEnhancement* ce );
+    void setContrastEnhancement( QgsContrastEnhancement* ce /Transfer/ );
 
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
 

diff --git a/python/core/raster/qgssinglebandpseudocolorrenderer.sip b/python/core/raster/qgssinglebandpseudocolorrenderer.sip
@@ -7,14 +7,14 @@ class QgsSingleBandPseudoColorRenderer: QgsRasterRenderer
     /**Note: takes ownership of QgsRasterShader*/
     QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader /Transfer/ );
     ~QgsSingleBandPseudoColorRenderer();
-    QgsRasterInterface * clone();
+    QgsRasterInterface * clone() /Factory/;
 
-    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider );
+    static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 
     void * readBlock( int bandNo, const QgsRectangle & extent, int width, int height );
 
     /**Takes ownership of the shader*/
-    void setShader( QgsRasterShader* shader );
+    void setShader( QgsRasterShader* shader /Transfer/ );
     QgsRasterShader* shader();
 
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;

diff --git a/python/core/symbology-ng/qgspointdisplacementrenderer.sip b/python/core/symbology-ng/qgspointdisplacementrenderer.sip
@@ -24,7 +24,7 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
     QgsSymbolV2List symbols();
 
     //! create a renderer from XML element
-    static QgsFeatureRendererV2* create( QDomElement& symbologyElem );
+    static QgsFeatureRendererV2* create( QDomElement& symbologyElem ) /Factory/;
     QDomElement save( QDomDocument& doc );
 
     QgsLegendSymbologyList legendSymbologyItems( QSize iconSize );
@@ -35,7 +35,7 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
     QString labelAttributeName() const;
 
     /**Sets embedded renderer (takes ownership)*/
-    void setEmbeddedRenderer( QgsFeatureRendererV2* r );
+    void setEmbeddedRenderer( QgsFeatureRendererV2* r /Transfer/ );
     QgsFeatureRendererV2* embeddedRenderer();
 
     // void setDisplacementGroups( const QList<QMap<QgsFeatureId, QgsFeature> >& list );
@@ -61,7 +61,7 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
     /**Returns the symbol for the center of a displacement group (but _not_ ownership of the symbol)*/
     QgsMarkerSymbolV2* centerSymbol();
     /**Sets the center symbol (takes ownership)*/
-    void setCenterSymbol( QgsMarkerSymbolV2* symbol );
+    void setCenterSymbol( QgsMarkerSymbolV2* symbol /Transfer/ );
 
     void setTolerance( double t );
     double tolerance() const;

diff --git a/python/core/symbology-ng/qgsrendererv2.sip b/python/core/symbology-ng/qgsrendererv2.sip
@@ -90,7 +90,7 @@ class QgsFeatureRendererV2
     void setUsingSymbolLevels( bool usingSymbolLevels );
 
     //! create a renderer from XML element
-    static QgsFeatureRendererV2* load( QDomElement& symbologyElem );
+    static QgsFeatureRendererV2* load( QDomElement& symbologyElem ) /Factory/;
 
     //! store renderer info to XML element
     virtual QDomElement save( QDomDocument& doc );
@@ -110,7 +110,7 @@ class QgsFeatureRendererV2
      * @return the renderer
      * @note added in 1.9
      */
-    static QgsFeatureRendererV2* loadSld( const QDomNode &node, QGis::GeometryType geomType, QString &errorMessage );
+    static QgsFeatureRendererV2* loadSld( const QDomNode &node, QGis::GeometryType geomType, QString &errorMessage ) /Factory/;
 
     //! used from subclasses to create SLD Rule elements following SLD v1.1 specs
     //! @note added in 1.9