aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/resourceeditor
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-10-07 14:46:06 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-10-07 13:47:53 +0000
commit8eb4d52342fe3a6ede1c1dce3174d95bfa0cea88 (patch)
tree0f5556c5e4098e75853e3d9ee2620e0306f0cf2a /src/plugins/resourceeditor
parent90de29d530dfc2921d5179977b3393c11a3cc238 (diff)
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I88edd91395849574436299b8badda21bb93bea39 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/resourceeditor')
-rw-r--r--src/plugins/resourceeditor/qrceditor/resourcefile.cpp2
-rw-r--r--src/plugins/resourceeditor/resourceeditorplugin.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index a937ce1674..04f55ec7d0 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -432,7 +432,7 @@ QString ResourceFile::absolutePath(const QString &rel_path) const
void ResourceFile::orderList()
{
- for (Prefix *p : qAsConst(m_prefix_list)) {
+ for (Prefix *p : std::as_const(m_prefix_list)) {
std::sort(p->file_list.begin(), p->file_list.end(), [&](File *f1, File *f2) {
return *f1 < *f2;
});
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index 50686c094a..ddfaa7d27a 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -234,7 +234,7 @@ void ResourceEditorPlugin::extensionsInitialized()
}, {}, [](const FolderNode *fn) {
return dynamic_cast<const ResourceTopLevelNode *>(fn) == nullptr;
});
- for (FileNode *file : qAsConst(toReplace)) {
+ for (FileNode *file : std::as_const(toReplace)) {
FolderNode *const pn = file->parentFolderNode();
QTC_ASSERT(pn, continue);
const Utils::FilePath path = file->filePath();