Show all layer fields in labeling dialog

mhugent · mhugent · commit 5b23cf6ffdcc · 2011-02-17T12:07:42.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15181 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -303,8 +303,9 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
 
 void QgsLabelingGui::populateFieldNames()
 {
-  QgsFieldMap fields = mLayer->dataProvider()->fields();
-  for ( QgsFieldMap::iterator it = fields.begin(); it != fields.end(); it++ )
+  const QgsFieldMap& fields = mLayer->pendingFields();
+  QgsFieldMap::const_iterator it = fields.constBegin();
+  for ( ; it != fields.constEnd(); it++ )
   {
     cboFieldName->addItem( it->name() );
   }

Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,9 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()`
`303`	`303`
`304`	`304`	`void QgsLabelingGui::populateFieldNames()`
`305`	`305`	`{`
`306`		`- QgsFieldMap fields = mLayer->dataProvider()->fields();`
`307`		`- for ( QgsFieldMap::iterator it = fields.begin(); it != fields.end(); it++ )`
	`306`	`+ const QgsFieldMap& fields = mLayer->pendingFields();`
	`307`	`+ QgsFieldMap::const_iterator it = fields.constBegin();`
	`308`	`+ for ( ; it != fields.constEnd(); it++ )`
`308`	`309`	`{`
`309`	`310`	`cboFieldName->addItem( it->name() );`
`310`	`311`	`}`