Don't insert multiple names for the same role

It doesn't make a lot of sense to have two names for the
same role. Use 'fileIcon' exclusively for the Qt::Decoration/
FileIconRole.

Change-Id: Icaa46ba4aa61efc56ba007a14bab5e59ea26cd35
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

4 files changed, 9 insertions, 8 deletions

diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index a04189513a..79a7c23e0d 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -2077,7 +2077,8 @@ void QFileSystemModelPrivate::init()
 #endif // filesystemwatcher
     q->connect(&delayedSortTimer, SIGNAL(timeout()), q, SLOT(_q_performDelayedSort()), Qt::QueuedConnection);
 
-    roleNames.insertMulti(QFileSystemModel::FileIconRole, QByteArrayLiteral("fileIcon")); // == Qt::decoration
+    roleNames.insert(QFileSystemModel::FileIconRole,
+                     QByteArrayLiteral("fileIcon")); // == Qt::decoration
     roleNames.insert(QFileSystemModel::FilePathRole, QByteArrayLiteral("filePath"));
     roleNames.insert(QFileSystemModel::FileNameRole, QByteArrayLiteral("fileName"));
     roleNames.insert(QFileSystemModel::FilePermissions, QByteArrayLiteral("filePermissions"));
diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp
index ba7ee15314..c9e7c7b7a6 100644
--- a/src/widgets/itemviews/qdirmodel.cpp
+++ b/src/widgets/itemviews/qdirmodel.cpp
@@ -1162,7 +1162,7 @@ void QDirModelPrivate::init()
     root.parent = 0;
     root.info = QFileInfo();
     clear(&root);
-    roleNames.insertMulti(QDirModel::FileIconRole, QByteArrayLiteral("fileIcon")); // == Qt::decoration
+    roleNames.insert(QDirModel::FileIconRole, QByteArrayLiteral("fileIcon")); // == Qt::decoration
     roleNames.insert(QDirModel::FilePathRole, QByteArrayLiteral("filePath"));
     roleNames.insert(QDirModel::FileNameRole, QByteArrayLiteral("fileName"));
 }
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index f910b12cc6..3f67b0e1b4 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -1048,7 +1048,7 @@ void tst_QFileSystemModel::roleNames_data()
 {
     QTest::addColumn<int>("role");
     QTest::addColumn<QByteArray>("roleName");
-    QTest::newRow("decoration") << int(Qt::DecorationRole) << QByteArray("decoration");
+    QTest::newRow("decoration") << int(Qt::DecorationRole) << QByteArray("fileIcon");
     QTest::newRow("display") << int(Qt::DisplayRole) << QByteArray("display");
     QTest::newRow("fileIcon") << int(QFileSystemModel::FileIconRole) << QByteArray("fileIcon");
     QTest::newRow("filePath") << int(QFileSystemModel::FilePathRole) << QByteArray("filePath");
@@ -1065,8 +1065,8 @@ void tst_QFileSystemModel::roleNames()
     QVERIFY(roles.contains(role));
 
     QFETCH(QByteArray, roleName);
-    QList<QByteArray> values = roles.values(role);
-    QVERIFY(values.contains(roleName));
+    QCOMPARE(roles.values(role).count(), 1);
+    QCOMPARE(roles.value(role), roleName);
 }
 
 static inline QByteArray permissionRowName(bool readOnly, int permission)
diff --git a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
index 5097f2e356..546b2ab3a8 100644
--- a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
@@ -697,7 +697,7 @@ void tst_QDirModel::roleNames_data()
 {
     QTest::addColumn<int>("role");
     QTest::addColumn<QByteArray>("roleName");
-    QTest::newRow("decoration") << int(Qt::DecorationRole) << QByteArray("decoration");
+    QTest::newRow("decoration") << int(Qt::DecorationRole) << QByteArray("fileIcon");
     QTest::newRow("display") << int(Qt::DisplayRole) << QByteArray("display");
     QTest::newRow("fileIcon") << int(QDirModel::FileIconRole) << QByteArray("fileIcon");
     QTest::newRow("filePath") << int(QDirModel::FilePathRole) << QByteArray("filePath");
@@ -713,8 +713,8 @@ void tst_QDirModel::roleNames()
     QVERIFY(roles.contains(role));
 
     QFETCH(QByteArray, roleName);
-    QList<QByteArray> values = roles.values(role);
-    QVERIFY(values.contains(roleName));
+    QCOMPARE(roles.values(role).count(), 1);
+    QCOMPARE(roles.value(role), roleName);
 }