QgsFieldModel use attributeDisplayName (fix #10451)

3nids · 3nids · commit 9019805b4466 · 2014-06-05T09:28:13.000+02:00
diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp
@@ -232,10 +232,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
       {
         return mExpression[exprIdx];
       }
-      QgsField field = mFields[index.internalId()];
-      const QMap< QString, QString > aliases = mLayer->attributeAliases();
-      QString alias = aliases.value( field.name(), field.name() );
-      return alias;
+      return mLayer->attributeDisplayName( index.internalId() );
     }
 
     case Qt::ForegroundRole:

Original file line number	Diff line number	Diff line change
`@@ -232,10 +232,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const`
`232`	`232`	`{`
`233`	`233`	`return mExpression[exprIdx];`
`234`	`234`	`}`
`235`		`- QgsField field = mFields[index.internalId()];`
`236`		`- const QMap< QString, QString > aliases = mLayer->attributeAliases();`
`237`		`- QString alias = aliases.value( field.name(), field.name() );`
`238`		`- return alias;`
	`235`	`+ return mLayer->attributeDisplayName( index.internalId() );`
`239`	`236`	`}`
`240`	`237`
`241`	`238`	`case Qt::ForegroundRole:`