backport of bugfix for #1467 to 1.0 branch

mhugent · mhugent · commit d0309c30cbd0 · 2009-01-06T11:29:47.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@9930 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgslabel.cpp b/src/core/qgslabel.cpp
@@ -700,13 +700,18 @@ bool QgsLabel::readLabelField( QDomElement &el, int attr, QString prefix = "fiel
   {
     name = el.attribute( name );
 
-    int i;
-    for ( i = 0; i < mField.size() && mField[i].name() != name; i++ )
-      ;
+    QgsFieldMap::const_iterator field_it = mField.constBegin();
+    for(; field_it != mField.constEnd(); ++field_it)
+    {
+        if(field_it.value().name() == name)
+        {
+            break;
+        }
+    }
 
-    if ( i < mField.size() )
+    if ( field_it != mField.constEnd() )
     {
-      mLabelFieldIdx[attr] = i;
+      mLabelFieldIdx[attr] = field_it.key();
       return true;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -700,13 +700,18 @@ bool QgsLabel::readLabelField( QDomElement &el, int attr, QString prefix = "fiel`
`700`	`700`	`{`
`701`	`701`	`name = el.attribute( name );`
`702`	`702`
`703`		`- int i;`
`704`		`- for ( i = 0; i < mField.size() && mField[i].name() != name; i++ )`
`705`		`- ;`
	`703`	`+ QgsFieldMap::const_iterator field_it = mField.constBegin();`
	`704`	`+ for(; field_it != mField.constEnd(); ++field_it)`
	`705`	`+ {`
	`706`	`+ if(field_it.value().name() == name)`
	`707`	`+ {`
	`708`	`+ break;`
	`709`	`+ }`
	`710`	`+ }`
`706`	`711`
`707`		`- if ( i < mField.size() )`
	`712`	`+ if ( field_it != mField.constEnd() )`
`708`	`713`	`{`
`709`		`- mLabelFieldIdx[attr] = i;`
	`714`	`+ mLabelFieldIdx[attr] = field_it.key();`
`710`	`715`	`return true;`
`711`	`716`	`}`
`712`	`717`	`}`