more sip fixes

Author: jef-n

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*/

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;

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;

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 );
 };

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;

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 */

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

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 );
 

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 );

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;
 };