Skip to content
Permalink
Browse files
Fix typo in QgsPalLabeling
  • Loading branch information
dakcarto committed Feb 7, 2013
1 parent fbf9991 commit 995fbadc60236ddfa4d8f521a4c2aaf7a96cfee4
Showing with 5 additions and 5 deletions.
  1. +1 −1 python/core/qgspallabeling.sip
  2. +4 −4 src/core/qgspallabeling.cpp
@@ -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,
@@ -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
{

0 comments on commit 995fbad

Please sign in to comment.