diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-10-07 14:46:06 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-07 13:47:53 +0000 |
commit | 8eb4d52342fe3a6ede1c1dce3174d95bfa0cea88 (patch) | |
tree | 0f5556c5e4098e75853e3d9ee2620e0306f0cf2a /src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp | |
parent | 90de29d530dfc2921d5179977b3393c11a3cc238 (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/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp')
-rw-r--r-- | src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp index 0f53839126..b3b06f9dc4 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp @@ -135,7 +135,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog( QString candidatePath = targetDir + defaultAssetFolder + quick3DFolder; int candidatePriority = 5; - for (const auto &importPath : qAsConst(importPaths)) { + for (const auto &importPath : std::as_const(importPaths)) { if (importPath.startsWith(targetDir)) { const bool isDefaultFolder = importPath.endsWith(defaultAssetFolder); const QString assetFolder = importPath + quick3DFolder; @@ -197,7 +197,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog( // Create tab for each supported extension group that also has files included in the import QMap<QString, int> tabMap; // QMap used for alphabetical order - for (const auto &file : qAsConst(m_quick3DFiles)) { + for (const auto &file : std::as_const(m_quick3DFiles)) { auto extIt = supportedExts.constBegin(); QString ext = QFileInfo(file).suffix().toLower(); while (extIt != supportedExts.constEnd()) { @@ -252,7 +252,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog( this, &ItemLibraryAssetImportDialog::setImportProgress); addInfo(tr("Select import options and press \"Import\" to import the following files:")); - for (const auto &file : qAsConst(m_quick3DFiles)) + for (const auto &file : std::as_const(m_quick3DFiles)) addInfo(file); connect(ui->advancedSettingsButton, &QPushButton::clicked, @@ -751,7 +751,7 @@ QGridLayout *ItemLibraryAssetImportDialog::createOptionsGrid( // Ungrouped options are spread evenly under the groups int totalRowCount = (rowIndex[0] + rowIndex[1] + widgets[0].size() + 1) / 2; - for (const auto &rowWidgets : qAsConst(widgets[0])) { + for (const auto &rowWidgets : std::as_const(widgets[0])) { int col = rowIndex[0] < totalRowCount ? 0 : 1; insertOptionToLayout(col, rowWidgets); } @@ -898,11 +898,11 @@ void ItemLibraryAssetImportDialog::onClose() void ItemLibraryAssetImportDialog::toggleAdvanced() { m_advancedMode = !m_advancedMode; - for (const auto &widget : qAsConst(m_simpleData.contentWidgets)) { + for (const auto &widget : std::as_const(m_simpleData.contentWidgets)) { if (widget) widget->setVisible(!m_advancedMode); } - for (const auto &widget : qAsConst(m_advancedData.contentWidgets)) { + for (const auto &widget : std::as_const(m_advancedData.contentWidgets)) { if (widget) widget->setVisible(m_advancedMode); } |