Revert change of rule-based renderer identifier as it breaks project files

wonder-sk · wonder-sk · commit 48db9a218db9 · 2014-09-15T12:12:18.000+07:00
diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
@@ -450,7 +450,7 @@ QgsInvertedPolygonRenderer* QgsInvertedPolygonRenderer::convertFromRenderer( con
   if ( renderer->type() == "singleSymbol" ||
        renderer->type() == "categorizedSymbol" ||
        renderer->type() == "graduatedSymbol" ||
-       renderer->type() == "ruleRenderer" )
+       renderer->type() == "RuleRenderer" )
   {
     return new QgsInvertedPolygonRenderer( renderer->clone() );
   }
diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
@@ -528,7 +528,7 @@ QgsPointDisplacementRenderer* QgsPointDisplacementRenderer::convertFromRenderer(
   if ( renderer->type() == "singleSymbol" ||
        renderer->type() == "categorizedSymbol" ||
        renderer->type() == "graduatedSymbol" ||
-       renderer->type() == "ruleRenderer" )
+       renderer->type() == "RuleRenderer" )
   {
     QgsPointDisplacementRenderer* pointRenderer = new QgsPointDisplacementRenderer();
     pointRenderer->setEmbeddedRenderer( renderer->clone() );
diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -467,7 +467,7 @@ QgsFeatureRendererV2* QgsFeatureRendererV2::loadSld( const QDomNode &node, QGis:
   QString rendererType;
   if ( needRuleRenderer )
   {
-    rendererType = "ruleRenderer";
+    rendererType = "RuleRenderer";
   }
   else
   {
diff --git a/src/core/symbology-ng/qgsrendererv2registry.cpp b/src/core/symbology-ng/qgsrendererv2registry.cpp
@@ -38,7 +38,7 @@ QgsRendererV2Registry::QgsRendererV2Registry()
                                           QObject::tr( "Graduated" ),
                                           QgsGraduatedSymbolRendererV2::create ) );
 
-  addRenderer( new QgsRendererV2Metadata( "ruleRenderer",
+  addRenderer( new QgsRendererV2Metadata( "RuleRenderer",
                                           QObject::tr( "Rule-based" ),
                                           QgsRuleBasedRendererV2::create,
                                           QgsRuleBasedRendererV2::createFromSld ) );
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -739,12 +739,12 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomE
 /////////////////////
 
 QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsRuleBasedRendererV2::Rule* root )
-    : QgsFeatureRendererV2( "ruleRenderer" ), mRootRule( root )
+    : QgsFeatureRendererV2( "RuleRenderer" ), mRootRule( root )
 {
 }
 
 QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsSymbolV2* defaultSymbol )
-    : QgsFeatureRendererV2( "ruleRenderer" )
+    : QgsFeatureRendererV2( "RuleRenderer" )
 {
   mRootRule = new Rule( NULL ); // root has no symbol, no filter etc - just a container
   mRootRule->appendChild( new Rule( defaultSymbol ) );
@@ -1058,7 +1058,7 @@ QgsSymbolV2List QgsRuleBasedRendererV2::symbolsForFeature( QgsFeature& feat )
 
 QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFeatureRendererV2* renderer )
 {
-  if ( renderer->type() == "ruleRenderer" )
+  if ( renderer->type() == "RuleRenderer" )
   {
     return dynamic_cast<QgsRuleBasedRendererV2*>( renderer->clone() );
   }
diff --git a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
@@ -65,7 +65,7 @@ static void _initRendererWidgetFunctions()
   _initRenderer( "singleSymbol", QgsSingleSymbolRendererV2Widget::create, "rendererSingleSymbol.png" );
   _initRenderer( "categorizedSymbol", QgsCategorizedSymbolRendererV2Widget::create, "rendererCategorizedSymbol.png" );
   _initRenderer( "graduatedSymbol", QgsGraduatedSymbolRendererV2Widget::create, "rendererGraduatedSymbol.png" );
-  _initRenderer( "ruleRenderer", QgsRuleBasedRendererV2Widget::create );
+  _initRenderer( "RuleRenderer", QgsRuleBasedRendererV2Widget::create );
   _initRenderer( "pointDisplacement", QgsPointDisplacementRendererWidget::create );
   _initRenderer( "invertedPolygonRenderer", QgsInvertedPolygonRendererWidget::create );
   initialized = true;

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ QgsInvertedPolygonRenderer* QgsInvertedPolygonRenderer::convertFromRenderer( con`
`450`	`450`	`if ( renderer->type() == "singleSymbol" \|\|`
`451`	`451`	`renderer->type() == "categorizedSymbol" \|\|`
`452`	`452`	`renderer->type() == "graduatedSymbol" \|\|`
`453`		`- renderer->type() == "ruleRenderer" )`
	`453`	`+ renderer->type() == "RuleRenderer" )`
`454`	`454`	`{`
`455`	`455`	`return new QgsInvertedPolygonRenderer( renderer->clone() );`
`456`	`456`	`}`
Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ QgsPointDisplacementRenderer* QgsPointDisplacementRenderer::convertFromRenderer(`
`528`	`528`	`if ( renderer->type() == "singleSymbol" \|\|`
`529`	`529`	`renderer->type() == "categorizedSymbol" \|\|`
`530`	`530`	`renderer->type() == "graduatedSymbol" \|\|`
`531`		`- renderer->type() == "ruleRenderer" )`
	`531`	`+ renderer->type() == "RuleRenderer" )`
`532`	`532`	`{`
`533`	`533`	`QgsPointDisplacementRenderer* pointRenderer = new QgsPointDisplacementRenderer();`
`534`	`534`	`pointRenderer->setEmbeddedRenderer( renderer->clone() );`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ QgsFeatureRendererV2* QgsFeatureRendererV2::loadSld( const QDomNode &node, QGis:`
`467`	`467`	`QString rendererType;`
`468`	`468`	`if ( needRuleRenderer )`
`469`	`469`	`{`
`470`		`- rendererType = "ruleRenderer";`
	`470`	`+ rendererType = "RuleRenderer";`
`471`	`471`	`}`
`472`	`472`	`else`
`473`	`473`	`{`
Original file line number	Diff line number	Diff line change
`@@ -739,12 +739,12 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomE`
`739`	`739`	`/////////////////////`
`740`	`740`
`741`	`741`	`QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsRuleBasedRendererV2::Rule* root )`
`742`		`- : QgsFeatureRendererV2( "ruleRenderer" ), mRootRule( root )`
	`742`	`+ : QgsFeatureRendererV2( "RuleRenderer" ), mRootRule( root )`
`743`	`743`	`{`
`744`	`744`	`}`
`745`	`745`
`746`	`746`	`QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsSymbolV2* defaultSymbol )`
`747`		`- : QgsFeatureRendererV2( "ruleRenderer" )`
	`747`	`+ : QgsFeatureRendererV2( "RuleRenderer" )`
`748`	`748`	`{`
`749`	`749`	`mRootRule = new Rule( NULL ); // root has no symbol, no filter etc - just a container`
`750`	`750`	`mRootRule->appendChild( new Rule( defaultSymbol ) );`
`@@ -1058,7 +1058,7 @@ QgsSymbolV2List QgsRuleBasedRendererV2::symbolsForFeature( QgsFeature& feat )`
`1058`	`1058`
`1059`	`1059`	`QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFeatureRendererV2* renderer )`
`1060`	`1060`	`{`
`1061`		`- if ( renderer->type() == "ruleRenderer" )`
	`1061`	`+ if ( renderer->type() == "RuleRenderer" )`
`1062`	`1062`	`{`
`1063`	`1063`	`return dynamic_cast<QgsRuleBasedRendererV2*>( renderer->clone() );`
`1064`	`1064`	`}`