[QGIS Commit] r15181 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-02-17 04:07:42 -0800 (Thu, 17 Feb 2011)
New Revision: 15181

Modified:
   trunk/qgis/src/app/qgslabelinggui.cpp
Log:
Show all layer fields in labeling dialog

Modified: trunk/qgis/src/app/qgslabelinggui.cpp
===================================================================
--- trunk/qgis/src/app/qgslabelinggui.cpp	2011-02-17 09:15:25 UTC (rev 15180)
+++ trunk/qgis/src/app/qgslabelinggui.cpp	2011-02-17 12:07:42 UTC (rev 15181)
@@ -303,8 +303,9 @@
 
 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() );
   }