summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-02-25 21:27:03 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-27 12:48:57 +0100
commit96cfca6151b674f0266e879013d69de826ce3311 (patch)
tree53174a33c5c078b4f0bb9502f6b5196f9a531f15
parentb58631ce472ce2bfce6319874468aa4e7e11b405 (diff)
Remove usage of deprecated QAbstractItemModel::setRoleNames
Change-Id: If41bf0d6d50969156269c67a15e006d38edc8e1f Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.cpp10
-rw-r--r--src/widgets/itemviews/qdirmodel.cpp8
2 files changed, 7 insertions, 11 deletions
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index 7ea4302a56..0211b2512c 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -1926,12 +1926,10 @@ void QFileSystemModelPrivate::init()
q, SIGNAL(directoryLoaded(QString)));
q->connect(&delayedSortTimer, SIGNAL(timeout()), q, SLOT(_q_performDelayedSort()), Qt::QueuedConnection);
- QHash<int, QByteArray> roles = q->roleNames();
- roles.insertMulti(QFileSystemModel::FileIconRole, "fileIcon"); // == Qt::decoration
- roles.insert(QFileSystemModel::FilePathRole, "filePath");
- roles.insert(QFileSystemModel::FileNameRole, "fileName");
- roles.insert(QFileSystemModel::FilePermissions, "filePermissions");
- q->setRoleNames(roles);
+ roleNames.insertMulti(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 67a16a836d..ee097e5c41 100644
--- a/src/widgets/itemviews/qdirmodel.cpp
+++ b/src/widgets/itemviews/qdirmodel.cpp
@@ -1169,11 +1169,9 @@ void QDirModelPrivate::init()
root.parent = 0;
root.info = QFileInfo();
clear(&root);
- QHash<int, QByteArray> roles = q->roleNames();
- roles.insertMulti(QDirModel::FileIconRole, "fileIcon"); // == Qt::decoration
- roles.insert(QDirModel::FilePathRole, "filePath");
- roles.insert(QDirModel::FileNameRole, "fileName");
- q->setRoleNames(roles);
+ roleNames.insertMulti(QDirModel::FileIconRole, QByteArrayLiteral("fileIcon")); // == Qt::decoration
+ roleNames.insert(QDirModel::FilePathRole, QByteArrayLiteral("filePath"));
+ roleNames.insert(QDirModel::FileNameRole, QByteArrayLiteral("fileName"));
}
QDirModelPrivate::QDirNode *QDirModelPrivate::node(int row, QDirNode *parent) const