1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileSystemModel: memoize roleNames()

Browse Source 
The return value of this function is constant and some users call this
function often (an earlier version of QGenericItemModel did, possibly
QML does?), so memoize the result of the function instead of
re-creating the QHash on every call.

Use QAbstractItemModelPrivate::defaultRoleNames() so we don't need
an instance to get the base class' contents. Add a comment to keep
the two in sync.

As a drive-by, port from the QByteArrayLiteral macro to _ba UDLs.

Amends 32b586864e3a4398da38c045f4ac0823c3dc3c57.

Pick-to: 6.8
Change-Id: If00b51e60930c974e6f8f928711dc78ba1f42b93
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit fde232c855d59009503fe6dbaadd10346ab0830a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2025-03-17 16:00:43 +01:00 committed by Qt Cherry-pick Bot
parent c6b9d41f78
commit 34c5b311fc
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/itemmodels/qabstractitemmodel.cpp
View File

@ -2655,6 +2655,8 @@ QSize QAbstractItemModel::span(const QModelIndex &) const
*/
QHash<int,QByteArray> QAbstractItemModel::roleNames() const
{
// if the return value ever becomes dependent on *this, also change the following overrides:
// - QFileSystemModel
return QAbstractItemModelPrivate::defaultRoleNames();
}

16
src/gui/itemmodels/qfilesystemmodel.cpp
View File

@ -1269,13 +1269,15 @@ Qt::DropActions QFileSystemModel::supportedDropActions() const
*/
QHash<int, QByteArray> QFileSystemModel::roleNames() const
{
auto ret = QAbstractItemModel::roleNames();
ret.insert(QFileSystemModel::FileIconRole,
QByteArrayLiteral("fileIcon")); // == Qt::decoration
ret.insert(QFileSystemModel::FilePathRole, QByteArrayLiteral("filePath"));
ret.insert(QFileSystemModel::FileNameRole, QByteArrayLiteral("fileName"));
ret.insert(QFileSystemModel::FilePermissions, QByteArrayLiteral("filePermissions"));
ret.insert(QFileSystemModel::FileInfoRole, QByteArrayLiteral("fileInfo"));
static auto ret = [] {
auto ret = QAbstractItemModelPrivate::defaultRoleNames();
ret.insert(QFileSystemModel::FileIconRole, "fileIcon"_ba); // == Qt::decoration
ret.insert(QFileSystemModel::FilePathRole, "filePath"_ba);
ret.insert(QFileSystemModel::FileNameRole, "fileName"_ba);
ret.insert(QFileSystemModel::FilePermissions, "filePermissions"_ba);
ret.insert(QFileSystemModel::FileInfoRole, "fileInfo"_ba);
return ret;
}();
return ret;
}