Skip to content

Commit 7904c10

Browse files
nyalldawsonnyalldawson
committedSep 21, 2014
[composer] Add some missing Transfer/TransferThis methods to sip bindings
·
ltr-3_40archive/master_2
1 parent 6138131 commit 7904c10

14 files changed

+19
-19
lines changed
 

‎python/core/composer/qgsaddremoveitemcommand.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class QgsAddRemoveItemCommand: QObject, QUndoCommand
1313
Removed
1414
};
1515

16-
QgsAddRemoveItemCommand( State s, QgsComposerItem* item, QgsComposition* c, const QString& text, QUndoCommand* parent = 0 );
16+
QgsAddRemoveItemCommand( State s, QgsComposerItem* item, QgsComposition* c, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
1717
~QgsAddRemoveItemCommand();
1818

1919
void redo();

‎python/core/composer/qgsaddremovemultiframecommand.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class QgsAddRemoveMultiFrameCommand : QUndoCommand
1212
Removed
1313
};
1414

15-
QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame* multiFrame, QgsComposition* c, const QString& text, QUndoCommand* parent = 0 );
15+
QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame* multiFrame, QgsComposition* c, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
1616
~QgsAddRemoveMultiFrameCommand();
1717
void redo();
1818
void undo();

‎python/core/composer/qgscomposerarrow.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ class QgsComposerArrow: QgsComposerItem
1515
/**Constructor
1616
* @param c parent composition
1717
*/
18-
QgsComposerArrow( QgsComposition* c );
18+
QgsComposerArrow( QgsComposition* c /TransferThis/ );
1919

2020
/**Constructor
2121
* @param startPoint start point for line
2222
* @param stopPoint end point for line
2323
* @param c parent composition
2424
*/
25-
QgsComposerArrow( const QPointF& startPoint, const QPointF& stopPoint, QgsComposition* c );
25+
QgsComposerArrow( const QPointF& startPoint, const QPointF& stopPoint, QgsComposition* c /TransferThis/ );
2626

2727
~QgsComposerArrow();
2828

@@ -151,7 +151,7 @@ class QgsComposerArrow: QgsComposerItem
151151
* @see lineSymbol
152152
* @note added in 2.5
153153
*/
154-
void setLineSymbol( QgsLineSymbolV2* symbol );
154+
void setLineSymbol( QgsLineSymbolV2* symbol /Transfer/ );
155155

156156
/**Returns the line symbol used for drawing the line portion of the arrow
157157
* @returns line symbol

‎python/core/composer/qgscomposerattributetable.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class QgsComposerAttributeTable : QgsComposerTable
8282
* @see composerMap
8383
* @see setDisplayOnlyVisibleFeatures
8484
*/
85-
void setComposerMap( const QgsComposerMap* map /TransferThis/ );
85+
void setComposerMap( const QgsComposerMap* map );
8686

8787
/**Returns the composer map whose extents are controlling the features shown in the
8888
* table. The extents of the map are only used if displayOnlyVisibleFeatures() is true.

‎python/core/composer/qgscomposerattributetablev2.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
3333

3434
public:
3535

36-
QgsComposerAttributeTableV2( QgsComposition* composition, bool createUndoCommands );
36+
QgsComposerAttributeTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands );
3737
~QgsComposerAttributeTableV2();
3838

3939
/**Writes properties specific to attribute tables
@@ -50,7 +50,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
5050
*/
5151
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
5252

53-
virtual void addFrame( QgsComposerFrame* frame, bool recalcFrameSizes = true );
53+
virtual void addFrame( QgsComposerFrame* frame /Transfer/, bool recalcFrameSizes = true );
5454

5555
/**Sets the vector layer from which to display feature attributes
5656
* @param layer Vector layer for attribute table

‎python/core/composer/qgscomposerhtml.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
1414
ManualHtml /*< HTML content is manually set for the item*/
1515
};
1616

17-
QgsComposerHtml( QgsComposition* c, bool createUndoCommands );
17+
QgsComposerHtml( QgsComposition* c /TransferThis/, bool createUndoCommands );
1818
QgsComposerHtml();
1919
~QgsComposerHtml();
2020

@@ -176,7 +176,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
176176
void render( QPainter* p, const QRectF& renderExtent, const int frameIndex );
177177
bool writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const;
178178
bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
179-
void addFrame( QgsComposerFrame* frame, bool recalcFrameSizes = true );
179+
void addFrame( QgsComposerFrame* frame /Transfer/, bool recalcFrameSizes = true );
180180
//overriden to break frames without dividing lines of text
181181
double findNearbyPageBreak( double yPos );
182182

‎python/core/composer/qgscomposeritemcommand.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class QgsComposerItemCommand: QUndoCommand
66
#include "qgscomposeritemcommand.h"
77
%End
88
public:
9-
QgsComposerItemCommand( QgsComposerItem* item, const QString& text, QUndoCommand* parent = 0 );
9+
QgsComposerItemCommand( QgsComposerItem* item, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
1010
virtual ~QgsComposerItemCommand();
1111

1212
/**Reverses the command*/

‎python/core/composer/qgscomposermap.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ class QgsComposerMap : QgsComposerItem
588588
/**
589589
* @deprecated use overview()->setFrameSymbol() or overviews() instead
590590
*/
591-
void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol ) /Deprecated/;
591+
void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol /Transfer/ ) /Deprecated/;
592592

593593
/**
594594
* @deprecated use overview()->frameSymbol() or overviews() instead

‎python/core/composer/qgscomposermapoverview.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class QgsComposerMapOverview : QgsComposerMapItem
158158
* @param symbol fill symbol for overview
159159
* @see frameSymbol
160160
*/
161-
void setFrameSymbol( QgsFillSymbolV2* symbol );
161+
void setFrameSymbol( QgsFillSymbolV2* symbol /Transfer/ );
162162

163163
/**Gets the fill symbol used for drawing the overview extent.
164164
* @returns fill symbol for overview

‎python/core/composer/qgscomposermultiframe.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class QgsComposerMultiFrame: QgsComposerObject
2929
* @param c parent composition
3030
* @param createUndoCommands
3131
*/
32-
QgsComposerMultiFrame( QgsComposition* c, bool createUndoCommands );
32+
QgsComposerMultiFrame( QgsComposition* c /TransferThis/, bool createUndoCommands );
3333

3434
virtual ~QgsComposerMultiFrame();
3535

@@ -82,7 +82,7 @@ class QgsComposerMultiFrame: QgsComposerObject
8282
* @param recalcFrameSizes set to true to force recalculation of all existing frame sizes
8383
* @see removeFrame
8484
*/
85-
virtual void addFrame( QgsComposerFrame* frame, bool recalcFrameSizes = true ) = 0;
85+
virtual void addFrame( QgsComposerFrame* frame /Transfer/, bool recalcFrameSizes = true ) = 0;
8686

8787
/**Finds the optimal position to break a frame at.
8888
* @param yPos maximum vertical position for break

‎python/core/composer/qgscomposermultiframecommand.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class QgsComposerMultiFrameCommand : QUndoCommand
44
#include <qgscomposermultiframecommand.h>
55
%End
66
public:
7-
QgsComposerMultiFrameCommand( QgsComposerMultiFrame* multiFrame, const QString& text, QUndoCommand* parent = 0 );
7+
QgsComposerMultiFrameCommand( QgsComposerMultiFrame* multiFrame, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
88
~QgsComposerMultiFrameCommand();
99

1010
void undo();

‎python/core/composer/qgscomposershape.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class QgsComposerShape: QgsComposerItem
4747
/**Sets the QgsFillSymbolV2 used to draw the shape. Must also call setUseSymbolV2( true ) to
4848
* enable drawing with a symbol.
4949
* Note: added in version 2.1*/
50-
void setShapeStyleSymbol( QgsFillSymbolV2* symbol );
50+
void setShapeStyleSymbol( QgsFillSymbolV2* symbol /Transfer/ );
5151
/**Returns the QgsFillSymbolV2 used to draw the shape.
5252
* Note: added in version 2.1*/
5353
QgsFillSymbolV2* shapeStyleSymbol();

‎python/core/composer/qgscomposertablev2.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
4646
NoHeaders /*!< no headers shown for table */
4747
};
4848

49-
QgsComposerTableV2( QgsComposition* composition, bool createUndoCommands );
49+
QgsComposerTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands );
5050
QgsComposerTableV2();
5151

5252
virtual ~QgsComposerTableV2();

‎python/core/composer/qgscomposertexttable.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class QgsComposerTextTable: QgsComposerTable
55
#include <qgscomposertexttable.h>
66
%End
77
public:
8-
QgsComposerTextTable( QgsComposition* c );
8+
QgsComposerTextTable( QgsComposition* c /TransferThis/ );
99
~QgsComposerTextTable();
1010

1111
/** return correct graphics item type. Added in v1.7 */

0 commit comments

Comments
 (0)
Please sign in to comment.