sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

[sip] mass introduction of annotations into headers

Browse Source
This commit is contained in:
Denis Rouzaud 2017-05-02 09:43:10 +02:00
parent b249d481e9
commit d3bc0e37a7
243 changed files with 724 additions and 505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/analysis/interpolation/NormVecDecorator.h
View File

@ -18,6 +18,7 @@
#define NORMVECDECORATOR_H
#include "TriDecorator.h"
#include "qgis.h"
#include <TriangleInterpolator.h>
#include <MathUtils.h>
#include "qgslogger.h"
@ -52,7 +53,7 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
//! Returns a pointer to the normal vector for the point with the number n
Vector3D *getNormal( int n ) const;
//! Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normally taken from 'mNormVec', except if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise
bool getTriangle( double x, double y, Point3D *p1, Vector3D *v1, Point3D *p2, Vector3D *v2, Point3D *p3, Vector3D *v3 );
bool getTriangle( double x, double y, Point3D *p1 SIP_OUT, Vector3D *v1 SIP_OUT, Point3D *p2 SIP_OUT, Vector3D *v2 SIP_OUT, Point3D *p3 SIP_OUT, Vector3D *v3 SIP_OUT );
/** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the PointStates of the triangle points (state1, state2, state3)
* \note not available in Python bindings

7
src/analysis/interpolation/Triangulation.h
View File

@ -18,6 +18,7 @@
#define TRIANGULATION_H
#include <QList>
#include "qgis.h"
#include <qpainter.h>
#include <TriangleInterpolator.h>
#include "qgis_analysis.h"
@ -42,7 +43,7 @@ class ANALYSIS_EXPORT 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 SIP_TRANSFER, bool breakline ) = 0;
/**
* Adds a point to the triangulation
@ -71,10 +72,10 @@ class ANALYSIS_EXPORT Triangulation
/** Finds out in which triangle the point with coordinates x and y is and
* assigns the numbers of the vertices to 'n1', 'n2' and 'n3' and the vertices to 'p1', 'p2' and 'p3'
*/
virtual bool getTriangle( double x, double y, Point3D *p1, int *n1, Point3D *p2, int *n2, Point3D *p3, int *n3 ) = 0;
virtual bool getTriangle( double x, double y, Point3D *p1, int *n1 SIP_OUT, Point3D *p2 SIP_OUT, int *n2 SIP_OUT, Point3D *p3 SIP_OUT, int *n3 SIP_OUT ) = 0;
//! Finds out, in which triangle the point with coordinates x and y is and assigns the points at the vertices to 'p1', 'p2' and 'p3
virtual bool getTriangle( double x, double y, Point3D *p1, Point3D *p2, Point3D *p3 ) = 0;
virtual bool getTriangle( double x, double y, Point3D *p1 SIP_OUT, Point3D *p2 SIP_OUT, Point3D *p3 SIP_OUT ) = 0;
//! Returns the number of the point opposite to the triangle points p1, p2 (which have to be on a halfedge)
virtual int getOppositePoint( int p1, int p2 ) = 0;

3
src/analysis/network/qgsgraphbuilder.h
View File

@ -17,6 +17,7 @@
#define QGSGRAPHBUILDER_H
#include "qgsgraphbuilderinterface.h"
#include "qgis.h"
#include <qgsspatialindex.h>
#include "qgis_analysis.h"
@ -52,7 +53,7 @@ class ANALYSIS_EXPORT QgsGraphBuilder : public QgsGraphBuilderInterface
/**
* Returns generated QgsGraph
*/
QgsGraph *graph();
QgsGraph *graph() SIP_FACTORY;
private:

3
src/analysis/raster/qgsrastercalcnode.h
View File

@ -20,6 +20,7 @@
#define QGSRASTERCALCNODE_H
#include <QMap>
#include "qgis.h"
#include <QString>
#include "qgis_analysis.h"
@ -98,7 +99,7 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
*/
bool calculate( QMap<QString, QgsRasterBlock * > &rasterData, QgsRasterMatrix &result, int row = -1 ) const;
static QgsRasterCalcNode *parseRasterCalcString( const QString &str, QString &parserErrorMsg );
static QgsRasterCalcNode *parseRasterCalcString( const QString &str, QString &parserErrorMsg ) SIP_FACTORY;
private:
Type mType;

9
src/core/annotations/qgsannotation.h
View File

@ -19,6 +19,7 @@
#define QGSANNOTATION_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgspoint.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsrendercontext.h"
@ -55,13 +56,13 @@ class CORE_EXPORT QgsAnnotation : public QObject
/**
* Constructor for QgsAnnotation.
*/
QgsAnnotation( QObject *parent = nullptr );
QgsAnnotation( QObject *parent SIP_TRANSFERTHIS = 0 );
/**
* Clones the annotation, returning a new copy of the annotation
* reflecting the annotation's current state.
*/
virtual QgsAnnotation *clone() const = 0;
virtual QgsAnnotation *clone() const = 0 SIP_FACTORY;
/**
* Returns true if the annotation is visible and should be rendered.
@ -182,7 +183,7 @@ class CORE_EXPORT QgsAnnotation : public QObject
* of the symbol is transferred to the annotation.
* \see fillSymbol()
*/
void setFillSymbol( QgsFillSymbol *symbol );
void setFillSymbol( QgsFillSymbol *symbol SIP_TRANSFER );
/**
* Returns the symbol that is used for rendering the annotation frame.
@ -216,7 +217,7 @@ class CORE_EXPORT QgsAnnotation : public QObject
* of the symbol is transferred to the annotation.
* \see markerSymbol()
*/
void setMarkerSymbol( QgsMarkerSymbol *symbol );
void setMarkerSymbol( QgsMarkerSymbol *symbol SIP_TRANSFER );
/**
* Returns the symbol that is drawn at the annotation's map position.

3
src/core/composer/qgsaddremoveitemcommand.h
View File

@ -19,6 +19,7 @@
#define QGSADDREMOVEITEMCOMMAND_H
#include <QUndoCommand>
#include "qgis.h"
#include "qgis_core.h"
@ -40,7 +41,7 @@ class CORE_EXPORT QgsAddRemoveItemCommand: public QObject, public QUndoCommand
Removed
};
QgsAddRemoveItemCommand( State s, QgsComposerItem *item, QgsComposition *c, const QString &text, QUndoCommand *parent = nullptr );
QgsAddRemoveItemCommand( State s, QgsComposerItem *item, QgsComposition *c, const QString &text, QUndoCommand *parent SIP_TRANSFERTHIS = 0 );
~QgsAddRemoveItemCommand();
void redo() override;

3
src/core/composer/qgsaddremovemultiframecommand.h
View File

@ -19,6 +19,7 @@
#define QGSADDREMOVEMULTIFRAMECOMMAND_H
#include <QUndoCommand>
#include "qgis.h"
#include "qgis_core.h"
@ -38,7 +39,7 @@ class CORE_EXPORT QgsAddRemoveMultiFrameCommand: public QUndoCommand
Removed
};
QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame *multiFrame, QgsComposition *c, const QString &text, QUndoCommand *parent = nullptr );
QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame *multiFrame, QgsComposition *c, const QString &text, QUndoCommand *parent SIP_TRANSFERTHIS = 0 );
~QgsAddRemoveMultiFrameCommand();
void redo() override;
void undo() override;

7
src/core/composer/qgscomposerarrow.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERARROW_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposeritem.h"
#include <QBrush>
#include <QPen>
@ -44,14 +45,14 @@ class CORE_EXPORT QgsComposerArrow: public QgsComposerItem
/** Constructor
* \param c parent composition
*/
QgsComposerArrow( QgsComposition *c );
QgsComposerArrow( QgsComposition *c SIP_TRANSFERTHIS );
/** Constructor
* \param startPoint start point for line
* \param stopPoint end point for line
* \param c parent composition
*/
QgsComposerArrow( QPointF startPoint, QPointF stopPoint, QgsComposition *c );
QgsComposerArrow( QPointF startPoint, QPointF stopPoint, QgsComposition *c SIP_TRANSFERTHIS );
~QgsComposerArrow();
@ -158,7 +159,7 @@ class CORE_EXPORT QgsComposerArrow: public QgsComposerItem
* \see lineSymbol
* \since QGIS 2.5
*/
void setLineSymbol( QgsLineSymbol *symbol );
void setLineSymbol( QgsLineSymbol *symbol SIP_TRANSFER );
/** Returns the line symbol used for drawing the line portion of the arrow
* \returns line symbol

5
src/core/composer/qgscomposerattributetablemodelv2.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERATTRIBUTETABLEMODELV2_H
#include <QAbstractTableModel>
#include "qgis.h"
#include <QSortFilterProxyModel>
#include "qgis_core.h"
@ -49,7 +50,7 @@ class CORE_EXPORT QgsComposerAttributeTableColumnModelV2: public QAbstractTableM
* \param composerTable QgsComposerAttributeTable the model is attached to
* \param parent optional parent
*/
QgsComposerAttributeTableColumnModelV2( QgsComposerAttributeTableV2 *composerTable, QObject *parent = nullptr );
QgsComposerAttributeTableColumnModelV2( QgsComposerAttributeTableV2 *composerTable, QObject *parent SIP_TRANSFERTHIS = 0 );
virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
@ -149,7 +150,7 @@ class CORE_EXPORT QgsComposerTableSortColumnsProxyModelV2: public QSortFilterPro
* \param filterType filter for columns, controls whether sorted or unsorted columns are shown
* \param parent optional parent
*/
QgsComposerTableSortColumnsProxyModelV2( QgsComposerAttributeTableV2 *composerTable, ColumnFilterType filterType, QObject *parent = nullptr );
QgsComposerTableSortColumnsProxyModelV2( QgsComposerAttributeTableV2 *composerTable, ColumnFilterType filterType, QObject *parent SIP_TRANSFERTHIS = 0 );
bool lessThan( const QModelIndex &left, const QModelIndex &right ) const override;
int columnCount( const QModelIndex &parent = QModelIndex() ) const override;

3
src/core/composer/qgscomposerattributetablev2.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERATTRIBUTETABLEV2_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposertablev2.h"
#include "qgsvectorlayerref.h"
@ -68,7 +69,7 @@ class CORE_EXPORT QgsComposerAttributeTableV2: public QgsComposerTableV2
RelationChildren //!< Table shows attributes from related child features
};
QgsComposerAttributeTableV2( QgsComposition *composition, bool createUndoCommands );
QgsComposerAttributeTableV2( QgsComposition *composition SIP_TRANSFERTHIS, bool createUndoCommands );
virtual QString displayName() const override;

3
src/core/composer/qgscomposerframe.h
View File

@ -17,6 +17,7 @@
#define QGSCOMPOSERFRAME_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposeritem.h"
class QgsComposition;
@ -30,7 +31,7 @@ class CORE_EXPORT QgsComposerFrame: public QgsComposerItem
Q_OBJECT
public:
QgsComposerFrame( QgsComposition *c, QgsComposerMultiFrame *mf, qreal x, qreal y, qreal width, qreal height );
QgsComposerFrame( QgsComposition *c SIP_TRANSFERTHIS, QgsComposerMultiFrame *mf, qreal x, qreal y, qreal width, qreal height );
/** Sets the visible part of the multiframe's content which is visible within
* this frame (relative to the total multiframe extent in mm).

3
src/core/composer/qgscomposerhtml.h
View File

@ -17,6 +17,7 @@
#define QGSCOMPOSERHTML_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposermultiframe.h"
#include "qgsfeature.h"
#include <QUrl>
@ -43,7 +44,7 @@ class CORE_EXPORT QgsComposerHtml: public QgsComposerMultiFrame
ManualHtml //!< HTML content is manually set for the item
};
QgsComposerHtml( QgsComposition *c, bool createUndoCommands );
QgsComposerHtml( QgsComposition *c SIP_TRANSFERTHIS, bool createUndoCommands );
~QgsComposerHtml();

5
src/core/composer/qgscomposeritem.h
View File

@ -18,6 +18,7 @@
#define QGSCOMPOSERITEM_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposeritemcommand.h"
#include "qgscomposerobject.h"
#include <QGraphicsRectItem>
@ -108,7 +109,7 @@ class CORE_EXPORT QgsComposerItem: public QgsComposerObject, public QGraphicsRec
/** Constructor
\param composition parent composition
\param manageZValue true if the z-Value of this object should be managed by mComposition*/
QgsComposerItem( QgsComposition *composition, bool manageZValue = true );
QgsComposerItem( QgsComposition *composition SIP_TRANSFERTHIS, bool manageZValue = true );
/** Constructor with box position and composer object
\param x x coordinate of item
@ -117,7 +118,7 @@ class CORE_EXPORT QgsComposerItem: public QgsComposerObject, public QGraphicsRec
\param height height of item
\param composition parent composition
\param manageZValue true if the z-Value of this object should be managed by mComposition*/
QgsComposerItem( qreal x, qreal y, qreal width, qreal height, QgsComposition *composition, bool manageZValue = true );
QgsComposerItem( qreal x, qreal y, qreal width, qreal height, QgsComposition *composition SIP_TRANSFERTHIS, bool manageZValue = true );
virtual ~QgsComposerItem();
//! Return correct graphics item type.

3
src/core/composer/qgscomposeritemcommand.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERITEMCOMMAND_H
#include <QUndoCommand>
#include "qgis.h"
#include <QDomDocument>
#include "qgis_core.h"
@ -32,7 +33,7 @@ class QgsComposerMultiFrame;
class CORE_EXPORT QgsComposerItemCommand: public QUndoCommand
{
public:
QgsComposerItemCommand( QgsComposerItem *item, const QString &text, QUndoCommand *parent = nullptr );
QgsComposerItemCommand( QgsComposerItem *item, const QString &text, QUndoCommand *parent SIP_TRANSFERTHIS = 0 );
//! Reverses the command
void undo() override;

3
src/core/composer/qgscomposeritemgroup.h
View File

@ -18,6 +18,7 @@
#define QGSCOMPOSERITEMGROUP_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposeritem.h"
#include <QSet>
@ -28,7 +29,7 @@ class CORE_EXPORT QgsComposerItemGroup: public QgsComposerItem
{
Q_OBJECT
public:
QgsComposerItemGroup( QgsComposition *c );
QgsComposerItemGroup( QgsComposition *c SIP_TRANSFERTHIS );
~QgsComposerItemGroup();
//! Return correct graphics item type.

3
src/core/composer/qgscomposerlegend.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERLEGEND_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposeritem.h"
#include "qgslayertreemodel.h"
#include "qgslegendsettings.h"
@ -42,7 +43,7 @@ class CORE_EXPORT QgsLegendModel : public QgsLayerTreeModel
public:
//! Construct the model based on the given layer tree
QgsLegendModel( QgsLayerTree *rootNode, QObject *parent = nullptr );
QgsLegendModel( QgsLayerTree *rootNode, QObject *parent SIP_TRANSFERTHIS = 0 );
QVariant data( const QModelIndex &index, int role ) const override;

5
src/core/composer/qgscomposermap.h
View File

@ -19,6 +19,7 @@
//#include "ui_qgscomposermapbase.h"
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposeritem.h"
#include "qgsrectangle.h"
#include "qgscoordinatereferencesystem.h"
@ -53,9 +54,9 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
public:
//! Constructor.
QgsComposerMap( QgsComposition *composition, int x, int y, int width, int height );
QgsComposerMap( QgsComposition *composition SIP_TRANSFERTHIS, int x, int y, int width, int height );
//! Constructor. Settings are read from project.
QgsComposerMap( QgsComposition *composition );
QgsComposerMap( QgsComposition *composition SIP_TRANSFERTHIS );
virtual ~QgsComposerMap();
//! Return correct graphics item type.

5
src/core/composer/qgscomposermapgrid.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERMAPGRID_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposermapitem.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsrectangle.h"
@ -60,7 +61,7 @@ class CORE_EXPORT QgsComposerMapGridStack : public QgsComposerMapItemStack
* should be called for the QgsComposerMap to prevent rendering artifacts
* \see removeGrid
*/
void addGrid( QgsComposerMapGrid *grid );
void addGrid( QgsComposerMapGrid *grid SIP_TRANSFER );
/** Removes a grid from the stack and deletes the corresponding QgsComposerMapGrid
* \param gridId id for the QgsComposerMapGrid to remove
@ -479,7 +480,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
* \see setMarkerSymbol
* \see setStyle
*/
void setLineSymbol( QgsLineSymbol *symbol );
void setLineSymbol( QgsLineSymbol *symbol SIP_TRANSFER );
/** Gets the line symbol used for drawing grid lines. This is only used for grids with
* QgsComposerMapGrid::Solid or QgsComposerMapGrid::Cross styles.

5
src/core/composer/qgscomposermapoverview.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERMAPOVERVIEW_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposermapitem.h"
#include <QString>
#include <QObject>
@ -54,7 +55,7 @@ class CORE_EXPORT QgsComposerMapOverviewStack : public QgsComposerMapItemStack
* should be called for the QgsComposerMap to prevent rendering artifacts
* \see removeOverview
*/
void addOverview( QgsComposerMapOverview *overview );
void addOverview( QgsComposerMapOverview *overview SIP_TRANSFER );
/** Removes an overview from the stack and deletes the corresponding QgsComposerMapOverview
* \param overviewId id for the QgsComposerMapOverview to remove
@ -181,7 +182,7 @@ class CORE_EXPORT QgsComposerMapOverview : public QgsComposerMapItem
* \param symbol fill symbol for overview
* \see frameSymbol
*/
void setFrameSymbol( QgsFillSymbol *symbol );
void setFrameSymbol( QgsFillSymbol *symbol SIP_TRANSFER );
/** Gets the fill symbol used for drawing the overview extent.
* \returns fill symbol for overview

5
src/core/composer/qgscomposermodel.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERMODEL_H
#include "qgis_core.h"
#include "qgis.h"
#include <QAbstractItemModel>
#include <QSortFilterProxyModel>
#include <QStringList>
@ -64,7 +65,7 @@ class CORE_EXPORT QgsComposerModel: public QAbstractItemModel
* \param composition composition to attach to
* \param parent parent object
*/
explicit QgsComposerModel( QgsComposition *composition, QObject *parent = nullptr );
explicit QgsComposerModel( QgsComposition *composition, QObject *parent SIP_TRANSFERTHIS = 0 );
//reimplemented QAbstractItemModel methods
QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const override;
@ -307,7 +308,7 @@ class CORE_EXPORT QgsComposerProxyModel: public QSortFilterProxyModel
* \param composition composition to attach model to
* \param parent optional parent
*/
QgsComposerProxyModel( QgsComposition *composition, QObject *parent = nullptr );
QgsComposerProxyModel( QgsComposition *composition, QObject *parent SIP_TRANSFERTHIS = 0 );
/** Returns the current item type filter, or QgsComposerItem::ComposerItem if no
* item type filter is set.

5
src/core/composer/qgscomposermultiframe.h
View File

@ -17,6 +17,7 @@
#define QGSCOMPOSERMULTIFRAME_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposerobject.h"
#include <QObject>
#include <QSizeF>
@ -58,7 +59,7 @@ class CORE_EXPORT QgsComposerMultiFrame: public QgsComposerObject
* \param c parent composition
* \param createUndoCommands
*/
QgsComposerMultiFrame( QgsComposition *c, bool createUndoCommands );
QgsComposerMultiFrame( QgsComposition *c SIP_TRANSFERTHIS, bool createUndoCommands );
virtual ~QgsComposerMultiFrame();
@ -104,7 +105,7 @@ class CORE_EXPORT QgsComposerMultiFrame: public 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 SIP_TRANSFER, bool recalcFrameSizes = true ) = 0;
/** Finds the optimal position to break a frame at.
* \param yPos maximum vertical position for break

3
src/core/composer/qgscomposermultiframecommand.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERMULTIFRAMECOMMAND_H
#include <QUndoCommand>
#include "qgis.h"
#include <QDomDocument>
#include "qgis_core.h"
@ -31,7 +32,7 @@ class QgsComposerMultiFrame;
class CORE_EXPORT QgsComposerMultiFrameCommand: public QUndoCommand
{
public:
QgsComposerMultiFrameCommand( QgsComposerMultiFrame *multiFrame, const QString &text, QUndoCommand *parent = nullptr );
QgsComposerMultiFrameCommand( QgsComposerMultiFrame *multiFrame, const QString &text, QUndoCommand *parent SIP_TRANSFERTHIS = 0 );
void undo() override;
void redo() override;

3
src/core/composer/qgscomposerscalebar.h
View File

@ -17,6 +17,7 @@
#define QGSCOMPOSERSCALEBAR_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposeritem.h"
#include "scalebar/qgsscalebarsettings.h"
#include "scalebar/qgsscalebarrenderer.h"
@ -36,7 +37,7 @@ class CORE_EXPORT QgsComposerScaleBar: public QgsComposerItem
public:
QgsComposerScaleBar( QgsComposition *composition );
QgsComposerScaleBar( QgsComposition *composition SIP_TRANSFERTHIS );
~QgsComposerScaleBar();
//! Return correct graphics item type.

3
src/core/composer/qgscomposershape.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERSHAPE_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposeritem.h"
#include <QBrush>
#include <QPen>
@ -39,7 +40,7 @@ class CORE_EXPORT QgsComposerShape: public QgsComposerItem
Triangle
};
QgsComposerShape( QgsComposition *composition );
QgsComposerShape( QgsComposition *composition SIP_TRANSFERTHIS );
QgsComposerShape( qreal x, qreal y, qreal width, qreal height, QgsComposition *composition );
~QgsComposerShape();

5
src/core/composer/qgscomposertablev2.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERTABLEV2_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposermultiframe.h"
#include <QFont>
#include <QColor>
@ -145,7 +146,7 @@ class CORE_EXPORT QgsComposerTableV2: public QgsComposerMultiFrame
LastRow //!< Style last row only
};
QgsComposerTableV2( QgsComposition *composition, bool createUndoCommands );
QgsComposerTableV2( QgsComposition *composition SIP_TRANSFERTHIS, bool createUndoCommands );
QgsComposerTableV2();
virtual ~QgsComposerTableV2();
@ -420,7 +421,7 @@ class CORE_EXPORT QgsComposerTableV2: public QgsComposerMultiFrame
* is transferred to the table.
* \see columns
*/
void setColumns( const QgsComposerTableColumns &columns );
void setColumns( const QgsComposerTableColumns &columns SIP_TRANSFER );
/** Sets the cell style for a cell group.
* \param group group to set style for

3
src/core/composer/qgscomposertexttable.h
View File

@ -19,6 +19,7 @@
#define QGSCOMPOSERTEXTTABLE_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposertablev2.h"
/** \ingroup core
@ -31,7 +32,7 @@ class CORE_EXPORT QgsComposerTextTableV2 : public QgsComposerTableV2
Q_OBJECT
public:
QgsComposerTextTableV2( QgsComposition *c, bool createUndoCommands );
QgsComposerTextTableV2( QgsComposition *c SIP_TRANSFERTHIS, bool createUndoCommands );
/** Adds a row to the table
* \param row list of strings to use for each cell's value in the newly added row

5
src/core/composer/qgscomposition.h
View File

@ -17,6 +17,7 @@
#define QGSCOMPOSITION_H
#include "qgis_core.h"
#include "qgis.h"
#include <memory>
#include <QDomDocument>
@ -207,8 +208,8 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene, public QgsExpressionCo
* \see resizePageToContents()
* \see setResizeToContentsMargins()
*/
void resizeToContentsMargins( double &marginTop, double &marginRight,
double &marginBottom, double &marginLeft ) const;
void resizeToContentsMargins( double &marginTop SIP_OUT, double &marginRight SIP_OUT,
double &marginBottom SIP_OUT, double &marginLeft SIP_OUT ) const;
/** Returns the vertical space between pages in a composer view
* \returns space between pages in mm

5
src/core/composer/qgslayoutmanager.h
View File

@ -17,6 +17,7 @@
#define QGSLAYOUTMANAGER_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposition.h"
#include <QObject>
@ -46,7 +47,7 @@ class CORE_EXPORT QgsLayoutManager : public QObject
* Constructor for QgsLayoutManager. The project will become the parent object for this
* manager.
*/
explicit QgsLayoutManager( QgsProject *project = nullptr );
explicit QgsLayoutManager( QgsProject *project SIP_TRANSFERTHIS = 0 );
~QgsLayoutManager();
@ -57,7 +58,7 @@ class CORE_EXPORT QgsLayoutManager : public QObject
* \see removeComposition()
* \see compositionAdded()
*/
bool addComposition( QgsComposition *composition );
bool addComposition( QgsComposition *composition SIP_TRANSFER );
/**
* Removes a composition from the manager. The composition is deleted.

5
src/core/composer/qgspaperitem.h
View File

@ -19,6 +19,7 @@
#define QGSPAPERITEM_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscomposeritem.h"
#include <QGraphicsRectItem>
@ -44,8 +45,8 @@ class CORE_EXPORT QgsPaperItem : public QgsComposerItem
Q_OBJECT
public:
QgsPaperItem( QgsComposition *c );
QgsPaperItem( qreal x, qreal y, qreal width, qreal height, QgsComposition *composition );
QgsPaperItem( QgsComposition *c SIP_TRANSFERTHIS );
QgsPaperItem( qreal x, qreal y, qreal width, qreal height, QgsComposition *composition SIP_TRANSFERTHIS );
~QgsPaperItem();
//! Return correct graphics item type.

3
src/core/diagram/qgsdiagram.h
View File

@ -16,6 +16,7 @@
#define QGSDIAGRAM_H
#include "qgis_core.h"
#include "qgis.h"
#include <QPen>
#include <QBrush>
#include "qgsexpression.h" //for QMap with QgsExpression
@ -40,7 +41,7 @@ class CORE_EXPORT QgsDiagram
/** Returns an instance that is equivalent to this one
* \since QGIS 2.4 */
virtual QgsDiagram *clone() const = 0;
virtual QgsDiagram *clone() const = 0 SIP_FACTORY;
void clearCache();

15
src/core/dxf/qgsdxfexport.h
View File

@ -19,6 +19,7 @@
#define QGSDXFEXPORT_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgsgeometry.h"
#include "qgssymbol.h" // for OutputUnit enum
#include "qgsmapsettings.h"
@ -178,7 +179,7 @@ class CORE_EXPORT QgsDxfExport
* \param i integer value
* \note available in Python bindings as writeGroupInt
*/
void writeGroup( int code, int i );
void writeGroup( int code, int i ) SIP_PYNAME( writeGroupInt );
/**
* Write a group code with a floating point value
@ -186,7 +187,7 @@ class CORE_EXPORT QgsDxfExport
* \param d floating point value
* \note available in Python bindings as writeGroupDouble
*/
void writeGroup( int code, double d );
void writeGroup( int code, double d ) SIP_PYNAME( writeGroupDouble );
/**
* Write a group code with a string value
@ -202,7 +203,7 @@ class CORE_EXPORT QgsDxfExport
* \note available in Python bindings as writeGroupPointV2
* \since QGIS 2.15
*/
void writeGroup( int code, const QgsPointV2 &p );
void writeGroup( int code, const QgsPointV2 &p ) SIP_PYNAME( writeGroupPointV2 );
/**
* Write a group code with color value
@ -276,22 +277,22 @@ class CORE_EXPORT QgsDxfExport
//! Write point
//! \note available in Python bindings as writePointV2
//! \since QGIS 2.15
void writePoint( const QString &layer, const QColor &color, const QgsPointV2 &pt );
void writePoint( const QString &layer, const QColor &color, const QgsPointV2 &pt ) SIP_PYNAME( writePointV2 );
//! Write filled circle (as hatch)
//! \note available in Python bindings as writePointV2
//! \since QGIS 2.15
void writeFilledCircle( const QString &layer, const QColor &color, const QgsPointV2 &pt, double radius );
void writeFilledCircle( const QString &layer, const QColor &color, const QgsPointV2 &pt, double radius ) SIP_PYNAME( writeFillCircleV2 );
//! Write circle (as polyline)
//! \note available in Python bindings as writeCircleV2
//! \since QGIS 2.15
void writeCircle( const QString &layer, const QColor &color, const QgsPointV2 &pt, double radius, const QString &lineStyleName, double width );
void writeCircle( const QString &layer, const QColor &color, const QgsPointV2 &pt, double radius, const QString &lineStyleName, double width ) SIP_PYNAME( writeCircleV2 );
//! Write text (TEXT)
//! \note available in Python bindings as writeTextV2
//! \since QGIS 2.15
void writeText( const QString &layer, const QString &text, const QgsPointV2 &pt, double size, double angle, const QColor &color );
void writeText( const QString &layer, const QString &text, const QgsPointV2 &pt, double size, double angle, const QColor &color ) SIP_PYNAME( writeTextV2 );
//! Write mtext (MTEXT)
//! \note available in Python bindings as writeMTextV2

2
src/core/effects/qgsblureffect.h
View File

@ -46,7 +46,7 @@ class CORE_EXPORT QgsBlurEffect : public QgsPaintEffect
* \param map encoded properties string map
* \returns new QgsBlurEffect
*/
static QgsPaintEffect *create( const QgsStringMap &map );
static QgsPaintEffect *create( const QgsStringMap &map ) SIP_FACTORY;
QgsBlurEffect();

2
src/core/effects/qgscoloreffect.h
View File

@ -40,7 +40,7 @@ class CORE_EXPORT QgsColorEffect : public QgsPaintEffect
* \param map encoded properties string map
* \returns new QgsColorEffect
*/
static QgsPaintEffect *create( const QgsStringMap &map );
static QgsPaintEffect *create( const QgsStringMap &map ) SIP_FACTORY;
QgsColorEffect();

3
src/core/effects/qgseffectstack.h
View File

@ -18,6 +18,7 @@
#define QGSEFFECTSTACK_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgspainteffect.h"
/** \ingroup core
@ -49,7 +50,7 @@ class CORE_EXPORT QgsEffectStack : public QgsPaintEffect
* \param map unused encoded properties string map
* \returns new QgsEffectStack
*/
static QgsPaintEffect *create( const QgsStringMap &map );
static QgsPaintEffect *create( const QgsStringMap &map ) SIP_FACTORY;
QgsEffectStack();
QgsEffectStack( const QgsEffectStack &other );

7
src/core/effects/qgsgloweffect.h
View File

@ -18,6 +18,7 @@
#define QGSGLOWEFFECT_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgspainteffect.h"
#include "qgssymbol.h"
#include "qgscolorramp.h"
@ -153,7 +154,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect
* \see ramp
* \see setColorType
*/
void setRamp( QgsColorRamp *ramp );
void setRamp( QgsColorRamp *ramp SIP_TRANSFER );
/** Returns the color ramp used for the glow. This only applies if the colorType()
* is set to ColorRamp. The glow will utilize colors from the ramp.
@ -239,7 +240,7 @@ class CORE_EXPORT QgsOuterGlowEffect : public QgsGlowEffect
* \param map encoded properties string map
* \returns new QgsOuterGlowEffect
*/
static QgsPaintEffect *create( const QgsStringMap &map );
static QgsPaintEffect *create( const QgsStringMap &map ) SIP_FACTORY;
QgsOuterGlowEffect();
@ -269,7 +270,7 @@ class CORE_EXPORT QgsInnerGlowEffect : public QgsGlowEffect
* \param map encoded properties string map
* \returns new QgsInnerGlowEffect
*/
static QgsPaintEffect *create( const QgsStringMap &map );
static QgsPaintEffect *create( const QgsStringMap &map ) SIP_FACTORY;
QgsInnerGlowEffect();

3
src/core/effects/qgsimageoperation.h
View File

@ -19,6 +19,7 @@
#define QGSIMAGEOPERATION_H
#include <QImage>
#include "qgis.h"
#include <QColor>
#include <QtCore/qmath.h>
@ -159,7 +160,7 @@ class CORE_EXPORT QgsImageOperation
* \returns blurred image
* \note for fastest operation, ensure the source image is ARGB32_Premultiplied
*/
static QImage *gaussianBlur( QImage &image, const int radius );
static QImage *gaussianBlur( QImage &image, const int radius ) SIP_FACTORY;
/** Flips an image horizontally or vertically
* \param image QImage to flip

4
src/core/effects/qgspainteffect.h
View File

@ -76,7 +76,7 @@ class CORE_EXPORT QgsPaintEffect
/** Duplicates an effect by creating a deep copy of the effect
* \returns clone of paint effect
*/
virtual QgsPaintEffect *clone() const = 0;
virtual QgsPaintEffect *clone() const = 0 SIP_FACTORY;
/** Returns the properties describing the paint effect encoded in a
* string format.
@ -264,7 +264,7 @@ class CORE_EXPORT QgsDrawSourceEffect : public QgsPaintEffect
* \param map encoded properties string map
* \returns new QgsDrawSourceEffect
*/
static QgsPaintEffect *create( const QgsStringMap &map );
static QgsPaintEffect *create( const QgsStringMap &map ) SIP_FACTORY;
virtual QString type() const override { return QStringLiteral( "drawSource" ); }
virtual QgsDrawSourceEffect *clone() const override;

10
src/core/effects/qgspainteffectregistry.h
View File

@ -62,7 +62,7 @@ class CORE_EXPORT QgsPaintEffectAbstractMetadata
* \param map properties string map
* \returns new paint effect
*/
virtual QgsPaintEffect *createPaintEffect( const QgsStringMap &map ) = 0;
virtual QgsPaintEffect *createPaintEffect( const QgsStringMap &map ) = 0 SIP_FACTORY;
/** Create configuration widget for paint effect of this class. Can return nullptr
* if there's no GUI for the paint effect class.
@ -177,7 +177,7 @@ class CORE_EXPORT QgsPaintEffectRegistry
* \param metadata effect metadata. Ownership is transferred to the registry.
* \returns true if add was successful.
*/
bool addEffectType( QgsPaintEffectAbstractMetadata *metadata );
bool addEffectType( QgsPaintEffectAbstractMetadata *metadata SIP_TRANSFER );
/** Creates a new paint effect given the effect name and properties map.
* \param name unique name representing paint effect class
@ -185,7 +185,7 @@ class CORE_EXPORT QgsPaintEffectRegistry
* \returns new paint effect of specified class, or nullptr if matching
* paint effect could not be created
*/
QgsPaintEffect *createEffect( const QString &name, const QgsStringMap &properties = QgsStringMap() ) const;
QgsPaintEffect *createEffect( const QString &name, const QgsStringMap &properties = QgsStringMap() ) const SIP_FACTORY;
/** Creates a new paint effect given a DOM element storing paint effect
* properties.
@ -193,7 +193,7 @@ class CORE_EXPORT QgsPaintEffectRegistry
* \returns new paint effect, or nullptr if matching
* paint effect could not be created
*/
QgsPaintEffect *createEffect( const QDomElement &element ) const;
QgsPaintEffect *createEffect( const QDomElement &element ) const SIP_FACTORY;
/** Returns a list of known paint effects.
* \returns list of paint effect names
@ -206,7 +206,7 @@ class CORE_EXPORT QgsPaintEffectRegistry
* \returns default effects stack
* \see isDefaultStack()
*/
static QgsPaintEffect *defaultStack();
static QgsPaintEffect *defaultStack() SIP_FACTORY;
/** Tests whether a paint effect matches the default effects stack.
* \param effect paint effect to test

4
src/core/effects/qgsshadoweffect.h
View File

@ -195,7 +195,7 @@ class CORE_EXPORT QgsDropShadowEffect : public QgsShadowEffect
* \param map encoded properties string map
* \returns new QgsDropShadowEffect
*/
static QgsPaintEffect *create( const QgsStringMap &map );
static QgsPaintEffect *create( const QgsStringMap &map ) SIP_FACTORY;
QgsDropShadowEffect();
@ -224,7 +224,7 @@ class CORE_EXPORT QgsInnerShadowEffect : public QgsShadowEffect
* \param map encoded properties string map
* \returns new QgsInnerShadowEffect
*/
static QgsPaintEffect *create( const QgsStringMap &map );
static QgsPaintEffect *create( const QgsStringMap &map ) SIP_FACTORY;
QgsInnerShadowEffect();

2
src/core/effects/qgstransformeffect.h
View File

@ -41,7 +41,7 @@ class CORE_EXPORT QgsTransformEffect : public QgsPaintEffect
* \param map encoded properties string map
* \returns new QgsTransformEffect
*/
static QgsPaintEffect *create( const QgsStringMap &map );
static QgsPaintEffect *create( const QgsStringMap &map ) SIP_FACTORY;
QgsTransformEffect();

5
src/core/gps/qgsgpsconnection.h
View File

@ -19,6 +19,7 @@
#define QGSGPSCONNECTION_H
#include <QDateTime>
#include "qgis.h"
#include <QObject>
#include <QString>
@ -76,7 +77,7 @@ class CORE_EXPORT QgsGPSConnection : public 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 SIP_TRANSFER );
virtual ~QgsGPSConnection();
//! Opens connection to device
bool connect();
@ -84,7 +85,7 @@ class CORE_EXPORT QgsGPSConnection : public QObject
bool close();
//! Sets the GPS source. The class takes ownership of the device class
void setSource( QIODevice *source );
void setSource( QIODevice *source SIP_TRANSFER );
//! Returns the status. Possible state are not connected, connected, data received
Status status() const { return mStatus; }

3
src/core/qgsdataitemprovider.h
View File

@ -17,6 +17,7 @@
#define QGSDATAITEMPROVIDER_H
#include "qgis_core.h"
#include "qgis.h"
class QgsDataItem;
@ -47,7 +48,7 @@ class CORE_EXPORT QgsDataItemProvider
//! Create a new instance of QgsDataItem (or null) for given path and parent item.
//! Caller takes responsibility of deleting created items.
virtual QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) = 0;
virtual QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) = 0 SIP_FACTORY;
};

3
src/core/qgsdataitemproviderregistry.h
View File

@ -17,6 +17,7 @@
#define QGSDATAITEMPROVIDERREGISTRY_H
#include <QList>
#include "qgis.h"
#include "qgis_core.h"
@ -48,7 +49,7 @@ class CORE_EXPORT QgsDataItemProviderRegistry
QList<QgsDataItemProvider *> providers() const { return mProviders; }
//! Add a provider implementation. Takes ownership of the object.
void addProvider( QgsDataItemProvider *provider );
void addProvider( QgsDataItemProvider *provider SIP_TRANSFER );
//! Remove provider implementation from the list (provider object is deleted)
void removeProvider( QgsDataItemProvider *provider );

3
src/core/qgsdbfilterproxymodel.h
View File

@ -19,6 +19,7 @@
#define QGSDBFILTERPROXYMODEL_H
#include <QSortFilterProxyModel>
#include "qgis.h"
#include "qgis_core.h"
@ -38,7 +39,7 @@ class CORE_EXPORT QgsDatabaseFilterProxyModel: public QSortFilterProxyModel
/**
* Constructor for QgsDatabaseFilterProxyModel.
*/
QgsDatabaseFilterProxyModel( QObject *parent = nullptr );
QgsDatabaseFilterProxyModel( QObject *parent SIP_TRANSFERTHIS = 0 );
//! Calls QSortFilterProxyModel::setFilterWildcard and triggers update
void _setFilterWildcard( const QString &pattern );

11
src/core/qgsdiagramrenderer.h
View File

@ -16,6 +16,7 @@
#define QGSDIAGRAMRENDERERV2_H
#include "qgis_core.h"
#include "qgis.h"
#include <QColor>
#include <QFont>
#include <QList>
@ -218,7 +219,7 @@ class CORE_EXPORT QgsDiagramLayerSettings
* \see renderer()
* \since QGIS 2.16
*/
void setRenderer( QgsDiagramRenderer *diagramRenderer );
void setRenderer( QgsDiagramRenderer *diagramRenderer SIP_TRANSFER );
/** Returns the coordinate transform associated with the layer, or an
* invalid transform if no transformation is required.
@ -428,7 +429,7 @@ class CORE_EXPORT QgsDiagramSettings
* \note caller is responsible for deletion of QgsLayerTreeModelLegendNodes
* \since QGIS 2.10
*/
QList< QgsLayerTreeModelLegendNode * > legendItems( QgsLayerTreeLayer *nodeLayer ) const;
QList< QgsLayerTreeModelLegendNode * > legendItems( QgsLayerTreeLayer *nodeLayer ) const SIP_FACTORY;
};
@ -466,7 +467,7 @@ class CORE_EXPORT QgsDiagramRenderer
/** Returns new instance that is equivalent to this one
* \since QGIS 2.4 */
virtual QgsDiagramRenderer *clone() const = 0;
virtual QgsDiagramRenderer *clone() const = 0 SIP_FACTORY;
//! Returns size of the diagram for a feature in map units. Returns an invalid QSizeF in case of error
virtual QSizeF sizeMapUnits( const QgsFeature &feature, const QgsRenderContext &c ) const;
@ -487,7 +488,7 @@ class CORE_EXPORT QgsDiagramRenderer
*/
void renderDiagram( const QgsFeature &feature, QgsRenderContext &c, QPointF pos, const QgsPropertyCollection &properties = QgsPropertyCollection() ) const;
void setDiagram( QgsDiagram *d );
void setDiagram( QgsDiagram *d SIP_TRANSFER );
QgsDiagram *diagram() const { return mDiagram; }
//! Returns list with all diagram settings in the renderer
@ -511,7 +512,7 @@ class CORE_EXPORT QgsDiagramRenderer
* \note caller is responsible for deletion of QgsLayerTreeModelLegendNodes
* \since QGIS 2.10
*/
virtual QList< QgsLayerTreeModelLegendNode * > legendItems( QgsLayerTreeLayer *nodeLayer ) const;
virtual QList< QgsLayerTreeModelLegendNode * > legendItems( QgsLayerTreeLayer *nodeLayer ) const SIP_FACTORY;
/** Returns true if renderer will show legend items for diagram attributes.
* \since QGIS 2.16

3
src/core/qgseditformconfig.h
View File

@ -19,6 +19,7 @@
#define QGSEDITFORMCONFIG_H
#include "qgis_core.h"
#include "qgis.h"
#include <QMap>
#include <QDomElement>
#include <QDomDocument>
@ -105,7 +106,7 @@ class CORE_EXPORT QgsEditFormConfig
*
* This is only useful in combination with EditorLayout::TabLayout.
*/
void addTab( QgsAttributeEditorElement *data );
void addTab( QgsAttributeEditorElement *data SIP_TRANSFER );
/**
* Returns a list of tabs for EditorLayout::TabLayout obtained from the invisible root container.

23
src/core/qgsexpressioncontext.h
View File

@ -16,6 +16,7 @@
#define QGSEXPRESSIONCONTEXT_H
#include "qgis_core.h"
#include "qgis.h"
#include <QVariant>
#include <QHash>
#include <QString>
@ -87,7 +88,7 @@ class CORE_EXPORT QgsScopedExpressionFunction : public QgsExpression::Function
/** Returns a clone of the function.
*/
virtual QgsScopedExpressionFunction *clone() const = 0;
virtual QgsScopedExpressionFunction *clone() const = 0 SIP_FACTORY;
virtual bool usesGeometry( const QgsExpression::NodeFunction *node ) const override;
@ -249,7 +250,7 @@ class CORE_EXPORT QgsExpressionContextScope
* \param function function to insert. Ownership is transferred to the scope.
* \see addVariable()
*/
void addFunction( const QString &name, QgsScopedExpressionFunction *function );
void addFunction( const QString &name, QgsScopedExpressionFunction *function SIP_TRANSFER );
/**
* Returns true if the scope has a feature associated with it.
@ -473,7 +474,7 @@ class CORE_EXPORT QgsExpressionContext
* context. Ownership of the scope is transferred to the stack.
* \param scope expression context to append to context
*/
void appendScope( QgsExpressionContextScope *scope );
void appendScope( QgsExpressionContextScope *scope SIP_TRANSFER );
/** Appends a list of scopes to the end of the context. This scopes will override
* any matching variables or functions provided by existing scopes within the
@ -492,7 +493,7 @@ class CORE_EXPORT QgsExpressionContext
* any matching variables or functions provided by existing scopes within the
* context. Ownership of the scope is transferred to the stack.
*/
QgsExpressionContext &operator<< ( QgsExpressionContextScope *scope );
QgsExpressionContext &operator<< ( QgsExpressionContextScope *scope SIP_TRANSFER );
/** Convenience function for setting a feature for the context. The feature
* will be set within the last scope of the context, so will override any
@ -620,7 +621,7 @@ class CORE_EXPORT QgsExpressionContextUtils
* For instance, QGIS version numbers and variables specified through QGIS options.
* \see setGlobalVariable()
*/
static QgsExpressionContextScope *globalScope();
static QgsExpressionContextScope *globalScope() SIP_FACTORY;
/** Sets a global context variable. This variable will be contained within scopes retrieved via
* globalScope().
@ -644,7 +645,7 @@ class CORE_EXPORT QgsExpressionContextUtils
* \param project What project to use
* \see setProjectVariable()
*/
static QgsExpressionContextScope *projectScope( const QgsProject *project );
static QgsExpressionContextScope *projectScope( const QgsProject *project ) SIP_FACTORY;
/** Sets a project context variable. This variable will be contained within scopes retrieved via
* projectScope().
@ -668,7 +669,7 @@ class CORE_EXPORT QgsExpressionContextUtils
/** Creates a new scope which contains variables and functions relating to a QgsMapLayer.
* For instance, layer name, id and fields.
*/
static QgsExpressionContextScope *layerScope( const QgsMapLayer *layer );
static QgsExpressionContextScope *layerScope( const QgsMapLayer *layer ) SIP_FACTORY;
/** Creates a list of three scopes: global, layer's project and layer.
* \since QGIS 3.0
@ -697,7 +698,7 @@ class CORE_EXPORT QgsExpressionContextUtils
/** Creates a new scope which contains variables and functions relating to a QgsMapSettings object.
* For instance, map scale and rotation.
*/
static QgsExpressionContextScope *mapSettingsScope( const QgsMapSettings &mapSettings );
static QgsExpressionContextScope *mapSettingsScope( const QgsMapSettings &mapSettings ) SIP_FACTORY;
/**
* Updates a symbol scope related to a QgsSymbol to an expression context.
@ -711,7 +712,7 @@ class CORE_EXPORT QgsExpressionContextUtils
* For instance, number of pages and page sizes.
* \param composition source composition
*/
static QgsExpressionContextScope *compositionScope( const QgsComposition *composition );
static QgsExpressionContextScope *compositionScope( const QgsComposition *composition ) SIP_FACTORY;
/** Sets a composition context variable. This variable will be contained within scopes retrieved via
* compositionScope().
@ -736,13 +737,13 @@ class CORE_EXPORT QgsExpressionContextUtils
* For instance, current page name and number.
* \param atlas source atlas. If null, a set of default atlas variables will be added to the scope.
*/
static QgsExpressionContextScope *atlasScope( const QgsAtlasComposition *atlas );
static QgsExpressionContextScope *atlasScope( const QgsAtlasComposition *atlas ) SIP_FACTORY;
/** Creates a new scope which contains variables and functions relating to a QgsComposerItem.
* For instance, item size and position.
* \param composerItem source composer item
*/
static QgsExpressionContextScope *composerItemScope( const QgsComposerItem *composerItem );
static QgsExpressionContextScope *composerItemScope( const QgsComposerItem *composerItem ) SIP_FACTORY;
/** Sets a composer item context variable. This variable will be contained within scopes retrieved via
* composerItemScope().

3
src/core/qgsfeaturefilterprovider.h
View File

@ -19,6 +19,7 @@
#define QGSFEATUREFILTERPROVIDER_H
#include <QtGlobal>
#include "qgis.h"
#include "qgis_core.h"
@ -54,7 +55,7 @@ class CORE_EXPORT QgsFeatureFilterProvider
/** Create a clone of the feature filter provider
* \returns a new clone
*/
virtual QgsFeatureFilterProvider *clone() const = 0;
virtual QgsFeatureFilterProvider *clone() const = 0 SIP_FACTORY;
};
#endif

3
src/core/qgsgeometryvalidator.h
View File

@ -17,6 +17,7 @@ email : jef at norbit dot de
#define QGSGEOMETRYVALIDATOR_H
#include "qgis_core.h"
#include "qgis.h"
#include <QThread>
#include "qgsgeometry.h"
@ -36,7 +37,7 @@ class CORE_EXPORT QgsGeometryValidator : public QThread
void stop();
//! Validate geometry and produce a list of geometry errors
static void validateGeometry( const QgsGeometry *g, QList<QgsGeometry::Error> &errors );
static void validateGeometry( const QgsGeometry *g, QList<QgsGeometry::Error> &errors SIP_OUT );
signals:
void errorFound( const QgsGeometry::Error & );

2
src/core/qgsgml.h
View File

@ -356,7 +356,7 @@ class CORE_EXPORT QgsGml : public QObject
QgsRectangle *extent = nullptr,
const QString &userName = QString(),
const QString &password = QString(),
const QString &authcfg = QString() );
const QString &authcfg = QString() ) SIP_PYNAME( getFeaturesUri );
/** Read from GML data. Constructor uri param is ignored
* Supports only UTF-8, UTF-16, ISO-8859-1, ISO-8859-1 XML encodings.

3
src/core/qgslayerdefinition.h
View File

@ -17,6 +17,7 @@
#include "qgis_core.h"
#include "qgis.h"
#include <QString>
#include <QVector>
@ -41,7 +42,7 @@ class CORE_EXPORT QgsLayerDefinition
{
public:
//! Loads the QLR at path into QGIS. New layers are added to given project into layer tree specified by rootGroup
static bool loadLayerDefinition( const QString &path, QgsProject *project, QgsLayerTreeGroup *rootGroup, QString &errorMessage );
static bool loadLayerDefinition( const QString &path, QgsProject *project, QgsLayerTreeGroup *rootGroup, QString &errorMessage SIP_OUT );
//! Loads the QLR from the XML document. New layers are added to given project into layer tree specified by rootGroup
static bool loadLayerDefinition( QDomDocument doc, QgsProject *project, QgsLayerTreeGroup *rootGroup, QString &errorMessage, const QgsPathResolver &pathResolver );
//! Export the selected layer tree nodes to a QLR file

9
src/core/qgsmaplayerlegend.h
View File

@ -17,6 +17,7 @@
#define QGSMAPLAYERLEGEND_H
#include <QObject>
#include "qgis.h"
class QgsLayerTreeLayer;
class QgsLayerTreeModelLegendNode;
@ -37,7 +38,7 @@ class CORE_EXPORT QgsMapLayerLegend : public QObject
{
Q_OBJECT
public:
explicit QgsMapLayerLegend( QObject *parent = nullptr );
explicit QgsMapLayerLegend( QObject *parent SIP_TRANSFERTHIS = 0 );
// TODO: type, load/save settings
@ -50,13 +51,13 @@ class CORE_EXPORT QgsMapLayerLegend : public QObject
// TODO: support for layer tree view delegates
//! Create new legend implementation for vector layer
static QgsMapLayerLegend *defaultVectorLegend( QgsVectorLayer *vl );
static QgsMapLayerLegend *defaultVectorLegend( QgsVectorLayer *vl ) SIP_FACTORY;
//! Create new legend implementation for raster layer
static QgsMapLayerLegend *defaultRasterLegend( QgsRasterLayer *rl );
static QgsMapLayerLegend *defaultRasterLegend( QgsRasterLayer *rl ) SIP_FACTORY;
//! Create new legend implementation for raster layer
static QgsMapLayerLegend *defaultPluginLegend( QgsPluginLayer *pl );
static QgsMapLayerLegend *defaultPluginLegend( QgsPluginLayer *pl ) SIP_FACTORY;
signals:
//! Emitted when existing items/nodes got invalid and should be replaced by new ones

3
src/core/qgsmaprendererjob.h
View File

@ -17,6 +17,7 @@
#define QGSMAPRENDERERJOB_H
#include "qgis_core.h"
#include "qgis.h"
#include <QtConcurrentRun>
#include <QFutureWatcher>
#include <QImage>
@ -149,7 +150,7 @@ class CORE_EXPORT QgsMapRendererJob : public QObject
* This should not be used if cached labeling was redrawn - see usedCachedLabels().
* \see usedCachedLabels()
*/
virtual QgsLabelingResults *takeLabelingResults() = 0;
virtual QgsLabelingResults *takeLabelingResults() = 0 SIP_TRANSFER;
//! \since QGIS 3.0
//! Set the feature filter provider used by the QgsRenderContext of

5
src/core/qgsnetworkaccessmanager.h
View File

@ -19,6 +19,7 @@
#define QGSNETWORKACCESSMANAGER_H
#include <QList>
#include "qgis.h"
#include <QStringList>
#include <QNetworkAccessManager>
#include <QNetworkProxy>
@ -55,10 +56,10 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
QgsNetworkAccessManager( QObject *parent = nullptr );
//! insert a factory into the proxy factories list
void insertProxyFactory( QNetworkProxyFactory *factory );
void insertProxyFactory( QNetworkProxyFactory *factory SIP_TRANSFER );
//! remove a factory from the proxy factories list
void removeProxyFactory( QNetworkProxyFactory *factory );
void removeProxyFactory( QNetworkProxyFactory *factory SIP_TRANSFERBACK );
//! retrieve proxy factory list
const QList<QNetworkProxyFactory *> proxyFactories() const;

3
src/core/qgsogcutils.h
View File

@ -22,6 +22,7 @@ class QDomDocument;
class QString;
#include "qgis_core.h"
#include "qgis.h"
#include <list>
#include <QVector>
@ -126,7 +127,7 @@ class CORE_EXPORT QgsOgcUtils
static QColor colorFromOgcFill( const QDomElement &fillElement );
//! Parse XML with OGC filter into QGIS expression
static QgsExpression *expressionFromOgcFilter( const QDomElement &element );
static QgsExpression *expressionFromOgcFilter( const QDomElement &element ) SIP_FACTORY;
/** Creates OGC filter XML element. Supports minimum standard filter
* according to the OGC filter specs (=,!=,<,>,<=,>=,AND,OR,NOT)

3
src/core/qgspallabeling.h
View File

@ -22,6 +22,7 @@
#define QGSPALLABELING_H
#include "qgis_core.h"
#include "qgis.h"
#include <QString>
#include <QFont>
#include <QFontDatabase>
@ -721,7 +722,7 @@ class CORE_EXPORT QgsPalLabeling
* \returns prepared geometry
* \since QGIS 2.9
*/
static QgsGeometry prepareGeometry( const QgsGeometry &geometry, QgsRenderContext &context, const QgsCoordinateTransform &ct, QgsGeometry *clipGeometry = nullptr );
static QgsGeometry prepareGeometry( const QgsGeometry &geometry, QgsRenderContext &context, const QgsCoordinateTransform &ct, QgsGeometry *clipGeometry = nullptr ) SIP_FACTORY;
/** Checks whether a geometry requires preparation before registration with PAL
* \param geometry geometry to prepare

9
src/core/qgspluginlayerregistry.h
View File

@ -20,6 +20,7 @@
#define QGSPLUGINLAYERREGSITRY_H
#include <QMap>
#include "qgis.h"
#include <QDomNode>
#include "qgis_core.h"
@ -39,12 +40,12 @@ class CORE_EXPORT QgsPluginLayerType
QString name();
//! Return new layer of this type. Return NULL on error
virtual QgsPluginLayer *createLayer();
virtual QgsPluginLayer *createLayer() SIP_FACTORY;
/** Return new layer of this type, using layer URI (specific to this plugin layer type). Return NULL on error.
* \since QGIS 2.10
*/
virtual QgsPluginLayer *createLayer( const QString &uri );
virtual QgsPluginLayer *createLayer( const QString &uri ) SIP_FACTORY;
//! Show plugin layer properties dialog. Return false if the dialog cannot be shown.
virtual bool showLayerProperties( QgsPluginLayer *layer );
@ -78,7 +79,7 @@ class CORE_EXPORT QgsPluginLayerRegistry
QStringList pluginLayerTypes();
//! Add plugin layer type (take ownership) and return true on success
bool addPluginLayerType( QgsPluginLayerType *pluginLayerType );
bool addPluginLayerType( QgsPluginLayerType *pluginLayerType SIP_TRANSFER );
//! Remove plugin layer type and return true on success
bool removePluginLayerType( const QString &typeName );
@ -89,7 +90,7 @@ class CORE_EXPORT QgsPluginLayerRegistry
/** Returns new layer if corresponding plugin has been found else returns a nullptr.
* \note parameter uri has been added in QGIS 2.10
*/
QgsPluginLayer *createLayer( const QString &typeName, const QString &uri = QString() );
QgsPluginLayer *createLayer( const QString &typeName, const QString &uri = QString() ) SIP_FACTORY;
private:

11
src/core/qgsproject.h
View File

@ -22,6 +22,7 @@
#define QGSPROJECT_H
#include "qgis_core.h"
#include "qgis.h"
#include <memory>
#include <QHash>
#include <QList>
@ -94,7 +95,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
*
* Most of the time you want to use QgsProject::instance() instead as many components of QGIS work with the singleton.
*/
explicit QgsProject( QObject *parent = nullptr );
explicit QgsProject( QObject *parent SIP_TRANSFERTHIS = 0 );
~QgsProject();
@ -219,7 +220,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
* \note The key string must be valid xml tag names in order to be saved to the file.
* \note available in Python bindings as writeEntryBool
*/
bool writeEntry( const QString &scope, const QString &key, bool value );
bool writeEntry( const QString &scope, const QString &key, bool value ) SIP_PYNAME( writeEntryBool );
/**
* Write a double entry to the project file.
@ -230,7 +231,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
* \note The key string must be valid xml tag names in order to be saved to the file.
* \note available in Python bindings as writeEntryDouble
*/
bool writeEntry( const QString &scope, const QString &key, double value );
bool writeEntry( const QString &scope, const QString &key, double value ) SIP_PYNAME( writeEntryDouble );
/**
* Write an integer entry to the project file.
@ -321,7 +322,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
/** Change handler for missing layers.
* Deletes old handler and takes ownership of the new one.
*/
void setBadLayerHandler( QgsProjectBadLayerHandler *handler );
void setBadLayerHandler( QgsProjectBadLayerHandler *handler SIP_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;
@ -706,7 +707,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
* \see removeMapLayer()
* \since QGIS 3.0
*/
QgsMapLayer *takeMapLayer( QgsMapLayer *layer );
QgsMapLayer *takeMapLayer( QgsMapLayer *layer ) SIP_TRANSFERBACK;
/**
* Removes all registered layers. If the registry has ownership

15
src/core/qgsproperty.h
View File

@ -16,6 +16,7 @@
#define QGSPROPERTY_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgsproperty_p.h"
#include "qgsexpression.h"
#include "qgsexpressioncontext.h"
@ -323,7 +324,7 @@ class CORE_EXPORT QgsProperty
* \see valueAsInt()
* \see valueAsBool()
*/
QVariant value( const QgsExpressionContext &context, const QVariant &defaultValue = QVariant(), bool *ok = nullptr ) const;
QVariant value( const QgsExpressionContext &context, const QVariant &defaultValue = QVariant(), bool *ok SIP_OUT = 0 ) const;
/**
* Calculates the current value of the property and interprets it as a string.
@ -337,7 +338,7 @@ class CORE_EXPORT QgsProperty
* \see valueAsInt()
* \see valueAsBool()
*/
QString valueAsString( const QgsExpressionContext &context, const QString &defaultString = QString(), bool *ok = nullptr ) const;
QString valueAsString( const QgsExpressionContext &context, const QString &defaultString = QString(), bool *ok SIP_OUT = 0 ) const;
/**
* Calculates the current value of the property and interprets it as a color.
@ -351,7 +352,7 @@ class CORE_EXPORT QgsProperty
* \see valueAsInt()
* \see valueAsBool()
*/
QColor valueAsColor( const QgsExpressionContext &context, const QColor &defaultColor = QColor(), bool *ok = nullptr ) const;
QColor valueAsColor( const QgsExpressionContext &context, const QColor &defaultColor = QColor(), bool *ok SIP_OUT = 0 ) const;
/**
* Calculates the current value of the property and interprets it as a double.
@ -365,7 +366,7 @@ class CORE_EXPORT QgsProperty
* \see valueAsInt()
* \see valueAsBool()
*/
double valueAsDouble( const QgsExpressionContext &context, double defaultValue = 0.0, bool *ok = nullptr ) const;
double valueAsDouble( const QgsExpressionContext &context, double defaultValue = 0.0, bool *ok SIP_OUT = 0 ) const;
/**
* Calculates the current value of the property and interprets it as an integer.
@ -379,7 +380,7 @@ class CORE_EXPORT QgsProperty
* \see valueAsDouble()
* \see valueAsBool()
*/
int valueAsInt( const QgsExpressionContext &context, int defaultValue = 0, bool *ok = nullptr ) const;
int valueAsInt( const QgsExpressionContext &context, int defaultValue = 0, bool *ok SIP_OUT = 0 ) const;
/**
* Calculates the current value of the property and interprets it as an boolean.
@ -393,7 +394,7 @@ class CORE_EXPORT QgsProperty
* \see valueAsDouble()
* \see valueAsInt()
*/
bool valueAsBool( const QgsExpressionContext &context, bool defaultValue = false, bool *ok = nullptr ) const;
bool valueAsBool( const QgsExpressionContext &context, bool defaultValue = false, bool *ok SIP_OUT = 0 ) const;
/**
* Saves this property to a QVariantMap, wrapped in a QVariant.
@ -417,7 +418,7 @@ class CORE_EXPORT QgsProperty
* existing transformer will be deleted. Set to null to remove an existing transformer.
* \see transformer()
*/
void setTransformer( QgsPropertyTransformer *transformer );
void setTransformer( QgsPropertyTransformer *transformer SIP_TRANSFER );
/**
* Returns the existing transformer used for manipulating the calculated values for the property, if set.

13
src/core/qgspropertycollection.h
View File

@ -16,6 +16,7 @@
#define QGSPROPERTYCOLLECTION_H
#include "qgis_core.h"
#include "qgis.h"
#include <QString>
#include <QVariant>
#include <QColor>
@ -116,7 +117,7 @@ class CORE_EXPORT QgsAbstractPropertyCollection
* \see valueAsInt()
* \see valueAsBool()
*/
QString valueAsString( int key, const QgsExpressionContext &context, const QString &defaultString = QString(), bool *ok = nullptr ) const;
QString valueAsString( int key, const QgsExpressionContext &context, const QString &defaultString = QString(), bool *ok SIP_OUT = 0 ) const;
/**
* Calculates the current value of the property with the specified key and interprets it as a color.
@ -132,7 +133,7 @@ class CORE_EXPORT QgsAbstractPropertyCollection
* \see valueAsInt()
* \see valueAsBool()
*/
QColor valueAsColor( int key, const QgsExpressionContext &context, const QColor &defaultColor = QColor(), bool *ok = nullptr ) const;
QColor valueAsColor( int key, const QgsExpressionContext &context, const QColor &defaultColor = QColor(), bool *ok SIP_OUT = 0 ) const;
/**
* Calculates the current value of the property with the specified key and interprets it as a double.
@ -148,7 +149,7 @@ class CORE_EXPORT QgsAbstractPropertyCollection
* \see valueAsInt()
* \see valueAsBool()
*/
double valueAsDouble( int key, const QgsExpressionContext &context, double defaultValue = 0.0, bool *ok = nullptr ) const;
double valueAsDouble( int key, const QgsExpressionContext &context, double defaultValue = 0.0, bool *ok SIP_OUT = 0 ) const;
/**
* Calculates the current value of the property with the specified key and interprets it as an integer.
@ -164,7 +165,7 @@ class CORE_EXPORT QgsAbstractPropertyCollection
* \see valueAsDouble()
* \see valueAsBool()
*/
int valueAsInt( int key, const QgsExpressionContext &context, int defaultValue = 0, bool *ok = nullptr ) const;
int valueAsInt( int key, const QgsExpressionContext &context, int defaultValue = 0, bool *ok SIP_OUT = 0 ) const;
/**
* Calculates the current value of the property with the specified key and interprets it as an boolean.
@ -180,7 +181,7 @@ class CORE_EXPORT QgsAbstractPropertyCollection
* \see valueAsDouble()
* \see valueAsInt()
*/
bool valueAsBool( int key, const QgsExpressionContext &context, bool defaultValue = false, bool *ok = nullptr ) const;
bool valueAsBool( int key, const QgsExpressionContext &context, bool defaultValue = false, bool *ok SIP_OUT = 0 ) const;
/**
* Prepares the collection against a specified expression context. Calling prepare before evaluating the
@ -379,7 +380,7 @@ class CORE_EXPORT QgsPropertyCollectionStack : public QgsAbstractPropertyCollect
* from the newly added collection will take priority over any existing properties with the same name.
* \param collection collection to append. Ownership is transferred to the stack.
*/
void appendCollection( QgsPropertyCollection *collection );
void appendCollection( QgsPropertyCollection *collection SIP_TRANSFER );
/**
* Returns the collection at the corresponding index from the stack.

5
src/core/qgspythonrunner.h
View File

@ -16,6 +16,7 @@
#define QGSPYTHONRUNNER_H
#include <QString>
#include "qgis.h"
#include "qgis_core.h"
@ -40,12 +41,12 @@ class CORE_EXPORT QgsPythonRunner
static bool run( const QString &command, const QString &messageOnError = QString() );
//! Eval a Python statement
static bool eval( const QString &command, QString &result );
static bool eval( const QString &command, QString &result SIP_OUT );
/** 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 SIP_TRANSFER );
protected:
//! Protected constructor: can be instantiated only from children

3
src/core/qgssnappingutils.h
View File

@ -18,6 +18,7 @@
#include "qgis_core.h"
#include "qgis.h"
#include "qgsmapsettings.h"
#include "qgstolerance.h"
#include "qgspointlocator.h"
@ -49,7 +50,7 @@ class CORE_EXPORT QgsSnappingUtils : public QObject
Q_PROPERTY( QgsSnappingConfig config READ config WRITE setConfig NOTIFY configChanged )
public:
QgsSnappingUtils( QObject *parent = nullptr );
QgsSnappingUtils( QObject *parent SIP_TRANSFERTHIS = 0 );
~QgsSnappingUtils();
// main actions

3
src/core/qgssqlstatement.h
View File

@ -18,6 +18,7 @@
#define QGSSQLSTATEMENT_H
#include <QCoreApplication>
#include "qgis.h"
#include <QMetaType>
#include <QStringList>
#include <QVariant>
@ -60,7 +61,7 @@ class CORE_EXPORT QgsSQLStatement
/** Performs basic validity checks. Basically checking that columns referencing
* a table, references a specified table. Returns true if the validation is
* successful */
bool doBasicValidationChecks( QString &errorMsgOut ) const;
bool doBasicValidationChecks( QString &errorMsgOut SIP_OUT ) const;
class Node;

7
src/core/qgstaskmanager.h
View File

@ -19,6 +19,7 @@
#define QGSTASKMANAGER_H
#include <QObject>
#include "qgis.h"
#include <QMap>
#include <QFuture>
#include <QReadWriteLock>
@ -345,7 +346,7 @@ class CORE_EXPORT QgsTaskManager : public QObject
/** Constructor for QgsTaskManager.
* \param parent parent QObject
*/
QgsTaskManager( QObject *parent = nullptr );
QgsTaskManager( QObject *parent SIP_TRANSFERTHIS = 0 );
virtual ~QgsTaskManager();
@ -383,7 +384,7 @@ class CORE_EXPORT QgsTaskManager : public QObject
* taking precedence over lower priority numbers.
* \returns unique task ID
*/
long addTask( QgsTask *task, int priority = 0 );
long addTask( QgsTask *task SIP_TRANSFER, int priority = 0 );
/**
* Adds a task to the manager, using a full task definition (including dependency
@ -393,7 +394,7 @@ class CORE_EXPORT QgsTaskManager : public QObject
* taking precedence over lower priority numbers.
* \returns unique task ID
*/
long addTask( const TaskDefinition &task, int priority = 0 );
long addTask( const TaskDefinition &task SIP_TRANSFER, int priority = 0 );
/** Returns the task with matching ID.
* \param id task ID

13
src/core/qgstransaction.h
View File

@ -19,6 +19,7 @@
#define QGSTRANSACTION_H
#include <QSet>
#include "qgis.h"
#include <QString>
#include <QObject>
@ -60,11 +61,11 @@ class CORE_EXPORT QgsTransaction : public QObject
const QgsTransaction &operator=( const QgsTransaction &other ) = delete;
//! Creates a transaction for the specified connection string and provider
static QgsTransaction *create( const QString &connString, const QString &providerKey );
static QgsTransaction *create( const QString &connString, const QString &providerKey ) SIP_FACTORY;
/** Creates a transaction which includes the specified layers. Connection string
* and data provider are taken from the first layer */
static QgsTransaction *create( const QStringList &layerIds );
static QgsTransaction *create( const QStringList &layerIds ) SIP_FACTORY;
virtual ~QgsTransaction();
@ -82,16 +83,16 @@ class CORE_EXPORT QgsTransaction : public QObject
* statements block until the conflicting transaction is committed or
* rolled back.
* Some providers might not honour the statement timeout. */
bool begin( QString &errorMsg, int statementTimeout = 20 );
bool begin( QString &errorMsg SIP_OUT, int statementTimeout = 20 );
//! Commit transaction.
bool commit( QString &errorMsg );
bool commit( QString &errorMsg SIP_OUT );
//! Roll back transaction.
bool rollback( QString &errorMsg );
bool rollback( QString &errorMsg SIP_OUT );
//! Executes sql
virtual bool executeSql( const QString &sql, QString &error ) = 0;
virtual bool executeSql( const QString &sql, QString &error SIP_OUT ) = 0;
/**
* Checks if a the provider of a give layer supports transactions.

12
src/core/qgsunittypes.h
View File

@ -163,7 +163,7 @@ class CORE_EXPORT QgsUnitTypes
* \returns decoded units
* \see encodeUnit()
*/
Q_INVOKABLE static QgsUnitTypes::DistanceUnit decodeDistanceUnit( const QString &string, bool *ok = 0 );
Q_INVOKABLE static QgsUnitTypes::DistanceUnit decodeDistanceUnit( const QString &string, bool *ok SIP_OUT = 0 );
/** Returns a translated string representing a distance unit.
* \param unit unit to convert to string
@ -184,7 +184,7 @@ class CORE_EXPORT QgsUnitTypes
* \param ok optional boolean, will be set to true if string was converted successfully
* \see toString()
*/
Q_INVOKABLE static QgsUnitTypes::DistanceUnit stringToDistanceUnit( const QString &string, bool *ok = 0 );
Q_INVOKABLE static QgsUnitTypes::DistanceUnit stringToDistanceUnit( const QString &string, bool *ok SIP_OUT = 0 );
/** Returns the conversion factor between the specified distance units.
* \param fromUnit distance unit to convert from
@ -212,7 +212,7 @@ class CORE_EXPORT QgsUnitTypes
* \returns decoded units
* \see encodeUnit()
*/
Q_INVOKABLE static AreaUnit decodeAreaUnit( const QString &string, bool *ok = 0 );
Q_INVOKABLE static AreaUnit decodeAreaUnit( const QString &string, bool *ok SIP_OUT = 0 );
/** Returns a translated string representing an areal unit.
* \param unit unit to convert to string
@ -233,7 +233,7 @@ class CORE_EXPORT QgsUnitTypes
* \param ok optional boolean, will be set to true if string was converted successfully
* \see toString()
*/
Q_INVOKABLE static AreaUnit stringToAreaUnit( const QString &string, bool *ok = 0 );
Q_INVOKABLE static AreaUnit stringToAreaUnit( const QString &string, bool *ok SIP_OUT = 0 );
/** Returns the conversion factor between the specified areal units.
* \param fromUnit area unit to convert from
@ -263,7 +263,7 @@ class CORE_EXPORT QgsUnitTypes
* \returns decoded units
* \see encodeUnit()
*/
Q_INVOKABLE static AngleUnit decodeAngleUnit( const QString &string, bool *ok = 0 );
Q_INVOKABLE static AngleUnit decodeAngleUnit( const QString &string, bool *ok SIP_OUT = 0 );
/** Returns a translated string representing an angular unit.
* \param unit unit to convert to string
@ -347,7 +347,7 @@ class CORE_EXPORT QgsUnitTypes
* \returns decoded units
* \see encodeUnit()
*/
Q_INVOKABLE static RenderUnit decodeRenderUnit( const QString &string, bool *ok = 0 );
Q_INVOKABLE static RenderUnit decodeRenderUnit( const QString &string, bool *ok SIP_OUT = 0 );
};

6
src/core/qgsvectordataprovider.h
View File

@ -146,7 +146,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
* \since QGIS 2.4
* \returns new instance of QgsAbstractFeatureSource (caller is responsible for deleting it)
*/
virtual QgsAbstractFeatureSource *featureSource() const = 0;
virtual QgsAbstractFeatureSource *featureSource() const = 0 SIP_FACTORY;
/**
* Returns the permanent storage type for this layer as a friendly name.
@ -210,7 +210,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
*
* Default implementation simply iterates the features
*/
virtual void uniqueValues( int index, QList<QVariant> &uniqueValues, int limit = -1 ) const;
virtual void uniqueValues( int index, QList<QVariant> &uniqueValues SIP_OUT, int limit = -1 ) const;
/**
* Returns unique string values of an attribute which contain a specified subset string. Subset
@ -576,7 +576,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
* Converts the geometry to the provider type if possible / necessary
* \returns the converted geometry or nullptr if no conversion was necessary or possible
*/
QgsGeometry *convertToProviderType( const QgsGeometry &geom ) const;
QgsGeometry *convertToProviderType( const QgsGeometry &geom ) const SIP_FACTORY;
/**
* Set the list of native types supported by this provider.

3
src/core/qgsvectorlayercache.h
View File

@ -20,6 +20,7 @@
#define QgsVectorLayerCache_H
#include "qgis_core.h"
#include "qgis.h"
#include <QCache>
#include "qgsvectorlayer.h"
@ -163,7 +164,7 @@ class CORE_EXPORT QgsVectorLayerCache : public QObject
*
* \param cacheIndex The cache index to add.
*/
void addCacheIndex( QgsAbstractCacheIndex *cacheIndex );
void addCacheIndex( QgsAbstractCacheIndex *cacheIndex SIP_TRANSFER );
/**
* Query this VectorLayerCache for features.

7
src/core/qgsvectorlayereditutils.h
View File

@ -17,6 +17,7 @@
#include "qgis_core.h"
#include "qgis.h"
#include "qgsfeature.h"
#include "qgsvectorlayer.h"
@ -59,7 +60,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils
* to the given coordinates
* \note available in Python bindings as moveVertexV2
*/
bool moveVertex( const QgsPointV2 &p, QgsFeatureId atFeatureId, int atVertex );
bool moveVertex( const QgsPointV2 &p, QgsFeatureId atFeatureId, int atVertex ) SIP_PYNAME( moveVertexV2 );
/** Deletes a vertex from a feature.
* \param featureId ID of feature to remove vertex from
@ -99,7 +100,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils
* \note available in Python bindings as addCurvedRing
*/
// TODO QGIS 3.0 returns an enum instead of a magic constant
int addRing( QgsCurve *ring, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = nullptr );
int addRing( QgsCurve *ring, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = nullptr ) SIP_PYNAME( addCurvedRing );
/** Adds a new part polygon to a multipart feature
* \returns
@ -130,7 +131,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils
//! \note available in Python bindings as addCurvedPart
// TODO QGIS 3.0 returns an enum instead of a magic constant
int addPart( QgsCurve *ring, QgsFeatureId featureId );
int addPart( QgsCurve *ring, QgsFeatureId featureId ) SIP_PYNAME( addCurvedPart );
/** Translates feature by dx, dy
* \param featureId id of the feature to translate

3
src/core/qgsvectorlayerimport.h
View File

@ -20,6 +20,7 @@
#define QGSVECTORLAYERIMPORT_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgsfeature.h"
class QProgressDialog;
@ -73,7 +74,7 @@ class CORE_EXPORT QgsVectorLayerImport
const QString &providerKey,
const QgsCoordinateReferenceSystem &destCRS,
bool onlySelected = false,
QString *errorMessage = nullptr,
QString *errorMessage SIP_OUT = 0,
bool skipAttributeCreation = false,
QMap<QString, QVariant> *options = nullptr,
QProgressDialog *progress = nullptr

5
src/core/qgsvectorlayerjoinbuffer.h
View File

@ -19,6 +19,7 @@
#define QGSVECTORLAYERJOINBUFFER_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgsvectorlayerjoininfo.h"
#include <QHash>
@ -73,7 +74,7 @@ class CORE_EXPORT QgsVectorLayerJoinBuffer : public QObject
\param index this layers attribute index
\param fields fields of the vector layer (including joined fields)
\param sourceFieldIndex Output: field's index in source layer */
const QgsVectorLayerJoinInfo *joinForFieldIndex( int index, const QgsFields &fields, int &sourceFieldIndex ) const;
const QgsVectorLayerJoinInfo *joinForFieldIndex( int index, const QgsFields &fields, int &sourceFieldIndex SIP_OUT ) const;
//! Find out what is the first index of the join within fields. Returns -1 if join is not present
//! \since QGIS 2.6
@ -85,7 +86,7 @@ class CORE_EXPORT QgsVectorLayerJoinBuffer : public QObject
//! Create a copy of the join buffer
//! \since QGIS 2.6
QgsVectorLayerJoinBuffer *clone() const;
QgsVectorLayerJoinBuffer *clone() const SIP_FACTORY;
signals:
//! Emitted whenever the list of joined fields changes (e.g. added join or joined layer's fields change)

3
src/core/qgsvectorlayertools.h
View File

@ -17,6 +17,7 @@
#define QGSVECTORLAYERTOOLS_H
#include "qgis_core.h"
#include "qgis.h"
#include <QObject>
#include "qgsfeature.h"
@ -52,7 +53,7 @@ class CORE_EXPORT QgsVectorLayerTools : public QObject
*
* TODO QGIS 3: remove const qualifier
*/
virtual bool addFeature( QgsVectorLayer *layer, const QgsAttributeMap &defaultValues = QgsAttributeMap(), const QgsGeometry &defaultGeometry = QgsGeometry(), QgsFeature *feature = nullptr ) const = 0;
virtual bool addFeature( QgsVectorLayer *layer, const QgsAttributeMap &defaultValues = QgsAttributeMap(), const QgsGeometry &defaultGeometry = QgsGeometry(), QgsFeature *feature SIP_OUT = 0 ) const = 0;
/**
* This will be called, whenever a vector layer should be switched to edit mode. Check the providers

15
src/core/qgsvectorlayerundocommand.h
View File

@ -17,6 +17,7 @@
#define QGSVECTORLAYERUNDOCOMMAND_H
#include "qgis_core.h"
#include "qgis.h"
#include <QUndoCommand>
#include <QVariant>
@ -75,7 +76,7 @@ class CORE_EXPORT QgsVectorLayerUndoCommandAddFeature : public QgsVectorLayerUnd
* \param buffer associated edit buffer
* \param f feature to add to layer
*/
QgsVectorLayerUndoCommandAddFeature( QgsVectorLayerEditBuffer *buffer, QgsFeature &f );
QgsVectorLayerUndoCommandAddFeature( QgsVectorLayerEditBuffer *buffer SIP_TRANSFER, QgsFeature &f );
virtual void undo() override;
virtual void redo() override;
@ -98,7 +99,7 @@ class CORE_EXPORT QgsVectorLayerUndoCommandDeleteFeature : public QgsVectorLayer
* \param buffer associated edit buffer
* \param fid feature ID of feature to delete from layer
*/
QgsVectorLayerUndoCommandDeleteFeature( QgsVectorLayerEditBuffer *buffer, QgsFeatureId fid );
QgsVectorLayerUndoCommandDeleteFeature( QgsVectorLayerEditBuffer *buffer SIP_TRANSFER, QgsFeatureId fid );
virtual void undo() override;
virtual void redo() override;
@ -122,7 +123,7 @@ class CORE_EXPORT QgsVectorLayerUndoCommandChangeGeometry : public QgsVectorLaye
* \param fid feature ID of feature to modify geometry of
* \param newGeom new geometry for feature
*/
QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer *buffer, QgsFeatureId fid, const QgsGeometry &newGeom );
QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer *buffer SIP_TRANSFER, QgsFeatureId fid, const QgsGeometry &newGeom );
virtual void undo() override;
virtual void redo() override;
@ -152,7 +153,7 @@ class CORE_EXPORT QgsVectorLayerUndoCommandChangeAttribute : public QgsVectorLay
* \param newValue new value of attribute
* \param oldValue previous value of attribute
*/
QgsVectorLayerUndoCommandChangeAttribute( QgsVectorLayerEditBuffer *buffer, QgsFeatureId fid, int fieldIndex, const QVariant &newValue, const QVariant &oldValue );
QgsVectorLayerUndoCommandChangeAttribute( QgsVectorLayerEditBuffer *buffer SIP_TRANSFER, QgsFeatureId fid, int fieldIndex, const QVariant &newValue, const QVariant &oldValue );
virtual void undo() override;
virtual void redo() override;
@ -177,7 +178,7 @@ class CORE_EXPORT QgsVectorLayerUndoCommandAddAttribute : public QgsVectorLayerU
* \param buffer associated edit buffer
* \param field definition of new field to add
*/
QgsVectorLayerUndoCommandAddAttribute( QgsVectorLayerEditBuffer *buffer, const QgsField &field );
QgsVectorLayerUndoCommandAddAttribute( QgsVectorLayerEditBuffer *buffer SIP_TRANSFER, const QgsField &field );
virtual void undo() override;
virtual void redo() override;
@ -200,7 +201,7 @@ class CORE_EXPORT QgsVectorLayerUndoCommandDeleteAttribute : public QgsVectorLay
* \param buffer associated edit buffer
* \param fieldIndex index of field to delete
*/
QgsVectorLayerUndoCommandDeleteAttribute( QgsVectorLayerEditBuffer *buffer, int fieldIndex );
QgsVectorLayerUndoCommandDeleteAttribute( QgsVectorLayerEditBuffer *buffer SIP_TRANSFER, int fieldIndex );
virtual void undo() override;
virtual void redo() override;
@ -233,7 +234,7 @@ class CORE_EXPORT QgsVectorLayerUndoCommandRenameAttribute : public QgsVectorLay
* \param fieldIndex index of field to rename
* \param newName new name for field
*/
QgsVectorLayerUndoCommandRenameAttribute( QgsVectorLayerEditBuffer *buffer, int fieldIndex, const QString &newName );
QgsVectorLayerUndoCommandRenameAttribute( QgsVectorLayerEditBuffer *buffer SIP_TRANSFER, int fieldIndex, const QString &newName );
virtual void undo() override;
virtual void redo() override;

7
src/core/raster/qgscolorrampshader.h
View File

@ -22,6 +22,7 @@ originally part of the larger QgsRasterLayer class
#define QGSCOLORRAMPSHADER_H
#include "qgis_core.h"
#include "qgis.h"
#include <QColor>
#include <QVector>
#include <memory>
@ -115,13 +116,13 @@ class CORE_EXPORT QgsColorRampShader : public QgsRasterShaderFunction
* \since QGIS 3.0
* \see setSourceColorRamp()
*/
QgsColorRamp *sourceColorRamp() const;
QgsColorRamp *sourceColorRamp() const SIP_FACTORY;
/** Set the source color ramp. Ownership is transferred to the renderer.
* \since QGIS 3.0
* \see sourceColorRamp()
*/
void setSourceColorRamp( QgsColorRamp *colorramp );
void setSourceColorRamp( QgsColorRamp *colorramp SIP_TRANSFER );
//! \brief Set the color ramp type
void setColorRampType( const QString &type );
@ -139,7 +140,7 @@ class CORE_EXPORT QgsColorRampShader : public QgsRasterShaderFunction
* \param extent extent used in classification (quantile mode only)
* \param input raster input used in classification (quantile mode only)
*/
void classifyColorRamp( const int band = -1, const QgsRectangle &extent = QgsRectangle(), QgsRasterInterface *input = nullptr );
void classifyColorRamp( const int band = -1, const QgsRectangle &extent = QgsRectangle(), QgsRasterInterface *input = nullptr ) SIP_PYNAME( classifyColorRampV2 );
//! \brief Generates and new RGB value based on one input value
bool shade( double, int *, int *, int *, int * ) override;

3
src/core/raster/qgshillshaderenderer.h
View File

@ -20,6 +20,7 @@
#include "qgis_core.h"
#include "qgis.h"
#include "qgsrasterrenderer.h"
class QgsRasterBlock;
@ -53,7 +54,7 @@ class CORE_EXPORT QgsHillshadeRenderer : public QgsRasterRenderer
* \param input The raster input interface.
* \returns A new QgsHillshadeRenderer.
*/
static QgsRasterRenderer *create( const QDomElement &elem, QgsRasterInterface *input );
static QgsRasterRenderer *create( const QDomElement &elem, QgsRasterInterface *input ) SIP_FACTORY;
void writeXml( QDomDocument &doc, QDomElement &parentElem ) const override;

7
src/core/raster/qgsmultibandcolorrenderer.h
View File

@ -19,6 +19,7 @@
#define QGSMULTIBANDCOLORRENDERER_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgsrasterrenderer.h"
class QgsContrastEnhancement;
@ -55,15 +56,15 @@ class CORE_EXPORT QgsMultiBandColorRenderer: public QgsRasterRenderer
const QgsContrastEnhancement *redContrastEnhancement() const { return mRedContrastEnhancement; }
//! Takes ownership
void setRedContrastEnhancement( QgsContrastEnhancement *ce );
void setRedContrastEnhancement( QgsContrastEnhancement *ce SIP_TRANSFER );
const QgsContrastEnhancement *greenContrastEnhancement() const { return mGreenContrastEnhancement; }
//! Takes ownership
void setGreenContrastEnhancement( QgsContrastEnhancement *ce );
void setGreenContrastEnhancement( QgsContrastEnhancement *ce SIP_TRANSFER );
const QgsContrastEnhancement *blueContrastEnhancement() const { return mBlueContrastEnhancement; }
//! Takes ownership
void setBlueContrastEnhancement( QgsContrastEnhancement *ce );
void setBlueContrastEnhancement( QgsContrastEnhancement *ce SIP_TRANSFER );
void writeXml( QDomDocument &doc, QDomElement &parentElem ) const override;

5
src/core/raster/qgspalettedrasterrenderer.h
View File

@ -19,6 +19,7 @@
#define QGSPALETTEDRASTERRENDERER_H
#include "qgis_core.h"
#include "qgis.h"
#include <QVector>
#include "qgsrasterrenderer.h"
@ -67,7 +68,7 @@ class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer
const QgsPalettedRasterRenderer &operator=( const QgsPalettedRasterRenderer & ) = delete;
QgsPalettedRasterRenderer *clone() const override;
static QgsRasterRenderer *create( const QDomElement &elem, QgsRasterInterface *input );
static QgsRasterRenderer *create( const QDomElement &elem, QgsRasterInterface *input ) SIP_FACTORY;
QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height, QgsRasterBlockFeedback *feedback = nullptr ) override;
@ -98,7 +99,7 @@ class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer
* \since QGIS 3.0
* \see sourceColorRamp()
*/
void setSourceColorRamp( QgsColorRamp *ramp );
void setSourceColorRamp( QgsColorRamp *ramp SIP_TRANSFER );
/** Get the source color ramp
* \since QGIS 3.0

5
src/core/raster/qgsrasterinterface.h
View File

@ -19,6 +19,7 @@
#define QGSRASTERINTERFACE_H
#include "qgis_core.h"
#include "qgis.h"
#include <limits>
#include <QCoreApplication> // for tr()
@ -98,7 +99,7 @@ class CORE_EXPORT QgsRasterInterface
virtual ~QgsRasterInterface() = default;
//! Clone itself, create deep copy
virtual QgsRasterInterface *clone() const = 0;
virtual QgsRasterInterface *clone() const = 0 SIP_FACTORY;
//! Returns a bitmask containing the supported capabilities
virtual int capabilities() const
@ -152,7 +153,7 @@ class CORE_EXPORT QgsRasterInterface
* \param height pixel height of block
* \param feedback optional raster feedback object for cancelation/preview. Added in QGIS 3.0.
*/
virtual QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height, QgsRasterBlockFeedback *feedback = nullptr ) = 0;
virtual QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height, QgsRasterBlockFeedback *feedback = nullptr ) = 0 SIP_FACTORY;
/** Set input.
* Returns true if set correctly, false if cannot use that input */

2
src/core/raster/qgsrasterlayer.h
View File

@ -224,7 +224,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
LayerType rasterType() { return mRasterType; }
//! Set raster renderer. Takes ownership of the renderer object
void setRenderer( QgsRasterRenderer *renderer );
void setRenderer( QgsRasterRenderer *renderer SIP_TRANSFER );
QgsRasterRenderer *renderer() const { return mPipe.renderer(); }
//! Set raster resample filter. Takes ownership of the resample filter object

3
src/core/raster/qgsrasterminmaxorigin.h
View File

@ -19,6 +19,7 @@
#define QGSRASTERMINMAXORIGIN_H
#include <QDomDocument>
#include "qgis.h"
#include <QDomElement>
#include "qgis_core.h"
@ -45,7 +46,7 @@ class CORE_EXPORT QgsRasterMinMaxOrigin
enum Limits
{
//! User defined.
None,
None SIP_PYNAME( None_ ),
//! Real min-max values
MinMax,
//! Range is [ mean - stdDevFactor() * stddev, mean + stdDevFactor() * stddev ]

7
src/core/raster/qgsrasterpipe.h
View File

@ -19,6 +19,7 @@
#define QGSRASTERPIPE_H
#include "qgis_core.h"
#include "qgis.h"
#include <QImage>
#include <QMap>
#include <QObject>
@ -66,11 +67,11 @@ class CORE_EXPORT QgsRasterPipe
/** Try to insert interface at specified index and connect
* if connection would fail, the interface is not inserted and false is returned */
bool insert( int idx, QgsRasterInterface *interface );
bool insert( int idx, QgsRasterInterface *interface SIP_TRANSFER );
/** Try to replace interface at specified index and connect
* if connection would fail, the interface is not inserted and false is returned */
bool replace( int idx, QgsRasterInterface *interface );
bool replace( int idx, QgsRasterInterface *interface SIP_TRANSFER );
/** Insert a new known interface in default place or replace interface of the same
* role if it already exists. Known interfaces are: QgsRasterDataProvider,
@ -78,7 +79,7 @@ class CORE_EXPORT QgsRasterPipe
* subclasses. For unknown interfaces it mus be explicitly specified position
* where it should be inserted using insert() method.
*/
bool set( QgsRasterInterface *interface );
bool set( QgsRasterInterface *interface SIP_TRANSFER );
//! Remove and delete interface at given index if possible
bool remove( int idx );

5
src/core/raster/qgsrasterresamplefilter.h
View File

@ -19,6 +19,7 @@
#define QGSRASTERRESAMPLEFILTER_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgsrasterinterface.h"
#include "qgsrasterresampler.h"
@ -43,11 +44,11 @@ class CORE_EXPORT QgsRasterResampleFilter : public QgsRasterInterface
QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height, QgsRasterBlockFeedback *feedback = nullptr ) override;
//! Set resampler for zoomed in scales. Takes ownership of the object
void setZoomedInResampler( QgsRasterResampler *r );
void setZoomedInResampler( QgsRasterResampler *r SIP_TRANSFER );
const QgsRasterResampler *zoomedInResampler() const { return mZoomedInResampler.get(); }
//! Set resampler for zoomed out scales. Takes ownership of the object
void setZoomedOutResampler( QgsRasterResampler *r );
void setZoomedOutResampler( QgsRasterResampler *r SIP_TRANSFER );
const QgsRasterResampler *zoomedOutResampler() const { return mZoomedOutResampler.get(); }
void setMaxOversampling( double os ) { mMaxOversampling = os; }

3
src/core/raster/qgsrasterresampler.h
View File

@ -19,6 +19,7 @@
#define QGSRASTERRESAMPLER_H
#include <QString>
#include "qgis.h"
class QImage;
@ -42,7 +43,7 @@ class QgsRasterResampler
* Needs to be reimplemented by subclasses.
* Ownership is transferred to the caller.
*/
virtual QgsRasterResampler *clone() const = 0;
virtual QgsRasterResampler *clone() const = 0 SIP_FACTORY;
};
#endif // QGSRASTERRESAMPLER_H

3
src/core/raster/qgssinglebandgrayrenderer.h
View File

@ -19,6 +19,7 @@
#define QGSSINGLEBANDGRAYRENDERER_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgsrasterrenderer.h"
#include <memory>
@ -54,7 +55,7 @@ class CORE_EXPORT QgsSingleBandGrayRenderer: public QgsRasterRenderer
void setGrayBand( int band ) { mGrayBand = band; }
const QgsContrastEnhancement *contrastEnhancement() const { return mContrastEnhancement.get(); }
//! Takes ownership
void setContrastEnhancement( QgsContrastEnhancement *ce );
void setContrastEnhancement( QgsContrastEnhancement *ce SIP_TRANSFER );
void setGradient( Gradient gradient ) { mGradient = gradient; }
Gradient gradient() const { return mGradient; }

3
src/core/raster/qgssinglebandpseudocolorrenderer.h
View File

@ -19,6 +19,7 @@
#define QGSSINGLEBANDPSEUDOCOLORRENDERER_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscolorramp.h"
#include "qgscolorrampshader.h"
#include "qgsrasterrenderer.h"
@ -50,7 +51,7 @@ class CORE_EXPORT QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height, QgsRasterBlockFeedback *feedback = nullptr ) override;
//! Takes ownership of the shader
void setShader( QgsRasterShader *shader );
void setShader( QgsRasterShader *shader SIP_TRANSFER );
//! Returns the raster shader
QgsRasterShader *shader() { return mShader.get(); }

3
src/core/symbology-ng/qgsarrowsymbollayer.h
View File

@ -17,6 +17,7 @@
#define QGSARROWSYMBOLLAYERV2_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgssymbollayer.h"
@ -39,7 +40,7 @@ class CORE_EXPORT QgsArrowSymbolLayer : public QgsLineSymbolLayer
*
* \returns A new QgsArrowSymbolLayer
*/
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
virtual QgsArrowSymbolLayer *clone() const override;
virtual QgsSymbol *subSymbol() override { return mSymbol.get(); }

17
src/core/symbology-ng/qgscategorizedsymbolrenderer.h
View File

@ -16,6 +16,7 @@
#define QGSCATEGORIZEDSYMBOLRENDERERV2_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgssymbol.h"
#include "qgsrenderer.h"
#include "qgsexpression.h"
@ -34,7 +35,7 @@ class CORE_EXPORT QgsRendererCategory
QgsRendererCategory();
//! takes ownership of symbol
QgsRendererCategory( const QVariant &value, QgsSymbol *symbol, const QString &label, bool render = true );
QgsRendererCategory( const QVariant &value, QgsSymbol *symbol SIP_TRANSFER, const QString &label, bool render = true );
//! copy constructor
QgsRendererCategory( const QgsRendererCategory &cat );
@ -46,7 +47,7 @@ class CORE_EXPORT QgsRendererCategory
QString label() const;
void setValue( const QVariant &value );
void setSymbol( QgsSymbol *s );
void setSymbol( QgsSymbol *s SIP_TRANSFER );
void setLabel( const QString &label );
// \since QGIS 2.5
@ -107,7 +108,7 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer
int categoryIndexForLabel( const QString &val );
bool updateCategoryValue( int catIndex, const QVariant &value );
bool updateCategorySymbol( int catIndex, QgsSymbol *symbol );
bool updateCategorySymbol( int catIndex, QgsSymbol *symbol SIP_TRANSFER );
bool updateCategoryLabel( int catIndex, const QString &label );
//! \since QGIS 2.5
@ -127,7 +128,7 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer
void setClassAttribute( const QString &attr ) { mAttrName = attr; }
//! create renderer from XML element
static QgsFeatureRenderer *create( QDomElement &element );
static QgsFeatureRenderer *create( QDomElement &element ) SIP_FACTORY;
virtual QDomElement save( QDomDocument &doc ) override;
virtual QgsLegendSymbologyList legendSymbologyItems( QSize iconSize ) override;
@ -148,7 +149,7 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer
* \see sourceSymbol()
* \see setSourceColorRamp()
*/
void setSourceSymbol( QgsSymbol *sym );
void setSourceSymbol( QgsSymbol *sym SIP_TRANSFER );
/** Returns the source color ramp, from which each categories' color is derived.
* \see setSourceColorRamp()
@ -161,13 +162,13 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer
* \see sourceColorRamp()
* \see setSourceSymbol()
*/
void setSourceColorRamp( QgsColorRamp *ramp );
void setSourceColorRamp( QgsColorRamp *ramp SIP_TRANSFER );
/** Update the color ramp used and all symbols colors.
* \param ramp color ramp. Ownership is transferred to the renderer
* \since QGIS 2.5
*/
void updateColorRamp( QgsColorRamp *ramp );
void updateColorRamp( QgsColorRamp *ramp SIP_TRANSFER );
virtual bool legendSymbolItemsCheckable() const override;
virtual bool legendSymbolItemChecked( const QString &key ) override;
@ -178,7 +179,7 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer
//! creates a QgsCategorizedSymbolRenderer from an existing renderer.
//! \since QGIS 2.5
//! \returns a new renderer if the conversion was possible, otherwise 0.
static QgsCategorizedSymbolRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer );
static QgsCategorizedSymbolRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer ) SIP_FACTORY;
protected:
QString mAttrName;

5
src/core/symbology-ng/qgscptcityarchive.h
View File

@ -18,6 +18,7 @@
#define QGSCPTCITYARCHIVE_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgscolorramp.h"
#include <QAbstractItemModel>
@ -128,14 +129,14 @@ class CORE_EXPORT QgsCptCityDataItem : public QObject
// Insert new child using alphabetical order based on mName, emits necessary signal to model before and after, sets parent and connects signals
// refresh - refresh populated item, emit signals to model
virtual void addChildItem( QgsCptCityDataItem *child, bool refresh = false );
virtual void addChildItem( QgsCptCityDataItem *child SIP_TRANSFER, bool refresh = false );
// remove and delete child item, signals to browser are emitted
virtual void deleteChildItem( QgsCptCityDataItem *child );
// remove child item but don't delete it, signals to browser are emitted
// returns pointer to the removed item or null if no such item was found
virtual QgsCptCityDataItem *removeChildItem( QgsCptCityDataItem *child );
virtual QgsCptCityDataItem *removeChildItem( QgsCptCityDataItem *child ) SIP_TRANSFERBACK;
virtual bool equal( const QgsCptCityDataItem *other );

5
src/core/symbology-ng/qgsellipsesymbollayer.h
View File

@ -18,6 +18,7 @@
#define DEFAULT_ELLIPSE_JOINSTYLE Qt::MiterJoin
#include "qgis_core.h"
#include "qgis.h"
#include "qgsmarkersymbollayer.h"
#include <QPainterPath>
@ -30,8 +31,8 @@ class CORE_EXPORT QgsEllipseSymbolLayer: public QgsMarkerSymbolLayer
public:
QgsEllipseSymbolLayer();
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
void renderPoint( QPointF point, QgsSymbolRenderContext &context ) override;
QString layerType() const override;

27
src/core/symbology-ng/qgsfillsymbollayer.h
View File

@ -17,6 +17,7 @@
#define QGSFILLSYMBOLLAYERV2_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgssymbollayer.h"
#define DEFAULT_SIMPLEFILL_COLOR QColor(0,0,255)
@ -47,8 +48,8 @@ class CORE_EXPORT QgsSimpleFillSymbolLayer : public QgsFillSymbolLayer
// static stuff
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
// implemented from base classes
@ -202,7 +203,7 @@ class CORE_EXPORT QgsGradientFillSymbolLayer : public QgsFillSymbolLayer
// static stuff
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
// implemented from base classes
@ -344,7 +345,7 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayer : public QgsFillSymbolLayer
// static stuff
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
// implemented from base classes
@ -652,7 +653,7 @@ class CORE_EXPORT QgsRasterFillSymbolLayer: public QgsImageFillSymbolLayer
QgsRasterFillSymbolLayer( const QString &imageFilePath = QString() );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
// implemented from base classes
QString layerType() const override;
@ -837,8 +838,8 @@ class CORE_EXPORT QgsSVGFillSymbolLayer: public QgsImageFillSymbolLayer
QgsSVGFillSymbolLayer( const QByteArray &svgData, double width = 20, double rotation = 0.0 );
~QgsSVGFillSymbolLayer();
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
// implemented from base classes
@ -944,8 +945,8 @@ class CORE_EXPORT QgsLinePatternFillSymbolLayer: public QgsImageFillSymbolLayer
QgsLinePatternFillSymbolLayer();
~QgsLinePatternFillSymbolLayer();
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
QString layerType() const override;
@ -1078,8 +1079,8 @@ class CORE_EXPORT QgsPointPatternFillSymbolLayer: public QgsImageFillSymbolLayer
QgsPointPatternFillSymbolLayer();
~QgsPointPatternFillSymbolLayer();
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
QString layerType() const override;
@ -1217,8 +1218,8 @@ class CORE_EXPORT QgsCentroidFillSymbolLayer : public QgsFillSymbolLayer
// static stuff
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
// implemented from base classes

23
src/core/symbology-ng/qgsgraduatedsymbolrenderer.h
View File

@ -16,6 +16,7 @@
#define QGSGRADUATEDSYMBOLRENDERERV2_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgssymbol.h"
#include "qgsrenderer.h"
#include "qgsexpression.h"
@ -28,7 +29,7 @@ class CORE_EXPORT QgsRendererRange
{
public:
QgsRendererRange();
QgsRendererRange( double lowerValue, double upperValue, QgsSymbol *symbol, const QString &label, bool render = true );
QgsRendererRange( double lowerValue, double upperValue, QgsSymbol *symbol SIP_TRANSFER, const QString &label, bool render = true );
QgsRendererRange( const QgsRendererRange &range );
// default dtor is ok
@ -42,7 +43,7 @@ class CORE_EXPORT QgsRendererRange
QgsSymbol *symbol() const;
QString label() const;
void setSymbol( QgsSymbol *s );
void setSymbol( QgsSymbol *s SIP_TRANSFER );
void setLabel( const QString &label );
void setLowerValue( double lowerValue );
void setUpperValue( double upperValue );
@ -99,7 +100,7 @@ class CORE_EXPORT QgsRendererRangeLabelFormat
void setTrimTrailingZeroes( bool trimTrailingZeroes ) { mTrimTrailingZeroes = trimTrailingZeroes; }
//! \note labelForLowerUpper in Python bindings
QString labelForRange( double lower, double upper ) const;
QString labelForRange( double lower, double upper ) const SIP_PYNAME( labelForLowerUpper );
QString labelForRange( const QgsRendererRange &range ) const;
QString formatNumber( double value ) const;
@ -150,7 +151,7 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
const QgsRangeList &ranges() const { return mRanges; }
bool updateRangeSymbol( int rangeIndex, QgsSymbol *symbol );
bool updateRangeSymbol( int rangeIndex, QgsSymbol *symbol SIP_TRANSFER );
bool updateRangeLabel( int rangeIndex, const QString &label );
bool updateRangeUpperValue( int rangeIndex, double value );
bool updateRangeLowerValue( int rangeIndex, double value );
@ -159,9 +160,9 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
void addClass( QgsSymbol *symbol );
//! \note available in Python bindings as addClassRange
void addClass( const QgsRendererRange &range );
void addClass( const QgsRendererRange &range ) SIP_PYNAME( addClassRange );
//! \note available in Python bindings as addClassLowerUpper
void addClass( double lower, double upper );
void addClass( double lower, double upper ) SIP_PYNAME( addClassLowerUpper );
/** Add a breakpoint by splitting existing classes so that the specified
* value becomes a break between two classes.
@ -247,7 +248,7 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
);
//! create renderer from XML element
static QgsFeatureRenderer *create( QDomElement &element );
static QgsFeatureRenderer *create( QDomElement &element ) SIP_FACTORY;
virtual QDomElement save( QDomDocument &doc ) override;
virtual QgsLegendSymbologyList legendSymbologyItems( QSize iconSize ) override;
@ -268,7 +269,7 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
* \see sourceSymbol()
* \see setSourceColorRamp()
*/
void setSourceSymbol( QgsSymbol *sym );
void setSourceSymbol( QgsSymbol *sym SIP_TRANSFER );
/** Returns the source color ramp, from which each classes' color is derived.
* \see setSourceColorRamp()
@ -279,13 +280,13 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
/** Sets the source color ramp.
* \param ramp color ramp. Ownership is transferred to the renderer
*/
void setSourceColorRamp( QgsColorRamp *ramp );
void setSourceColorRamp( QgsColorRamp *ramp SIP_TRANSFER );
/** Update the color ramp used. Also updates all symbols colors.
* Doesn't alter current breaks.
* \param ramp color ramp. Ownership is transferred to the renderer
*/
void updateColorRamp( QgsColorRamp *ramp = nullptr );
void updateColorRamp( QgsColorRamp *ramp SIP_TRANSFER = 0 );
/** Update all the symbols but leave breaks and colors. This method also sets the source
* symbol for the renderer.
@ -326,7 +327,7 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
//! creates a QgsGraduatedSymbolRenderer from an existing renderer.
//! \since QGIS 2.6
//! \returns a new renderer if the conversion was possible, otherwise 0.
static QgsGraduatedSymbolRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer );
static QgsGraduatedSymbolRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer ) SIP_FACTORY;
protected:
QString mAttrName;

6
src/core/symbology-ng/qgsheatmaprenderer.h
View File

@ -52,9 +52,9 @@ class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRenderer
virtual QgsSymbolList symbols( QgsRenderContext &context ) override;
virtual QString dump() const override;
virtual QSet<QString> usedAttributes( const QgsRenderContext &context ) const override;
static QgsFeatureRenderer *create( QDomElement &element );
static QgsFeatureRenderer *create( QDomElement &element ) SIP_FACTORY;
virtual QDomElement save( QDomDocument &doc ) override;
static QgsHeatmapRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer );
static QgsHeatmapRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer ) SIP_FACTORY;
//reimplemented to extent the request so that points up to heatmap's radius distance outside
//visible area are included
@ -72,7 +72,7 @@ class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRenderer
* \param ramp color ramp for heatmap. Ownership of ramp is transferred to the renderer.
* \see colorRamp
*/
void setColorRamp( QgsColorRamp *ramp );
void setColorRamp( QgsColorRamp *ramp SIP_TRANSFER );
/** Returns the radius for the heatmap
* \returns heatmap radius

6
src/core/symbology-ng/qgsinvertedpolygonrenderer.h
View File

@ -44,7 +44,7 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRenderer
* \param embeddedRenderer optional embeddedRenderer. If null, a default one will be assigned.
* Ownership will be transferred.
*/
QgsInvertedPolygonRenderer( QgsFeatureRenderer *embeddedRenderer = nullptr );
QgsInvertedPolygonRenderer( QgsFeatureRenderer *embeddedRenderer SIP_TRANSFER = 0 );
//! Direct copies are forbidden. Use clone() instead.
QgsInvertedPolygonRenderer( const QgsInvertedPolygonRenderer & ) = delete;
@ -110,7 +110,7 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRenderer
virtual bool willRenderFeature( QgsFeature &feat, QgsRenderContext &context ) override;
//! Creates a renderer out of an XML, for loading
static QgsFeatureRenderer *create( QDomElement &element );
static QgsFeatureRenderer *create( QDomElement &element ) SIP_FACTORY;
virtual QDomElement save( QDomDocument &doc ) override;
@ -138,7 +138,7 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRenderer
* \since QGIS 2.5
* \returns a new renderer if the conversion was possible, otherwise 0.
*/
static QgsInvertedPolygonRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer );
static QgsInvertedPolygonRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer ) SIP_FACTORY;
private:

3
src/core/symbology-ng/qgslegendsymbolitem.h
View File

@ -17,6 +17,7 @@
#define QGSLEGENDSYMBOLITEMV2_H
#include <QString>
#include "qgis.h"
#include "qgis_core.h"
@ -69,7 +70,7 @@ class CORE_EXPORT QgsLegendSymbolItem
QString parentRuleKey() const { return mParentKey; }
//! Set symbol of the item. Takes ownership of symbol.
void setSymbol( QgsSymbol *s );
void setSymbol( QgsSymbol *s SIP_TRANSFER );
private:
//! symbol. owned by the struct. can be null.

9
src/core/symbology-ng/qgslinesymbollayer.h
View File

@ -17,6 +17,7 @@
#define QGSLINESYMBOLLAYERV2_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgssymbollayer.h"
#include <QPen>
@ -42,8 +43,8 @@ class CORE_EXPORT QgsSimpleLineSymbolLayer : public QgsLineSymbolLayer
// static stuff
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
// implemented from base classes
@ -175,7 +176,7 @@ class CORE_EXPORT QgsMarkerLineSymbolLayer : public QgsLineSymbolLayer
*
* \returns A new MarkerLineSymbolLayerV2
*/
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
/**
* Create a new MarkerLineSymbolLayerV2 from SLD
@ -184,7 +185,7 @@ class CORE_EXPORT QgsMarkerLineSymbolLayer : public QgsLineSymbolLayer
*
* \returns A new MarkerLineSymbolLayerV2
*/
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
// implemented from base classes

15
src/core/symbology-ng/qgsmarkersymbollayer.h
View File

@ -17,6 +17,7 @@
#define QGSMARKERSYMBOLLAYERV2_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgssymbollayer.h"
#define DEFAULT_SIMPLEMARKER_NAME "circle"
@ -210,13 +211,13 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayer : public QgsSimpleMarkerSymbolLayer
* \param properties a property map containing symbol properties (see properties())
* \returns new QgsSimpleMarkerSymbolLayer
*/
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
/** Creates a new QgsSimpleMarkerSymbolLayer from an SLD XML element.
* \param element XML element containing SLD definition of symbol
* \returns new QgsSimpleMarkerSymbolLayer
*/
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
// reimplemented from base classes
@ -409,7 +410,7 @@ class CORE_EXPORT QgsFilledMarkerSymbolLayer : public QgsSimpleMarkerSymbolLayer
* \param properties a property map containing symbol properties (see properties())
* \returns new QgsFilledMarkerSymbolLayer
*/
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
QString layerType() const override;
void startRender( QgsSymbolRenderContext &context ) override;
@ -450,8 +451,8 @@ class CORE_EXPORT QgsSvgMarkerSymbolLayer : public QgsMarkerSymbolLayer
// static stuff
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
// implemented from base classes
@ -551,8 +552,8 @@ class CORE_EXPORT QgsFontMarkerSymbolLayer : public QgsMarkerSymbolLayer
// static stuff
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() );
static QgsSymbolLayer *createFromSld( QDomElement &element );
static QgsSymbolLayer *create( const QgsStringMap &properties = QgsStringMap() ) SIP_FACTORY;
static QgsSymbolLayer *createFromSld( QDomElement &element ) SIP_FACTORY;
// implemented from base classes

4
src/core/symbology-ng/qgsnullsymbolrenderer.h
View File

@ -50,7 +50,7 @@ class CORE_EXPORT QgsNullSymbolRenderer : public QgsFeatureRenderer
* \param element DOM element
* \returns new null symbol renderer
*/
static QgsFeatureRenderer *create( QDomElement &element );
static QgsFeatureRenderer *create( QDomElement &element ) SIP_FACTORY;
virtual QDomElement save( QDomDocument &doc ) override;
@ -58,7 +58,7 @@ class CORE_EXPORT QgsNullSymbolRenderer : public QgsFeatureRenderer
* \param renderer renderer to convert from
* \returns a new renderer if the conversion was possible, otherwise nullptr.
*/
static QgsNullSymbolRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer );
static QgsNullSymbolRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer ) SIP_FACTORY;
private:

7
src/core/symbology-ng/qgspointclusterrenderer.h
View File

@ -19,6 +19,7 @@
#define QGSPOINTCLUSTERRENDERER_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgspointdistancerenderer.h"
/** \class QgsPointClusterRenderer
@ -39,7 +40,7 @@ class CORE_EXPORT QgsPointClusterRenderer: public QgsPointDistanceRenderer
virtual QSet<QString> usedAttributes( const QgsRenderContext &context ) const override;
//! Creates a renderer from XML element
static QgsFeatureRenderer *create( QDomElement &symbologyElem );
static QgsFeatureRenderer *create( QDomElement &symbologyElem ) SIP_FACTORY;
/** Returns the symbol used for rendering clustered groups (but not ownership of the symbol).
* \see setClusterSymbol()
@ -50,12 +51,12 @@ class CORE_EXPORT QgsPointClusterRenderer: public QgsPointDistanceRenderer
* \param symbol new cluster symbol. Ownership is transferred to the renderer.
* \see clusterSymbol()
*/
void setClusterSymbol( QgsMarkerSymbol *symbol );
void setClusterSymbol( QgsMarkerSymbol *symbol SIP_TRANSFER );
/** Creates a QgsPointClusterRenderer from an existing renderer.
* \returns a new renderer if the conversion was possible, otherwise nullptr.
*/
static QgsPointClusterRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer );
static QgsPointClusterRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer ) SIP_FACTORY;
private:

7
src/core/symbology-ng/qgspointdisplacementrenderer.h
View File

@ -19,6 +19,7 @@
#define QGSPOINTDISPLACEMENTRENDERER_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgspointdistancerenderer.h"
/** \class QgsPointDisplacementRenderer
@ -49,7 +50,7 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsPointDistanceRenderer
virtual QSet<QString> usedAttributes( const QgsRenderContext &context ) const override;
//! Create a renderer from XML element
static QgsFeatureRenderer *create( QDomElement &symbologyElem );
static QgsFeatureRenderer *create( QDomElement &symbologyElem ) SIP_FACTORY;
/** Sets the line width for the displacement group circle.
* \param width line width in mm
@ -110,13 +111,13 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsPointDistanceRenderer
* \param symbol new center symbol. Ownership is transferred to the renderer.
* \see centerSymbol()
*/
void setCenterSymbol( QgsMarkerSymbol *symbol );
void setCenterSymbol( QgsMarkerSymbol *symbol SIP_TRANSFER );
/** Creates a QgsPointDisplacementRenderer from an existing renderer.
* \since QGIS 2.5
* \returns a new renderer if the conversion was possible, otherwise nullptr.
*/
static QgsPointDisplacementRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer );
static QgsPointDisplacementRenderer *convertFromRenderer( const QgsFeatureRenderer *renderer ) SIP_FACTORY;
private:

10
src/core/symbology-ng/qgsrenderer.h
View File

@ -88,7 +88,7 @@ class CORE_EXPORT QgsFeatureRenderer
// renderer takes ownership of its symbols!
//! return a new renderer - used by default in vector layers
static QgsFeatureRenderer *defaultRenderer( QgsWkbTypes::GeometryType geomType );
static QgsFeatureRenderer *defaultRenderer( QgsWkbTypes::GeometryType geomType ) SIP_FACTORY;
QString type() const { return mType; }
@ -164,7 +164,7 @@ class CORE_EXPORT QgsFeatureRenderer
*
* \returns A copy of this renderer
*/
virtual QgsFeatureRenderer *clone() const = 0;
virtual QgsFeatureRenderer *clone() const = 0 SIP_FACTORY;
/**
* Render a feature using this renderer in the given context.
@ -219,7 +219,7 @@ class CORE_EXPORT QgsFeatureRenderer
void setUsingSymbolLevels( bool usingSymbolLevels ) { mUsingSymbolLevels = usingSymbolLevels; }
//! create a renderer from XML element
static QgsFeatureRenderer *load( QDomElement &symbologyElem );
static QgsFeatureRenderer *load( QDomElement &symbologyElem ) SIP_FACTORY;
//! store renderer info to XML element
virtual QDomElement save( QDomDocument &doc );
@ -238,7 +238,7 @@ class CORE_EXPORT QgsFeatureRenderer
* went wrong
* \returns the renderer
*/
static QgsFeatureRenderer *loadSld( const QDomNode &node, QgsWkbTypes::GeometryType geomType, QString &errorMessage );
static QgsFeatureRenderer *loadSld( const QDomNode &node, QgsWkbTypes::GeometryType geomType, QString &errorMessage ) SIP_FACTORY;
//! used from subclasses to create SLD Rule elements following SLD v1.1 specs
virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const
@ -267,7 +267,7 @@ class CORE_EXPORT QgsFeatureRenderer
* \param symbol new symbol for legend item. Ownership is transferred to renderer.
* \since QGIS 2.14
*/
virtual void setLegendSymbolItem( const QString &key, QgsSymbol *symbol );
virtual void setLegendSymbolItem( const QString &key, QgsSymbol *symbol SIP_TRANSFER );
//! return a list of item text / symbol
//! \note not available in Python bindings

Some files were not shown because too many files have changed in this diff Show More