diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index ff206cba223..482aec91966 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1003,7 +1003,7 @@ QVersionNumber AndroidConfig::ndkVersion(const FilePath &ndkPath) const QStringList AndroidConfig::allEssentials() const { - QList installedVersions = QtVersionManager::versions( + QtVersions installedVersions = QtVersionManager::versions( [](const QtVersion *v) { return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE); }); diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 457aae4e4b3..e85da939aab 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -267,7 +267,7 @@ public: void setSearchPaths(const FilePaths &searchPaths) { m_searchPaths = searchPaths; } private: - QList autoDetectQtVersions() const; + QtVersions autoDetectQtVersions() const; QList autoDetectToolChains(); void autoDetectCMake(); void autoDetectDebugger(); @@ -704,9 +704,9 @@ void KitDetectorPrivate::listAutoDetected() const emit q->logOutput('\n' + tr("Listing of previously auto-detected kit items finished.") + "\n\n"); } -QList KitDetectorPrivate::autoDetectQtVersions() const +QtVersions KitDetectorPrivate::autoDetectQtVersions() const { - QList qtVersions; + QtVersions qtVersions; QString error; const QStringList candidates = {"qmake-qt6", "qmake-qt5", "qmake"}; @@ -794,7 +794,7 @@ void KitDetectorPrivate::autoDetect() emit q->logOutput(tr("Starting auto-detection. This will take a while...")); QList toolChains = autoDetectToolChains(); - QList qtVersions = autoDetectQtVersions(); + QtVersions qtVersions = autoDetectQtVersions(); autoDetectCMake(); autoDetectDebugger(); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 85064ecb94c..c77f468ae23 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -750,7 +750,7 @@ Tasks QmakeProject::projectIssues(const Kit *k) const // example shipped via the installer. // Report a problem if and only if the project is considered to be part of *only* a Qt // that is not the one from the current kit. - const QList qtsContainingThisProject + const QtVersions qtsContainingThisProject = QtVersionManager::versions([filePath = projectFilePath()](const QtVersion *qt) { return qt->isValid() && qt->isQtSubProject(filePath); }); diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 2e37f92d58e..269a6507168 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -270,6 +270,8 @@ private: Internal::QtVersionPrivate *d = nullptr; }; +using QtVersions = QList; + } // QtSupport Q_DECLARE_OPERATORS_FOR_FLAGS(QtSupport::QtVersion::QmakeBuildConfigs) diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index 695d48e4ae3..7f030d524f5 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -119,7 +119,7 @@ ExampleSetModel::ExampleSetModel() &ExampleSetModel::helpManagerInitialized); } -void ExampleSetModel::recreateModel(const QList &qtVersions) +void ExampleSetModel::recreateModel(const QtVersions &qtVersions) { beginResetModel(); clear(); @@ -525,7 +525,7 @@ QPixmap ExamplesListModel::fetchPixmapAndUpdatePixmapCache(const QString &url) c void ExampleSetModel::updateQtVersionList() { - QList versions = QtVersionManager::sortVersions(QtVersionManager::versions( + QtVersions versions = QtVersionManager::sortVersions(QtVersionManager::versions( [](const QtVersion *v) { return v->hasExamples() || v->hasDemos(); })); // prioritize default qt version @@ -559,7 +559,7 @@ void ExampleSetModel::updateQtVersionList() emit selectedExampleSetChanged(currentIndex); } -QtVersion *ExampleSetModel::findHighestQtVersion(const QList &versions) const +QtVersion *ExampleSetModel::findHighestQtVersion(const QtVersions &versions) const { QtVersion *newVersion = nullptr; for (QtVersion *version : versions) { diff --git a/src/plugins/qtsupport/exampleslistmodel.h b/src/plugins/qtsupport/exampleslistmodel.h index 75c7ac26fc2..42f794e696f 100644 --- a/src/plugins/qtsupport/exampleslistmodel.h +++ b/src/plugins/qtsupport/exampleslistmodel.h @@ -80,10 +80,10 @@ private: int getQtId(int index) const; int getExtraExampleSetIndex(int index) const; - QtVersion *findHighestQtVersion(const QList &versions) const; + QtVersion *findHighestQtVersion(const QtVersions &versions) const; int indexForQtVersion(QtVersion *qtVersion) const; - void recreateModel(const QList &qtVersions); + void recreateModel(const QtVersions &qtVersions); void updateQtVersionList(); void qtVersionManagerLoaded(); diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index b0935accf5d..43bbc07c1c3 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -166,7 +166,7 @@ void QtKitAspect::setup(Kit *k) const Abi tcAbi = ToolChainKitAspect::targetAbi(k); const Id deviceType = DeviceTypeKitAspect::deviceTypeId(k); - const QList matches + const QtVersions matches = QtVersionManager::versions([&tcAbi, &deviceType](const QtVersion *qt) { return qt->targetDeviceTypes().contains(deviceType) && Utils::contains(qt->qtAbis(), [&tcAbi](const Abi &qtAbi) { @@ -177,14 +177,13 @@ void QtKitAspect::setup(Kit *k) // An MSVC 2015 toolchain is compatible with an MSVC 2017 Qt, but we prefer an // MSVC 2015 Qt if we find one. - const QList exactMatches = Utils::filtered(matches, - [&tcAbi](const QtVersion *qt) { + const QtVersions exactMatches = Utils::filtered(matches, [&tcAbi](const QtVersion *qt) { return qt->qtAbis().contains(tcAbi); }); - const QList &candidates = !exactMatches.empty() ? exactMatches : matches; + const QtVersions &candidates = !exactMatches.empty() ? exactMatches : matches; QtVersion * const qtFromPath = QtVersionManager::version( - equal(&QtVersion::detectionSource, QString::fromLatin1("PATH"))); + equal(&QtVersion::detectionSource, QString("PATH"))); if (qtFromPath && candidates.contains(qtFromPath)) k->setValue(id(), qtFromPath->uniqueId()); else @@ -193,10 +192,10 @@ void QtKitAspect::setup(Kit *k) Tasks QtKitAspect::validate(const Kit *k) const { - QTC_ASSERT(QtVersionManager::isLoaded(), return { }); + QTC_ASSERT(QtVersionManager::isLoaded(), return {}); QtVersion *version = qtVersion(k); if (!version) - return { }; + return {}; return version->validateKit(k); } diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index bf8162304ad..ab8643f535f 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -883,7 +883,7 @@ void QtOptionsPageWidget::apply() QtVersionManager::setDocumentationSetting( QtVersionManager::DocumentationSetting(m_ui.documentationSetting->currentData().toInt())); - QList versions; + QtVersions versions; m_model->forItemsAtLevel<2>([&versions](QtVersionItem *item) { item->setChanged(false); versions.append(item->version()->clone()); diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 3ce60904cc8..2ca6c3a1237 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -153,7 +153,7 @@ void QtVersionManager::triggerQtVersionRestore() FileSystemWatcher::WatchModifiedDate); } // exists - const QList vs = versions(); + const QtVersions vs = versions(); updateDocumentation(vs, {}, vs); } @@ -501,13 +501,13 @@ static QList> documentationFiles(QtVersion *v) return files; } -static QStringList documentationFiles(const QList &vs, bool highestOnly = false) +static QStringList documentationFiles(const QtVersions &vs, bool highestOnly = false) { // if highestOnly is true, register each file only once per major Qt version, even if // multiple minor or patch releases of that major version are installed QHash> includedFileNames; // major Qt version -> names QSet filePaths; - const QList versions = highestOnly ? QtVersionManager::sortVersions(vs) : vs; + const QtVersions versions = highestOnly ? QtVersionManager::sortVersions(vs) : vs; for (QtVersion *v : versions) { const int majorVersion = v->qtVersion().majorVersion; QSet &majorVersionFileNames = includedFileNames[majorVersion]; @@ -521,9 +521,9 @@ static QStringList documentationFiles(const QList &vs, bool highest return filePaths.values(); } -void QtVersionManager::updateDocumentation(const QList &added, - const QList &removed, - const QList &allNew) +void QtVersionManager::updateDocumentation(const QtVersions &added, + const QtVersions &removed, + const QtVersions &allNew) { const DocumentationSetting setting = documentationSetting(); const QStringList docsOfAll = setting == DocumentationSetting::None @@ -548,18 +548,18 @@ int QtVersionManager::getUniqueId() return m_idcount++; } -QList QtVersionManager::versions(const QtVersion::Predicate &predicate) +QtVersions QtVersionManager::versions(const QtVersion::Predicate &predicate) { - QList versions; + QtVersions versions; QTC_ASSERT(isLoaded(), return versions); if (predicate) return Utils::filtered(m_versions.values(), predicate); return m_versions.values(); } -QList QtVersionManager::sortVersions(const QList &input) +QtVersions QtVersionManager::sortVersions(const QtVersions &input) { - QList result = input; + QtVersions result = input; Utils::sort(result, qtVersionNumberCompare); return result; } @@ -584,21 +584,21 @@ static bool equals(QtVersion *a, QtVersion *b) return a->equals(b); } -void QtVersionManager::setNewQtVersions(const QList &newVersions) +void QtVersionManager::setNewQtVersions(const QtVersions &newVersions) { // We want to preserve the same order as in the settings dialog // so we sort a copy - QList sortedNewVersions = newVersions; + QtVersions sortedNewVersions = newVersions; Utils::sort(sortedNewVersions, &QtVersion::uniqueId); - QList addedVersions; - QList removedVersions; + QtVersions addedVersions; + QtVersions removedVersions; QList> changedVersions; // So we trying to find the minimal set of changed versions, // iterate over both sorted list // newVersions and oldVersions iterator - QList::const_iterator nit, nend; + QtVersions::const_iterator nit, nend; VersionMap::const_iterator oit, oend; nit = sortedNewVersions.constBegin(); nend = sortedNewVersions.constEnd(); @@ -633,9 +633,9 @@ void QtVersionManager::setNewQtVersions(const QList &newVersions) } if (!changedVersions.isEmpty() || !addedVersions.isEmpty() || !removedVersions.isEmpty()) { - const QList changedOldVersions + const QtVersions changedOldVersions = Utils::transform(changedVersions, &std::pair::first); - const QList changedNewVersions + const QtVersions changedNewVersions = Utils::transform(changedVersions, &std::pair::second); updateDocumentation(addedVersions + changedNewVersions, @@ -666,7 +666,7 @@ void QtVersionManager::setDocumentationSetting(const QtVersionManager::Documenta Core::ICore::settings()->setValueWithDefault(DOCUMENTATION_SETTING_KEY, int(setting), 0); // force re-evaluating which documentation should be registered // by claiming that all are removed and re-added - const QList vs = versions(); + const QtVersions vs = versions(); updateDocumentation(vs, vs, vs); } diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h index 2845efa8c9b..d36aeb1464d 100644 --- a/src/plugins/qtsupport/qtversionmanager.h +++ b/src/plugins/qtsupport/qtversionmanager.h @@ -53,12 +53,12 @@ public: // Note: DO NOT STORE THESE POINTERS! // The QtVersionManager may delete them at random times and you will // need to get a new pointer by calling this function again! - static QList versions(const QtVersion::Predicate &predicate = QtVersion::Predicate()); + static QtVersions versions(const QtVersion::Predicate &predicate = {}); static QtVersion *version(int id); static QtVersion *version(const QtVersion::Predicate &predicate); // Sorting is potentially expensive since it might require qmake --query to run for each version! - static QList sortVersions(const QList &input); + static QtVersions sortVersions(const QtVersions &input); static void addVersion(QtVersion *version); static void removeVersion(QtVersion *version); @@ -76,14 +76,14 @@ signals: private: enum class DocumentationSetting { HighestOnly, All, None }; - static void updateDocumentation(const QList &added, - const QList &removed, - const QList &allNew); + static void updateDocumentation(const QtVersions &added, + const QtVersions &removed, + const QtVersions &allNew); void updateFromInstaller(bool emitSignal = true); void triggerQtVersionRestore(); // Used by QtOptionsPage - static void setNewQtVersions(const QList &newVersions); + static void setNewQtVersions(const QtVersions &newVersions); static void setDocumentationSetting(const DocumentationSetting &setting); static DocumentationSetting documentationSetting(); // Used by QtVersion