Skip to content

Commit

Permalink
Return derived classes from clone() methods, avoids need to
Browse files Browse the repository at this point in the history
dynamic_cast results
  • Loading branch information
nyalldawson committed Nov 12, 2015
1 parent dfb1585 commit cdf21b7
Show file tree
Hide file tree
Showing 141 changed files with 221 additions and 221 deletions.
2 changes: 1 addition & 1 deletion python/core/diagram/qgsdiagram.sip
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class QgsDiagram
virtual ~QgsDiagram();
/** Returns an instance that is equivalent to this one
* @note added in 2.4 */
virtual QgsDiagram* clone() const = 0;
virtual QgsDiagram* clone() const = 0 /Factory/;

void clearCache();
QgsExpression* getExpression( const QString& expression, const QgsFields* fields ) /Deprecated/;
Expand Down
2 changes: 1 addition & 1 deletion python/core/diagram/qgshistogramdiagram.sip
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class QgsHistogramDiagram: QgsDiagram
QgsHistogramDiagram();
~QgsHistogramDiagram();

virtual QgsDiagram* clone() const;
virtual QgsHistogramDiagram* clone() const /Factory/;

void renderDiagram( const QgsFeature& feature, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position );

Expand Down
2 changes: 1 addition & 1 deletion python/core/diagram/qgspiediagram.sip
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class QgsPieDiagram: QgsDiagram
QgsPieDiagram();
~QgsPieDiagram();

virtual QgsDiagram* clone() const;
virtual QgsPieDiagram* clone() const /Factory/;

void renderDiagram( const QgsFeature& feature, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position );

Expand Down
2 changes: 1 addition & 1 deletion python/core/diagram/qgstextdiagram.sip
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class QgsTextDiagram: QgsDiagram

QgsTextDiagram();
~QgsTextDiagram();
virtual QgsDiagram* clone() const;
virtual QgsTextDiagram* clone() const /Factory/;

void renderDiagram( const QgsFeature& feature, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position );

Expand Down
2 changes: 1 addition & 1 deletion python/core/effects/qgsblureffect.sip
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class QgsBlurEffect : QgsPaintEffect
virtual QString type() const;
virtual QgsStringMap properties() const;
virtual void readProperties( const QgsStringMap& props );
virtual QgsPaintEffect* clone() const /Factory/;
virtual QgsBlurEffect* clone() const /Factory/;

/** Sets blur level (strength)
* @param level blur level. Depending on the current @link blurMethod @endlink, this parameter
Expand Down
2 changes: 1 addition & 1 deletion python/core/effects/qgscoloreffect.sip
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class QgsColorEffect : QgsPaintEffect
virtual QString type() const;
virtual QgsStringMap properties() const;
virtual void readProperties( const QgsStringMap& props );
virtual QgsPaintEffect* clone() const /Factory/;
virtual QgsColorEffect* clone() const /Factory/;

/** Sets the brightness modification for the effect.
* @param brightness Valid values are between -255 and 255, where 0 represents
Expand Down
2 changes: 1 addition & 1 deletion python/core/effects/qgseffectstack.sip
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class QgsEffectStack : QgsPaintEffect
virtual ~QgsEffectStack();

virtual QString type() const;
virtual QgsPaintEffect* clone() const /Factory/;
virtual QgsEffectStack* clone() const /Factory/;
virtual bool saveProperties( QDomDocument& doc, QDomElement& element ) const;
virtual bool readProperties( const QDomElement& element );

Expand Down
4 changes: 2 additions & 2 deletions python/core/effects/qgsgloweffect.sip
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class QgsOuterGlowEffect : QgsGlowEffect
QgsOuterGlowEffect();
virtual ~QgsOuterGlowEffect();
virtual QString type() const;
virtual QgsPaintEffect* clone() const /Factory/;
virtual QgsOuterGlowEffect* clone() const /Factory/;

protected:

Expand Down Expand Up @@ -243,7 +243,7 @@ class QgsInnerGlowEffect : QgsGlowEffect
virtual ~QgsInnerGlowEffect();

virtual QString type() const;
virtual QgsPaintEffect* clone() const /Factory/;
virtual QgsInnerGlowEffect* clone() const /Factory/;

protected:

Expand Down
2 changes: 1 addition & 1 deletion python/core/effects/qgspainteffect.sip
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ class QgsDrawSourceEffect : QgsPaintEffect
static QgsPaintEffect* create( const QgsStringMap& map ) /Factory/;

virtual QString type() const;
virtual QgsPaintEffect* clone() const /Factory/;
virtual QgsDrawSourceEffect* clone() const /Factory/;
virtual QgsStringMap properties() const;
virtual void readProperties( const QgsStringMap& props );

Expand Down
4 changes: 2 additions & 2 deletions python/core/effects/qgsshadoweffect.sip
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class QgsDropShadowEffect : QgsShadowEffect
virtual ~QgsDropShadowEffect();

virtual QString type() const;
virtual QgsPaintEffect* clone() const /Factory/;
virtual QgsDropShadowEffect* clone() const /Factory/;

protected:

Expand Down Expand Up @@ -209,7 +209,7 @@ class QgsInnerShadowEffect : QgsShadowEffect
virtual ~QgsInnerShadowEffect();

virtual QString type() const;
virtual QgsPaintEffect* clone() const /Factory/;
virtual QgsInnerShadowEffect* clone() const /Factory/;

protected:

Expand Down
2 changes: 1 addition & 1 deletion python/core/effects/qgstransformeffect.sip
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class QgsTransformEffect : QgsPaintEffect
virtual QString type() const;
virtual QgsStringMap properties() const;
virtual void readProperties( const QgsStringMap& props );
virtual QgsPaintEffect* clone() const /Factory/;
virtual QgsTransformEffect* clone() const /Factory/;

/** Sets the transform x translation.
* @param translateX distance to translate along the x axis
Expand Down
2 changes: 1 addition & 1 deletion python/core/layertree/qgslayertreegroup.sip
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class QgsLayerTreeGroup : QgsLayerTreeNode
virtual QString dump() const;

//! Return a clone of the group. The children are cloned too.
virtual QgsLayerTreeNode* clone() const /Factory/;
virtual QgsLayerTreeGroup* clone() const /Factory/;

//! Return the check state of the group node
Qt::CheckState isVisible() const;
Expand Down
2 changes: 1 addition & 1 deletion python/core/layertree/qgslayertreelayer.sip
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class QgsLayerTreeLayer : QgsLayerTreeNode

virtual QString dump() const;

virtual QgsLayerTreeNode* clone() const /Factory/;
virtual QgsLayerTreeLayer* clone() const /Factory/;

signals:
//! emitted when a previously unavailable layer got loaded
Expand Down
8 changes: 4 additions & 4 deletions python/core/qgscolorscheme.sip
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class QgsUserColorScheme : QgsGplColorScheme

virtual QString schemeName() const;

virtual QgsColorScheme* clone() const;
virtual QgsUserColorScheme* clone() const /Factory/;

virtual bool isEditable() const;

Expand Down Expand Up @@ -178,7 +178,7 @@ class QgsRecentColorScheme : QgsColorScheme
virtual QgsNamedColorList fetchColors( const QString &context = QString(),
const QColor &baseColor = QColor() );

QgsColorScheme* clone() const /Factory/;
virtual QgsRecentColorScheme* clone() const /Factory/;
};

/** \ingroup core
Expand Down Expand Up @@ -209,7 +209,7 @@ class QgsCustomColorScheme : QgsColorScheme

virtual bool setColors( const QgsNamedColorList &colors, const QString &context = QString(), const QColor &baseColor = QColor() );

QgsColorScheme* clone() const /Factory/;
virtual QgsCustomColorScheme* clone() const /Factory/;
};

/** \ingroup core
Expand Down Expand Up @@ -239,5 +239,5 @@ class QgsProjectColorScheme : QgsColorScheme

virtual bool setColors( const QgsNamedColorList &colors, const QString &context = QString(), const QColor &baseColor = QColor() );

QgsColorScheme* clone() const /Factory/;
virtual QgsProjectColorScheme* clone() const /Factory/;
};
6 changes: 3 additions & 3 deletions python/core/qgsdiagramrendererv2.sip
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class QgsDiagramRendererV2

/** Returns new instance that is equivalent to this one
* @note added in 2.4 */
virtual QgsDiagramRendererV2* clone() const = 0;
virtual QgsDiagramRendererV2* clone() const = 0 /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 );
Expand Down Expand Up @@ -198,7 +198,7 @@ class QgsSingleCategoryDiagramRenderer : QgsDiagramRendererV2
QgsSingleCategoryDiagramRenderer();
~QgsSingleCategoryDiagramRenderer();

QgsDiagramRendererV2* clone() const;
virtual QgsSingleCategoryDiagramRenderer* clone() const /Factory/;

QString rendererName() const;

Expand Down Expand Up @@ -229,7 +229,7 @@ class QgsLinearlyInterpolatedDiagramRenderer : QgsDiagramRendererV2
QgsLinearlyInterpolatedDiagramRenderer();
~QgsLinearlyInterpolatedDiagramRenderer();

QgsDiagramRendererV2* clone() const;
virtual QgsLinearlyInterpolatedDiagramRenderer* clone() const /Factory/;

/** Returns list with all diagram settings in the renderer*/
QList<QgsDiagramSettings> diagramSettings() const;
Expand Down
2 changes: 1 addition & 1 deletion python/core/qgspallabeling.sip
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
QgsLabelingResults* takeResults() /TransferBack/;

//! called when passing engine among map renderers
virtual QgsLabelingEngineInterface* clone() /Factory/;
virtual QgsPalLabeling* clone() /Factory/;

//! @note not available in python bindings
// void drawLabelCandidateRect( pal::LabelPosition* lp, QPainter* painter, const QgsMapToPixel* xform );
Expand Down
2 changes: 1 addition & 1 deletion python/core/raster/qgsbilinearrasterresampler.sip
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ class QgsBilinearRasterResampler : QgsRasterResampler

void resample( const QImage& srcImage, QImage& dstImage );
QString type() const;
QgsRasterResampler * clone() const /Factory/;
virtual QgsBilinearRasterResampler * clone() const /Factory/;
};
2 changes: 1 addition & 1 deletion python/core/raster/qgsbrightnesscontrastfilter.sip
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class QgsBrightnessContrastFilter : QgsRasterInterface
QgsBrightnessContrastFilter( QgsRasterInterface *input = 0 );
~QgsBrightnessContrastFilter();

QgsRasterInterface * clone() const /Factory/;
virtual QgsBrightnessContrastFilter * clone() const /Factory/;

int bandCount() const;

Expand Down
2 changes: 1 addition & 1 deletion python/core/raster/qgscubicrasterresampler.sip
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class QgsCubicRasterResampler: QgsRasterResampler
public:
QgsCubicRasterResampler();
~QgsCubicRasterResampler();
QgsRasterResampler * clone() const /Factory/;
virtual QgsCubicRasterResampler * clone() const /Factory/;
void resample( const QImage& srcImage, QImage& dstImage );
QString type() const;
};
2 changes: 1 addition & 1 deletion python/core/raster/qgshuesaturationfilter.sip
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class QgsHueSaturationFilter : QgsRasterInterface
QgsHueSaturationFilter( QgsRasterInterface *input = 0 );
~QgsHueSaturationFilter();

QgsRasterInterface * clone() const /Factory/;
virtual QgsHueSaturationFilter * clone() const /Factory/;

int bandCount() const;

Expand Down
2 changes: 1 addition & 1 deletion python/core/raster/qgsmultibandcolorrenderer.sip
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class QgsMultiBandColorRenderer: QgsRasterRenderer
QgsContrastEnhancement* redEnhancement = 0, QgsContrastEnhancement* greenEnhancement = 0,
QgsContrastEnhancement* blueEnhancement = 0 );
~QgsMultiBandColorRenderer();
QgsRasterInterface * clone() const /Factory/;
virtual QgsMultiBandColorRenderer * clone() const /Factory/;

static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;

Expand Down