Skip to content

Commit 11d159c

Browse files
committed
Add factory annotation and use clone for rule based renderer
1 parent 4c51956 commit 11d159c

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
149149

150150
//! convert the renderer to a rule based renderer with equivalent rules
151151
//! @note added in 2.5
152-
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
152+
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
153153

154154
protected:
155155
void rebuildHash();

python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
175175

176176
//! convert the renderer to a rule based renderer with equivalent rules
177177
//! @note added in 2.5
178-
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
178+
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
179179

180180

181181

python/core/symbology-ng/qgsrendererv2.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class QgsFeatureRendererV2
177177

178178
//! convert the renderer to a rule based renderer with equivalent rules, if possible
179179
//! @note added in 2.5
180-
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
180+
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
181181

182182
protected:
183183
QgsFeatureRendererV2( QString type );

python/core/symbology-ng/qgsrulebasedrendererv2.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
233233

234234
//! convert the renderer to a rule based renderer with equivalent rules, if possible
235235
//! @note added in 2.5
236-
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
236+
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
237237

238238
private:
239239
QgsRuleBasedRendererV2( const QgsRuleBasedRendererV2 & );

python/core/symbology-ng/qgssinglesymbolrendererv2.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class QgsSingleSymbolRendererV2 : QgsFeatureRendererV2
6868

6969
//! convert the renderer to a rule based renderer with equivalent rules
7070
//! @note added in 2.5
71-
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer();
71+
virtual QgsRuleBasedRendererV2* convertToRuleBasedRenderer() /Factory/;
7272

7373
private:
7474
QgsSingleSymbolRendererV2( const QgsSingleSymbolRendererV2 & );

src/core/symbology-ng/qgsrulebasedrendererv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,5 +1046,5 @@ QgsSymbolV2List QgsRuleBasedRendererV2::symbolsForFeature( QgsFeature& feat )
10461046

10471047
QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertToRuleBasedRenderer()
10481048
{
1049-
return this ;
1049+
return dynamic_cast<QgsRuleBasedRendererV2*>( this->clone() ) ;
10501050
}

0 commit comments

Comments
 (0)