Skip to content

Commit

Permalink
[composer] Add some missing Transfer/TransferThis methods to sip bind…
Browse files Browse the repository at this point in the history
…ings
  • Loading branch information
nyalldawson committed Sep 21, 2014
1 parent 6138131 commit 7904c10
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion python/core/composer/qgsaddremoveitemcommand.sip
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class QgsAddRemoveItemCommand: QObject, QUndoCommand
Removed
};

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

void redo();
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgsaddremovemultiframecommand.sip
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class QgsAddRemoveMultiFrameCommand : QUndoCommand
Removed
};

QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame* multiFrame, QgsComposition* c, const QString& text, QUndoCommand* parent = 0 );
QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame* multiFrame, QgsComposition* c, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
~QgsAddRemoveMultiFrameCommand();
void redo();
void undo();
Expand Down
6 changes: 3 additions & 3 deletions python/core/composer/qgscomposerarrow.sip
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ class QgsComposerArrow: QgsComposerItem
/**Constructor
* @param c parent composition
*/
QgsComposerArrow( QgsComposition* c );
QgsComposerArrow( QgsComposition* c /TransferThis/ );

/**Constructor
* @param startPoint start point for line
* @param stopPoint end point for line
* @param c parent composition
*/
QgsComposerArrow( const QPointF& startPoint, const QPointF& stopPoint, QgsComposition* c );
QgsComposerArrow( const QPointF& startPoint, const QPointF& stopPoint, QgsComposition* c /TransferThis/ );

~QgsComposerArrow();

Expand Down Expand Up @@ -151,7 +151,7 @@ class QgsComposerArrow: QgsComposerItem
* @see lineSymbol
* @note added in 2.5
*/
void setLineSymbol( QgsLineSymbolV2* symbol );
void setLineSymbol( QgsLineSymbolV2* symbol /Transfer/ );

/**Returns the line symbol used for drawing the line portion of the arrow
* @returns line symbol
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerattributetable.sip
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class QgsComposerAttributeTable : QgsComposerTable
* @see composerMap
* @see setDisplayOnlyVisibleFeatures
*/
void setComposerMap( const QgsComposerMap* map /TransferThis/ );
void setComposerMap( const QgsComposerMap* map );

/**Returns the composer map whose extents are controlling the features shown in the
* table. The extents of the map are only used if displayOnlyVisibleFeatures() is true.
Expand Down
4 changes: 2 additions & 2 deletions python/core/composer/qgscomposerattributetablev2.sip
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2

public:

QgsComposerAttributeTableV2( QgsComposition* composition, bool createUndoCommands );
QgsComposerAttributeTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands );
~QgsComposerAttributeTableV2();

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

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

/**Sets the vector layer from which to display feature attributes
* @param layer Vector layer for attribute table
Expand Down
4 changes: 2 additions & 2 deletions python/core/composer/qgscomposerhtml.sip
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
ManualHtml /*< HTML content is manually set for the item*/
};

QgsComposerHtml( QgsComposition* c, bool createUndoCommands );
QgsComposerHtml( QgsComposition* c /TransferThis/, bool createUndoCommands );
QgsComposerHtml();
~QgsComposerHtml();

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

Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposeritemcommand.sip
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class QgsComposerItemCommand: QUndoCommand
#include "qgscomposeritemcommand.h"
%End
public:
QgsComposerItemCommand( QgsComposerItem* item, const QString& text, QUndoCommand* parent = 0 );
QgsComposerItemCommand( QgsComposerItem* item, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
virtual ~QgsComposerItemCommand();

/**Reverses the command*/
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposermap.sip
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ class QgsComposerMap : QgsComposerItem
/**
* @deprecated use overview()->setFrameSymbol() or overviews() instead
*/
void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol ) /Deprecated/;
void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol /Transfer/ ) /Deprecated/;

/**
* @deprecated use overview()->frameSymbol() or overviews() instead
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposermapoverview.sip
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class QgsComposerMapOverview : QgsComposerMapItem
* @param symbol fill symbol for overview
* @see frameSymbol
*/
void setFrameSymbol( QgsFillSymbolV2* symbol );
void setFrameSymbol( QgsFillSymbolV2* symbol /Transfer/ );

/**Gets the fill symbol used for drawing the overview extent.
* @returns fill symbol for overview
Expand Down
4 changes: 2 additions & 2 deletions python/core/composer/qgscomposermultiframe.sip
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @param c parent composition
* @param createUndoCommands
*/
QgsComposerMultiFrame( QgsComposition* c, bool createUndoCommands );
QgsComposerMultiFrame( QgsComposition* c /TransferThis/, bool createUndoCommands );

virtual ~QgsComposerMultiFrame();

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

/**Finds the optimal position to break a frame at.
* @param yPos maximum vertical position for break
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposermultiframecommand.sip
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class QgsComposerMultiFrameCommand : QUndoCommand
#include <qgscomposermultiframecommand.h>
%End
public:
QgsComposerMultiFrameCommand( QgsComposerMultiFrame* multiFrame, const QString& text, QUndoCommand* parent = 0 );
QgsComposerMultiFrameCommand( QgsComposerMultiFrame* multiFrame, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
~QgsComposerMultiFrameCommand();

void undo();
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposershape.sip
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class QgsComposerShape: QgsComposerItem
/**Sets the QgsFillSymbolV2 used to draw the shape. Must also call setUseSymbolV2( true ) to
* enable drawing with a symbol.
* Note: added in version 2.1*/
void setShapeStyleSymbol( QgsFillSymbolV2* symbol );
void setShapeStyleSymbol( QgsFillSymbolV2* symbol /Transfer/ );
/**Returns the QgsFillSymbolV2 used to draw the shape.
* Note: added in version 2.1*/
QgsFillSymbolV2* shapeStyleSymbol();
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposertablev2.sip
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
NoHeaders /*!< no headers shown for table */
};

QgsComposerTableV2( QgsComposition* composition, bool createUndoCommands );
QgsComposerTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands );
QgsComposerTableV2();

virtual ~QgsComposerTableV2();
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposertexttable.sip
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class QgsComposerTextTable: QgsComposerTable
#include <qgscomposertexttable.h>
%End
public:
QgsComposerTextTable( QgsComposition* c );
QgsComposerTextTable( QgsComposition* c /TransferThis/ );
~QgsComposerTextTable();

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

0 comments on commit 7904c10

Please sign in to comment.