Return derived classes from clone() methods, avoids need to

dynamic_cast results
qgis · Nov 12, 2015 · cdf21b7 · cdf21b7
1 parent dfb1585
commit cdf21b7
Show file tree

Hide file tree

Showing 141 changed files with 221 additions and 221 deletions.
diff --git a/python/core/diagram/qgsdiagram.sip b/python/core/diagram/qgsdiagram.sip
@@ -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/;

diff --git a/python/core/diagram/qgshistogramdiagram.sip b/python/core/diagram/qgshistogramdiagram.sip
@@ -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 );
 

diff --git a/python/core/diagram/qgspiediagram.sip b/python/core/diagram/qgspiediagram.sip
@@ -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 );
 

diff --git a/python/core/diagram/qgstextdiagram.sip b/python/core/diagram/qgstextdiagram.sip
@@ -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 );
 

diff --git a/python/core/effects/qgsblureffect.sip b/python/core/effects/qgsblureffect.sip
@@ -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

diff --git a/python/core/effects/qgscoloreffect.sip b/python/core/effects/qgscoloreffect.sip
@@ -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

diff --git a/python/core/effects/qgseffectstack.sip b/python/core/effects/qgseffectstack.sip
@@ -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 );
 

diff --git a/python/core/effects/qgsgloweffect.sip b/python/core/effects/qgsgloweffect.sip
@@ -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:
 
@@ -243,7 +243,7 @@ class QgsInnerGlowEffect : QgsGlowEffect
     virtual ~QgsInnerGlowEffect();
 
     virtual QString type() const;
-    virtual QgsPaintEffect* clone() const /Factory/;
+    virtual QgsInnerGlowEffect* clone() const /Factory/;
 
   protected:
 

diff --git a/python/core/effects/qgspainteffect.sip b/python/core/effects/qgspainteffect.sip
@@ -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 );
 

diff --git a/python/core/effects/qgsshadoweffect.sip b/python/core/effects/qgsshadoweffect.sip
@@ -175,7 +175,7 @@ class QgsDropShadowEffect : QgsShadowEffect
     virtual ~QgsDropShadowEffect();
 
     virtual QString type() const;
-    virtual QgsPaintEffect* clone() const /Factory/;
+    virtual QgsDropShadowEffect* clone() const /Factory/;
 
   protected:
 
@@ -209,7 +209,7 @@ class QgsInnerShadowEffect : QgsShadowEffect
     virtual ~QgsInnerShadowEffect();
 
     virtual QString type() const;
-    virtual QgsPaintEffect* clone() const /Factory/;
+    virtual QgsInnerShadowEffect* clone() const /Factory/;
 
   protected:
 

diff --git a/python/core/effects/qgstransformeffect.sip b/python/core/effects/qgstransformeffect.sip
@@ -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

diff --git a/python/core/layertree/qgslayertreegroup.sip b/python/core/layertree/qgslayertreegroup.sip
@@ -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;

diff --git a/python/core/layertree/qgslayertreelayer.sip b/python/core/layertree/qgslayertreelayer.sip
@@ -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

diff --git a/python/core/qgscolorscheme.sip b/python/core/qgscolorscheme.sip
@@ -134,7 +134,7 @@ class QgsUserColorScheme : QgsGplColorScheme
 
     virtual QString schemeName() const;
 
-    virtual QgsColorScheme* clone() const;
+    virtual QgsUserColorScheme* clone() const /Factory/;
 
     virtual bool isEditable() const;
 
@@ -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
@@ -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
@@ -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/;
 };
diff --git a/python/core/qgsdiagramrendererv2.sip b/python/core/qgsdiagramrendererv2.sip
@@ -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 );
@@ -198,7 +198,7 @@ class QgsSingleCategoryDiagramRenderer : QgsDiagramRendererV2
     QgsSingleCategoryDiagramRenderer();
     ~QgsSingleCategoryDiagramRenderer();
 
-    QgsDiagramRendererV2* clone() const;
+    virtual QgsSingleCategoryDiagramRenderer* clone() const /Factory/;
 
     QString rendererName() const;
 
@@ -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;

diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -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 );

diff --git a/python/core/raster/qgsbilinearrasterresampler.sip b/python/core/raster/qgsbilinearrasterresampler.sip
@@ -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/;
 };
diff --git a/python/core/raster/qgsbrightnesscontrastfilter.sip b/python/core/raster/qgsbrightnesscontrastfilter.sip
@@ -7,7 +7,7 @@ class QgsBrightnessContrastFilter : QgsRasterInterface
     QgsBrightnessContrastFilter( QgsRasterInterface *input = 0 );
     ~QgsBrightnessContrastFilter();
 
-    QgsRasterInterface * clone() const /Factory/;
+    virtual QgsBrightnessContrastFilter * clone() const /Factory/;
 
     int bandCount() const;
 

diff --git a/python/core/raster/qgscubicrasterresampler.sip b/python/core/raster/qgscubicrasterresampler.sip
@@ -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;
 };
diff --git a/python/core/raster/qgshuesaturationfilter.sip b/python/core/raster/qgshuesaturationfilter.sip
@@ -17,7 +17,7 @@ class QgsHueSaturationFilter : QgsRasterInterface
     QgsHueSaturationFilter( QgsRasterInterface *input = 0 );
     ~QgsHueSaturationFilter();
 
-    QgsRasterInterface * clone() const /Factory/;
+    virtual QgsHueSaturationFilter * clone() const /Factory/;
 
     int bandCount() const;
 

diff --git a/python/core/raster/qgsmultibandcolorrenderer.sip b/python/core/raster/qgsmultibandcolorrenderer.sip
@@ -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/;
 

diff --git a/python/core/raster/qgspalettedrasterrenderer.sip b/python/core/raster/qgspalettedrasterrenderer.sip
@@ -7,7 +7,7 @@ class QgsPalettedRasterRenderer : QgsRasterRenderer
     /** Renderer owns color array*/
     QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QColor* colorArray /Array,Transfer/, int nColors /ArraySize/, const QVector<QString>& labels = QVector<QString>() );
     ~QgsPalettedRasterRenderer();
-    QgsRasterInterface * clone() const /Factory/;
+    virtual QgsPalettedRasterRenderer * clone() const /Factory/;
     static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterInterface* input ) /Factory/;
 
     QgsRasterBlock *block( int bandNo, const QgsRectangle & extent, int width, int height ) /Factory/;

diff --git a/python/core/raster/qgsrasternuller.sip b/python/core/raster/qgsrasternuller.sip
@@ -13,7 +13,7 @@ class QgsRasterNuller : QgsRasterInterface
       double max;
     };
 
-    QgsRasterInterface * clone() const /Factory/;
+    virtual QgsRasterNuller * clone() const /Factory/;
 
     int bandCount() const;
 

diff --git a/python/core/raster/qgsrasterprojector.sip b/python/core/raster/qgsrasterprojector.sip
@@ -44,7 +44,7 @@ class QgsRasterProjector : QgsRasterInterface
     /** \brief The destructor */
     ~QgsRasterProjector();
 
-    QgsRasterInterface *clone() const /Factory/;
+    virtual QgsRasterProjector *clone() const /Factory/;
 
     int bandCount() const;
 

diff --git a/python/core/raster/qgsrasterrenderer.sip b/python/core/raster/qgsrasterrenderer.sip
@@ -9,7 +9,7 @@ class QgsRasterRenderer : QgsRasterInterface
     QgsRasterRenderer( QgsRasterInterface* input = 0, const QString& type = "" );
     virtual ~QgsRasterRenderer();
 
-    virtual QgsRasterInterface * clone() const = 0 /Factory/;
+    virtual QgsRasterRenderer * clone() const = 0 /Factory/;
 
     virtual int bandCount() const;
 

diff --git a/python/core/raster/qgsrasterresamplefilter.sip b/python/core/raster/qgsrasterresamplefilter.sip
@@ -11,7 +11,7 @@ class QgsRasterResampleFilter : QgsRasterInterface
     QgsRasterResampleFilter( QgsRasterInterface *input = 0 );
     ~QgsRasterResampleFilter();
 
-    QgsRasterInterface * clone() const /Factory/;
+    virtual QgsRasterResampleFilter * clone() const /Factory/;
 
     int bandCount() const;
 

diff --git a/python/core/raster/qgssinglebandcolordatarenderer.sip b/python/core/raster/qgssinglebandcolordatarenderer.sip
@@ -6,7 +6,7 @@ class QgsSingleBandColorDataRenderer: QgsRasterRenderer
   public:
     QgsSingleBandColorDataRenderer( QgsRasterDataProvider* provider, int band );
     ~QgsSingleBandColorDataRenderer();
-    QgsRasterInterface * clone() const /Factory/;
+    virtual QgsSingleBandColorDataRenderer * clone() const /Factory/;
 
     static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 

diff --git a/python/core/raster/qgssinglebandgrayrenderer.sip b/python/core/raster/qgssinglebandgrayrenderer.sip
@@ -12,7 +12,7 @@ class QgsSingleBandGrayRenderer: QgsRasterRenderer
 
     QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand );
     ~QgsSingleBandGrayRenderer();
-    QgsRasterInterface * clone() const /Factory/;
+    virtual QgsSingleBandGrayRenderer * clone() const /Factory/;
 
     static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 

diff --git a/python/core/raster/qgssinglebandpseudocolorrenderer.sip b/python/core/raster/qgssinglebandpseudocolorrenderer.sip
@@ -7,7 +7,7 @@ class QgsSingleBandPseudoColorRenderer: QgsRasterRenderer
     /** Note: takes ownership of QgsRasterShader*/
     QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader /Transfer/ );
     ~QgsSingleBandPseudoColorRenderer();
-    QgsRasterInterface * clone() const /Factory/;
+    virtual QgsSingleBandPseudoColorRenderer * clone() const /Factory/;
 
     static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
 

diff --git a/python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip b/python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip
@@ -59,7 +59,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
 
     virtual QString dump() const;
 
-    virtual QgsFeatureRendererV2* clone() const /Factory/;
+    virtual QgsCategorizedSymbolRendererV2* clone() const /Factory/;
 
     virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
 

diff --git a/python/core/symbology-ng/qgsellipsesymbollayerv2.sip b/python/core/symbology-ng/qgsellipsesymbollayerv2.sip
@@ -15,7 +15,7 @@ class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2
     QString layerType() const;
     void startRender( QgsSymbolV2RenderContext& context );
     void stopRender( QgsSymbolV2RenderContext& context );
-    QgsSymbolLayerV2* clone() const /Factory/;
+    virtual QgsEllipseSymbolLayerV2* clone() const /Factory/;
     QgsStringMap properties() const;
 
     void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props ) const;