Add factory annotation and use clone for rule based renderer

qgis · Sep 9, 2014 · 11d159cd85e8e69135b1dc03fb259690a5a8e618 · 11d159c
1 parent 4c51956
commit 11d159cd85e8e69135b1dc03fb259690a5a8e618
diff --git a/python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip b/python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip
@@ -149,7 +149,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
 
     //! convert the renderer to a rule based renderer with equivalent rules
     //! @note added in 2.5
-    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
+    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
 
   protected:
     void rebuildHash();

diff --git a/python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip b/python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip
@@ -175,7 +175,7 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
 
     //! convert the renderer to a rule based renderer with equivalent rules
     //! @note added in 2.5
-    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
+    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
 
 
 

diff --git a/python/core/symbology-ng/qgsrendererv2.sip b/python/core/symbology-ng/qgsrendererv2.sip
@@ -177,7 +177,7 @@ class QgsFeatureRendererV2
 
     //! convert the renderer to a rule based renderer with equivalent rules, if possible
     //! @note added in 2.5
-    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
+    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
 
   protected:
     QgsFeatureRendererV2( QString type );

diff --git a/python/core/symbology-ng/qgsrulebasedrendererv2.sip b/python/core/symbology-ng/qgsrulebasedrendererv2.sip
@@ -233,7 +233,7 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
 
     //! convert the renderer to a rule based renderer with equivalent rules, if possible
     //! @note added in 2.5
-    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
+    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
 
   private:
     QgsRuleBasedRendererV2( const QgsRuleBasedRendererV2 & );

diff --git a/python/core/symbology-ng/qgssinglesymbolrendererv2.sip b/python/core/symbology-ng/qgssinglesymbolrendererv2.sip
@@ -68,7 +68,7 @@ class QgsSingleSymbolRendererV2 : QgsFeatureRendererV2
 
     //! convert the renderer to a rule based renderer with equivalent rules
     //! @note added in 2.5
-    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
+    virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
 
   private:
     QgsSingleSymbolRendererV2( const QgsSingleSymbolRendererV2 & );

diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -1046,5 +1046,5 @@ QgsSymbolV2List QgsRuleBasedRendererV2::symbolsForFeature( QgsFeature& feat )
 
 QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertToRuleBasedRenderer()
 {
-  return this ;
+  return dynamic_cast<QgsRuleBasedRendererV2*>( this->clone() ) ;
 }