Fix typo in QgsPalLabeling

dakcarto · dakcarto · commit 995fbadc6023 · 2013-02-07T15:22:19.000-07:00
diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -48,7 +48,7 @@ class QgsPalLayerSettings
       MultiRight
     };
 
-    // update mDataDefinedNames in constructor when adding new enum value
+    // update mDataDefinedNames QList in constructor when adding/deleting enum value
     enum DataDefinedProperties
     {
       Size = 0,
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -428,10 +428,10 @@ void QgsPalLayerSettings::readDataDefinedProperty( QgsVectorLayer* layer,
   QVariant oldPropertyField = layer->customProperty( oldPropertyName );
 
   // Fix to migrate from old-style vector api, where returned QMap keys possibly
-  //   had 'holes' in sequence of field indecies, e.g. 0,2,3
+  //   had 'holes' in sequence of field indices, e.g. 0,2,3
   // QgsAttrPalIndexNameHash provides a means of access field name in sequences from
   //   providers that procuded holes (e.g. PostGIS skipped geom column), otherwise it is empty
-  QgsAttrPalIndexNameHash oldIndeciesToNames = layer->dataProvider()->palAttributeIndexNames();
+  QgsAttrPalIndexNameHash oldIndicesToNames = layer->dataProvider()->palAttributeIndexNames();
 
   QString name;
   if ( newPropertyField.isValid() )
@@ -450,9 +450,9 @@ void QgsPalLayerSettings::readDataDefinedProperty( QgsVectorLayer* layer,
 
     if ( conversionOk )
     {
-      if ( !oldIndeciesToNames.isEmpty() )
+      if ( !oldIndicesToNames.isEmpty() )
       {
-        name = oldIndeciesToNames.value( indx );
+        name = oldIndicesToNames.value( indx );
       }
       else
       {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class QgsPalLayerSettings`
`48`	`48`	`MultiRight`
`49`	`49`	`};`
`50`	`50`
`51`		`- // update mDataDefinedNames in constructor when adding new enum value`
	`51`	`+ // update mDataDefinedNames QList in constructor when adding/deleting enum value`
`52`	`52`	`enum DataDefinedProperties`
`53`	`53`	`{`
`54`	`54`	`Size = 0,`
Original file line number	Diff line number	Diff line change
`@@ -428,10 +428,10 @@ void QgsPalLayerSettings::readDataDefinedProperty( QgsVectorLayer* layer,`
`428`	`428`	`QVariant oldPropertyField = layer->customProperty( oldPropertyName );`
`429`	`429`
`430`	`430`	`// Fix to migrate from old-style vector api, where returned QMap keys possibly`
`431`		`- // had 'holes' in sequence of field indecies, e.g. 0,2,3`
	`431`	`+ // had 'holes' in sequence of field indices, e.g. 0,2,3`
`432`	`432`	`// QgsAttrPalIndexNameHash provides a means of access field name in sequences from`
`433`	`433`	`// providers that procuded holes (e.g. PostGIS skipped geom column), otherwise it is empty`
`434`		`- QgsAttrPalIndexNameHash oldIndeciesToNames = layer->dataProvider()->palAttributeIndexNames();`
	`434`	`+ QgsAttrPalIndexNameHash oldIndicesToNames = layer->dataProvider()->palAttributeIndexNames();`
`435`	`435`
`436`	`436`	`QString name;`
`437`	`437`	`if ( newPropertyField.isValid() )`
`@@ -450,9 +450,9 @@ void QgsPalLayerSettings::readDataDefinedProperty( QgsVectorLayer* layer,`
`450`	`450`
`451`	`451`	`if ( conversionOk )`
`452`	`452`	`{`
`453`		`- if ( !oldIndeciesToNames.isEmpty() )`
	`453`	`+ if ( !oldIndicesToNames.isEmpty() )`
`454`	`454`	`{`
`455`		`- name = oldIndeciesToNames.value( indx );`
	`455`	`+ name = oldIndicesToNames.value( indx );`
`456`	`456`	`}`
`457`	`457`	`else`
`458`	`458`	`{`