Fix typo in QgsPalLabeling

qgis · Feb 7, 2013 · 995fbad · 995fbad
1 parent fbf9991
commit 995fbad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
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
       {