Followup 08ee180: more appropriate ramp type property name

nirvn · nirvn · commit c8266a251296 · 2016-12-05T08:47:35.000+07:00
diff --git a/src/core/effects/qgsgloweffect.cpp b/src/core/effects/qgsgloweffect.cpp
@@ -176,7 +176,7 @@ void QgsGlowEffect::readProperties( const QgsStringMap &props )
 
   //attempt to create color ramp from props
   delete mRamp;
-  if ( props.contains( QStringLiteral( "gradientType" ) ) && props[QStringLiteral( "gradientType" )] == QStringLiteral( "cpt-city" ) )
+  if ( props.contains( QStringLiteral( "rampType" ) ) && props[QStringLiteral( "rampType" )] == QStringLiteral( "cpt-city" ) )
   {
     mRamp = QgsCptCityColorRamp::create( props );
   }
diff --git a/src/core/qgscolorramp.cpp b/src/core/qgscolorramp.cpp
@@ -218,7 +218,7 @@ QgsStringMap QgsGradientColorRamp::properties() const
     map["info_" + it.key()] = it.value();
   }
 
-  map[QStringLiteral( "gradientType" )] = type();
+  map[QStringLiteral( "rampType" )] = type();
   return map;
 }
 void QgsGradientColorRamp::convertToDiscrete( bool discrete )
@@ -368,7 +368,7 @@ QgsStringMap QgsLimitedRandomColorRamp::properties() const
   map[QStringLiteral( "satMax" )] = QString::number( mSatMax );
   map[QStringLiteral( "valMin" )] = QString::number( mValMin );
   map[QStringLiteral( "valMax" )] = QString::number( mValMax );
-  map[QStringLiteral( "gradientType" )] = type();
+  map[QStringLiteral( "rampType" )] = type();
   return map;
 }
 
@@ -586,7 +586,7 @@ QgsStringMap QgsColorBrewerColorRamp::properties() const
   map[QStringLiteral( "schemeName" )] = mSchemeName;
   map[QStringLiteral( "colors" )] = QString::number( mColors );
   map[QStringLiteral( "inverted" )] = QString::number( mInverted );
-  map[QStringLiteral( "gradientType" )] = type();
+  map[QStringLiteral( "rampType" )] = type();
   return map;
 }
 
@@ -675,7 +675,7 @@ QgsStringMap QgsCptCityColorRamp::properties() const
   QgsStringMap map;
   map[QStringLiteral( "schemeName" )] = mSchemeName;
   map[QStringLiteral( "variantName" )] = mVariantName;
-  map[QStringLiteral( "gradientType" )] = type();
+  map[QStringLiteral( "rampType" )] = type();
   return map;
 }
 
@@ -890,7 +890,7 @@ QgsStringMap QgsPresetSchemeColorRamp::properties() const
     props.insert( QStringLiteral( "preset_color_%1" ).arg( i ), QgsSymbolLayerUtils::encodeColor( mColors.at( i ).first ) );
     props.insert( QStringLiteral( "preset_color_name_%1" ).arg( i ), mColors.at( i ).second );
   }
-  props[QStringLiteral( "gradientType" )] = type();
+  props[QStringLiteral( "rampType" )] = type();
   return props;
 }
 
diff --git a/src/core/symbology-ng/qgsfillsymbollayer.cpp b/src/core/symbology-ng/qgsfillsymbollayer.cpp
@@ -539,7 +539,7 @@ QgsSymbolLayer* QgsGradientFillSymbolLayer::create( const QgsStringMap& props )
 
   //attempt to create color ramp from props
   QgsColorRamp* gradientRamp;
-  if ( props.contains( QStringLiteral( "gradientType" ) ) && props[QStringLiteral( "gradientType" )] == QStringLiteral( "cpt-city" ) )
+  if ( props.contains( QStringLiteral( "rampType" ) ) && props[QStringLiteral( "rampType" )] == QStringLiteral( "cpt-city" ) )
   {
     gradientRamp = QgsCptCityColorRamp::create( props );
   }
@@ -1027,7 +1027,7 @@ QgsSymbolLayer* QgsShapeburstFillSymbolLayer::create( const QgsStringMap& props
 
   //attempt to create color ramp from props
   QgsColorRamp* gradientRamp;
-  if ( props.contains( QStringLiteral( "gradientType" ) ) && props["gradientType"] == QStringLiteral( "cpt-city" ) )
+  if ( props.contains( QStringLiteral( "rampType" ) ) && props["rampType"] == QStringLiteral( "cpt-city" ) )
   {
     gradientRamp = QgsCptCityColorRamp::create( props );
   }

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ void QgsGlowEffect::readProperties( const QgsStringMap &props )`
`176`	`176`
`177`	`177`	`//attempt to create color ramp from props`
`178`	`178`	`delete mRamp;`
`179`		`- if ( props.contains( QStringLiteral( "gradientType" ) ) && props[QStringLiteral( "gradientType" )] == QStringLiteral( "cpt-city" ) )`
	`179`	`+ if ( props.contains( QStringLiteral( "rampType" ) ) && props[QStringLiteral( "rampType" )] == QStringLiteral( "cpt-city" ) )`
`180`	`180`	`{`
`181`	`181`	`mRamp = QgsCptCityColorRamp::create( props );`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ QgsStringMap QgsGradientColorRamp::properties() const`
`218`	`218`	`map["info_" + it.key()] = it.value();`
`219`	`219`	`}`
`220`	`220`
`221`		`- map[QStringLiteral( "gradientType" )] = type();`
	`221`	`+ map[QStringLiteral( "rampType" )] = type();`
`222`	`222`	`return map;`
`223`	`223`	`}`
`224`	`224`	`void QgsGradientColorRamp::convertToDiscrete( bool discrete )`
`@@ -368,7 +368,7 @@ QgsStringMap QgsLimitedRandomColorRamp::properties() const`
`368`	`368`	`map[QStringLiteral( "satMax" )] = QString::number( mSatMax );`
`369`	`369`	`map[QStringLiteral( "valMin" )] = QString::number( mValMin );`
`370`	`370`	`map[QStringLiteral( "valMax" )] = QString::number( mValMax );`
`371`		`- map[QStringLiteral( "gradientType" )] = type();`
	`371`	`+ map[QStringLiteral( "rampType" )] = type();`
`372`	`372`	`return map;`
`373`	`373`	`}`
`374`	`374`
`@@ -586,7 +586,7 @@ QgsStringMap QgsColorBrewerColorRamp::properties() const`
`586`	`586`	`map[QStringLiteral( "schemeName" )] = mSchemeName;`
`587`	`587`	`map[QStringLiteral( "colors" )] = QString::number( mColors );`
`588`	`588`	`map[QStringLiteral( "inverted" )] = QString::number( mInverted );`
`589`		`- map[QStringLiteral( "gradientType" )] = type();`
	`589`	`+ map[QStringLiteral( "rampType" )] = type();`
`590`	`590`	`return map;`
`591`	`591`	`}`
`592`	`592`
`@@ -675,7 +675,7 @@ QgsStringMap QgsCptCityColorRamp::properties() const`
`675`	`675`	`QgsStringMap map;`
`676`	`676`	`map[QStringLiteral( "schemeName" )] = mSchemeName;`
`677`	`677`	`map[QStringLiteral( "variantName" )] = mVariantName;`
`678`		`- map[QStringLiteral( "gradientType" )] = type();`
	`678`	`+ map[QStringLiteral( "rampType" )] = type();`
`679`	`679`	`return map;`
`680`	`680`	`}`
`681`	`681`
`@@ -890,7 +890,7 @@ QgsStringMap QgsPresetSchemeColorRamp::properties() const`
`890`	`890`	`props.insert( QStringLiteral( "preset_color_%1" ).arg( i ), QgsSymbolLayerUtils::encodeColor( mColors.at( i ).first ) );`
`891`	`891`	`props.insert( QStringLiteral( "preset_color_name_%1" ).arg( i ), mColors.at( i ).second );`
`892`	`892`	`}`
`893`		`- props[QStringLiteral( "gradientType" )] = type();`
	`893`	`+ props[QStringLiteral( "rampType" )] = type();`
`894`	`894`	`return props;`
`895`	`895`	`}`
`896`	`896`
Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ QgsSymbolLayer* QgsGradientFillSymbolLayer::create( const QgsStringMap& props )`
`539`	`539`
`540`	`540`	`//attempt to create color ramp from props`
`541`	`541`	`QgsColorRamp* gradientRamp;`
`542`		`- if ( props.contains( QStringLiteral( "gradientType" ) ) && props[QStringLiteral( "gradientType" )] == QStringLiteral( "cpt-city" ) )`
	`542`	`+ if ( props.contains( QStringLiteral( "rampType" ) ) && props[QStringLiteral( "rampType" )] == QStringLiteral( "cpt-city" ) )`
`543`	`543`	`{`
`544`	`544`	`gradientRamp = QgsCptCityColorRamp::create( props );`
`545`	`545`	`}`
`@@ -1027,7 +1027,7 @@ QgsSymbolLayer* QgsShapeburstFillSymbolLayer::create( const QgsStringMap& props`
`1027`	`1027`
`1028`	`1028`	`//attempt to create color ramp from props`
`1029`	`1029`	`QgsColorRamp* gradientRamp;`
`1030`		`- if ( props.contains( QStringLiteral( "gradientType" ) ) && props["gradientType"] == QStringLiteral( "cpt-city" ) )`
	`1030`	`+ if ( props.contains( QStringLiteral( "rampType" ) ) && props["rampType"] == QStringLiteral( "cpt-city" ) )`
`1031`	`1031`	`{`
`1032`	`1032`	`gradientRamp = QgsCptCityColorRamp::create( props );`
`1033`	`1033`	`}`