Skip to content

Commit 67c05b5

Browse files
author
Hugo Mercier
committedSep 23, 2016
Fix some /Transfer/ annotations
·
ltr-3_40final-3_0_0
1 parent eefeef5 commit 67c05b5

16 files changed

+26
-26
lines changed
 

‎python/analysis/interpolation/DualEdgeTriangulation.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ class DualEdgeTriangulation: Triangulation
99
virtual ~DualEdgeTriangulation();
1010
void setDecorator( Triangulation* d );
1111
/** 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*/
12-
void addLine( Line3D* line, bool breakline );
12+
void addLine( Line3D* line /Transfer/, bool breakline );
1313
/** Adds a point to the triangulation and returns the number of this point in case of success or -100 in case of failure*/
14-
int addPoint( Point3D* p );
14+
int addPoint( Point3D* p /Transfer/);
1515
/** Performs a consistency check, remove this later*/
1616
virtual void performConsistencyTest();
1717
/** Calculates the normal at a point on the surface*/

‎python/core/geometry/qgsmulticurve.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class QgsMultiCurve: public QgsGeometryCollection
1818
QString asJSON( int precision = 17 ) const;
1919

2020
/** Adds a geometry and takes ownership. Returns true in case of success*/
21-
virtual bool addGeometry( QgsAbstractGeometry* g );
21+
virtual bool addGeometry( QgsAbstractGeometry* g /Transfer/ );
2222
/** Returns a geometry without curves. Caller takes ownership*/
2323
QgsAbstractGeometry* segmentize() const /Factory/;
2424

‎python/core/geometry/qgsmultilinestring.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class QgsMultiLineString: public QgsMultiCurve
1818
QString asJSON( int precision = 17 ) const;
1919

2020
/** Adds a geometry and takes ownership. Returns true in case of success*/
21-
virtual bool addGeometry( QgsAbstractGeometry* g );
21+
virtual bool addGeometry( QgsAbstractGeometry* g /Transfer/ );
2222

2323
/** Returns the geometry converted to the more generic curve type QgsMultiCurve
2424
@return the converted geometry. Caller takes ownership*/

‎python/core/geometry/qgsmultipoint.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class QgsMultiPointV2: public QgsGeometryCollection
1818

1919

2020
/** Adds a geometry and takes ownership. Returns true in case of success*/
21-
virtual bool addGeometry( QgsAbstractGeometry* g );
21+
virtual bool addGeometry( QgsAbstractGeometry* g /Transfer/ );
2222

2323
virtual QgsAbstractGeometry* boundary() const /Factory/;
2424

‎python/core/geometry/qgsmultipolygon.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class QgsMultiPolygonV2: public QgsMultiSurface
1818

1919

2020
/** Adds a geometry and takes ownership. Returns true in case of success*/
21-
virtual bool addGeometry( QgsAbstractGeometry* g );
21+
virtual bool addGeometry( QgsAbstractGeometry* g /Transfer/ );
2222

2323
/** Returns the geometry converted to the more generic curve type QgsMultiSurface
2424
@return the converted geometry. Caller takes ownership*/

‎python/core/geometry/qgsmultisurface.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class QgsMultiSurface: public QgsGeometryCollection
1818

1919

2020
/** Adds a geometry and takes ownership. Returns true in case of success*/
21-
virtual bool addGeometry( QgsAbstractGeometry* g );
21+
virtual bool addGeometry( QgsAbstractGeometry* g /Transfer/ );
2222

2323
virtual QgsAbstractGeometry* boundary() const /Factory/;
2424

‎python/core/qgsvectorlayercache.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class QgsVectorLayerCache : QObject
7676
*
7777
* @param cacheIndex The cache index to add.
7878
*/
79-
void addCacheIndex( QgsAbstractCacheIndex *cacheIndex );
79+
void addCacheIndex( QgsAbstractCacheIndex *cacheIndex /Transfer/ );
8080

8181
/**
8282
* Query this VectorLayerCache for features.

‎python/gui/attributetable/qgsattributetableview.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class QgsAttributeTableView : QTableView
1414
* @brief setFeatureSelectionManager
1515
* @param featureSelectionManager We will take ownership
1616
*/
17-
void setFeatureSelectionManager( QgsIFeatureSelectionManager* featureSelectionManager );
17+
void setFeatureSelectionManager( QgsIFeatureSelectionManager* featureSelectionManager /Transfer/ );
1818

1919
/**
2020
* This event filter is installed on the verticalHeader to intercept mouse press and release

‎python/gui/attributetable/qgsfeaturelistview.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class QgsFeatureListView : QListView
7979
* @brief setFeatureSelectionManager
8080
* @param featureSelectionManager We will take ownership
8181
*/
82-
void setFeatureSelectionManager( QgsIFeatureSelectionManager* featureSelectionManager );
82+
void setFeatureSelectionManager( QgsIFeatureSelectionManager* featureSelectionManager /Transfer/ );
8383

8484
protected:
8585
virtual void mouseMoveEvent( QMouseEvent *event );

‎python/gui/qgisinterface.sip

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class QgisInterface : QObject
7979
* @param widget widget to add. The toolbar will take ownership of this widget
8080
* @return the QAction you can use to remove this widget from the toolbar
8181
*/
82-
virtual QAction* addToolBarWidget( QWidget* widget ) = 0;
82+
virtual QAction* addToolBarWidget( QWidget* widget /Transfer/ ) = 0;
8383

8484
//! Remove an action (icon) from the plugin toolbar
8585
virtual void removeToolBarIcon( QAction *qAction ) = 0;
@@ -92,7 +92,7 @@ class QgisInterface : QObject
9292
* @param widget widget to add. The toolbar will take ownership of this widget
9393
* @return the QAction you can use to remove this widget from the toolbar
9494
*/
95-
virtual QAction* addRasterToolBarWidget( QWidget* widget ) = 0;
95+
virtual QAction* addRasterToolBarWidget( QWidget* widget /Transfer/ ) = 0;
9696

9797
//! Add an icon to the Raster toolbar
9898
virtual int addRasterToolBarIcon( QAction *qAction ) = 0;
@@ -111,7 +111,7 @@ class QgisInterface : QObject
111111
* @param widget widget to add. The toolbar will take ownership of this widget
112112
* @return the QAction you can use to remove this widget from the toolbar
113113
*/
114-
virtual QAction* addVectorToolBarWidget( QWidget* widget ) = 0;
114+
virtual QAction* addVectorToolBarWidget( QWidget* widget /Transfer/ ) = 0;
115115

116116
//! Remove an action (icon) from the Vector toolbar
117117
virtual void removeVectorToolBarIcon( QAction *qAction ) = 0;
@@ -127,7 +127,7 @@ class QgisInterface : QObject
127127
* @param widget widget to add. The toolbar will take ownership of this widget
128128
* @return the QAction you can use to remove this widget from the toolbar
129129
*/
130-
virtual QAction* addDatabaseToolBarWidget( QWidget* widget ) = 0;
130+
virtual QAction* addDatabaseToolBarWidget( QWidget* widget /Transfer/ ) = 0;
131131

132132
//! Remove an action (icon) from the Database toolbar
133133
virtual void removeDatabaseToolBarIcon( QAction *qAction ) = 0;
@@ -143,7 +143,7 @@ class QgisInterface : QObject
143143
* @param widget widget to add. The toolbar will take ownership of this widget
144144
* @return the QAction you can use to remove this widget from the toolbar
145145
*/
146-
virtual QAction* addWebToolBarWidget( QWidget* widget ) = 0;
146+
virtual QAction* addWebToolBarWidget( QWidget* widget /Transfer/ ) = 0;
147147

148148
//! Remove an action (icon) from the Web toolbar
149149
virtual void removeWebToolBarIcon( QAction *qAction ) = 0;

‎python/gui/qgsgeometryrubberband.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class QgsGeometryRubberBand: QgsMapCanvasItem
5454
~QgsGeometryRubberBand();
5555

5656
/** Sets geometry (takes ownership). Geometry is expected to be in map coordinates */
57-
void setGeometry( QgsAbstractGeometry* geom );
57+
void setGeometry( QgsAbstractGeometry* geom /Transfer/ );
5858
/** Returns a pointer to the geometry*/
5959
const QgsAbstractGeometry* geometry();
6060
/** Moves vertex to new position (in map coordinates)*/

‎python/gui/qgsmaptooledit.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ class QgsMapToolEdit: QgsMapTool
3535
* @param geometryType
3636
* @param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. defaut is false.
3737
*/
38-
QgsRubberBand* createRubberBand( QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::LineGeometry, bool alternativeBand = false );
38+
QgsRubberBand* createRubberBand( QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::LineGeometry, bool alternativeBand = false ) /Factory/;
3939

40-
QgsGeometryRubberBand* createGeometryRubberBand( QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::LineGeometry, bool alternativeBand = false ) const;
40+
QgsGeometryRubberBand* createGeometryRubberBand( QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::LineGeometry, bool alternativeBand = false ) const /Factory/;
4141

4242
/** Returns the current vector layer of the map canvas or 0*/
4343
QgsVectorLayer* currentVectorLayer();

‎python/gui/symbology-ng/qgs25drendererwidget.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ class Qgs25DRendererWidget : QgsRendererWidget
2525
* @param style
2626
* @param renderer the mask renderer (will take ownership)
2727
*/
28-
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
28+
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer /Transfer/ ) /Factory/;
2929

3030
/** Constructor
3131
* @param layer the layer where this renderer is applied
3232
* @param style
3333
* @param renderer the mask renderer (will take ownership)
3434
*/
35-
Qgs25DRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
35+
Qgs25DRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer /Transfer/ );
3636

3737
QgsFeatureRenderer* renderer();
3838

‎src/gui/symbology-ng/qgs25drendererwidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ class GUI_EXPORT Qgs25DRendererWidget : public QgsRendererWidget, Ui::Qgs25DRend
3232
/** Static creation method
3333
* @param layer the layer where this renderer is applied
3434
* @param style
35-
* @param renderer the mask renderer (will take ownership)
35+
* @param renderer the mask renderer (will not take ownership)
3636
*/
3737
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
3838

3939
/** Constructor
4040
* @param layer the layer where this renderer is applied
4141
* @param style
42-
* @param renderer the mask renderer (will take ownership)
42+
* @param renderer the mask renderer (will not take ownership)
4343
*/
4444
Qgs25DRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
4545

‎src/gui/symbology-ng/qgsheatmaprendererwidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ class GUI_EXPORT QgsHeatmapRendererWidget : public QgsRendererWidget, private Ui
3232
/** Static creation method
3333
* @param layer the layer where this renderer is applied
3434
* @param style
35-
* @param renderer the mask renderer (will take ownership)
35+
* @param renderer the mask renderer (will not take ownership)
3636
*/
3737
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
3838

3939
/** Constructor
4040
* @param layer the layer where this renderer is applied
4141
* @param style
42-
* @param renderer the mask renderer (will take ownership)
42+
* @param renderer the mask renderer (will not take ownership)
4343
*/
4444
QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
4545

‎src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ class GUI_EXPORT QgsInvertedPolygonRendererWidget : public QgsRendererWidget, pr
3434
/** Static creation method
3535
* @param layer the layer where this renderer is applied
3636
* @param style
37-
* @param renderer the mask renderer (will take ownership)
37+
* @param renderer the mask renderer (will not take ownership)
3838
*/
3939
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
4040

4141
/** Constructor
4242
* @param layer the layer where this renderer is applied
4343
* @param style
44-
* @param renderer the mask renderer (will take ownership)
44+
* @param renderer the mask renderer (will not take ownership)
4545
*/
4646
QgsInvertedPolygonRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
4747

0 commit comments

Comments
 (0)
Please sign in to comment.