From 92a52a71812f6a444e3d1b0aaca02cdcf52044e2 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 28 May 2019 08:40:56 +0200 Subject: [PATCH] Use Qt's QFileInfoList instead of QList Helps to adapt to potential upstream changes in Qt 6 Change-Id: Ie154bd4fd513d46cb0493758be8943fc4581d71c Reviewed-by: Christian Stenger --- .../qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp | 4 ++-- src/plugins/projectexplorer/customwizard/customwizard.cpp | 4 ++-- src/plugins/projectexplorer/gnumakeparser.cpp | 2 +- .../projectexplorer/jsonwizard/jsonwizardfactory.cpp | 4 ++-- .../jsonwizard/jsonwizardscannergenerator.cpp | 2 +- src/plugins/projectexplorer/projectnodes.cpp | 2 +- src/plugins/projectexplorer/session.cpp | 2 +- .../designercore/include/subcomponentmanager.h | 2 +- .../designercore/metainfo/subcomponentmanager.cpp | 8 ++++---- .../texteditor/codeassist/keywordscompletionassist.cpp | 2 +- tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp index fb1bad0603d..a9a8111afdc 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp @@ -1278,7 +1278,7 @@ void NodeInstanceServer::loadDummyContextObjectFile(const QFileInfo& qmlFileInfo void NodeInstanceServer::loadDummyDataFiles(const QString& directory) { QDir dir(directory, "*.qml"); - QList filePathList = dir.entryInfoList(); + QFileInfoList filePathList = dir.entryInfoList(); foreach (const QFileInfo &qmlFileInfo, filePathList) { loadDummyDataFile(qmlFileInfo); } @@ -1287,7 +1287,7 @@ void NodeInstanceServer::loadDummyDataFiles(const QString& directory) void NodeInstanceServer::loadDummyDataContext(const QString& directory) { QDir dir(directory+"/context", "*.qml"); - QList filePathList = dir.entryInfoList(); + QFileInfoList filePathList = dir.entryInfoList(); QString baseName = QFileInfo(fileUrl().toLocalFile()).completeBaseName(); foreach (const QFileInfo &qmlFileInfo, filePathList) { if (qmlFileInfo.completeBaseName() == baseName) diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index 9a3ea42a4e1..1f925434316 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp @@ -406,7 +406,7 @@ QList CustomWizard::createWizards() const QDir::Filters filters = QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot; const QDir::SortFlags sortflags = QDir::Name|QDir::IgnoreCase; - QList dirs; + QFileInfoList dirs; if (userTemplateDir.exists()) { if (CustomWizardPrivate::verbose) verboseLog += QString::fromLatin1("### CustomWizard: userTemplateDir \"%1\" found, adding\n").arg(userTemplateDirName); @@ -446,7 +446,7 @@ QList CustomWizard::createWizards() break; } } else { - QList subDirs = dir.entryInfoList(filters, sortflags); + QFileInfoList subDirs = dir.entryInfoList(filters, sortflags); if (!subDirs.isEmpty()) { // There is no QList::prepend(QList)... dirs.swap(subDirs); diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp index 8932157159a..12eb8823b3e 100644 --- a/src/plugins/projectexplorer/gnumakeparser.cpp +++ b/src/plugins/projectexplorer/gnumakeparser.cpp @@ -181,7 +181,7 @@ void GnuMakeParser::taskAdded(const Task &task, int linkedLines, int skippedLine QString filePath(task.file.toString()); if (!filePath.isEmpty() && !QDir::isAbsolutePath(filePath)) { - QList possibleFiles; + QFileInfoList possibleFiles; foreach (const QString &dir, m_directories) { QFileInfo candidate(dir + QLatin1Char('/') + filePath); if (candidate.exists() diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index 6ef34d8ddc5..6acc26a10e8 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -225,7 +225,7 @@ QList JsonWizardFactory::createWizardFactories() const QDir::Filters filters = QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot; const QDir::SortFlags sortflags = QDir::Name|QDir::IgnoreCase; - QList dirs = dir.entryInfoList(filters, sortflags); + QFileInfoList dirs = dir.entryInfoList(filters, sortflags); while (!dirs.isEmpty()) { const QFileInfo dirFi = dirs.takeFirst(); @@ -285,7 +285,7 @@ QList JsonWizardFactory::createWizardFactories() result << factory; } else { - QList subDirs = current.entryInfoList(filters, sortflags); + QFileInfoList subDirs = current.entryInfoList(filters, sortflags); if (!subDirs.isEmpty()) { // There is no QList::prepend(QList)... dirs.swap(subDirs); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp index 01494d3dd22..9f24f00718b 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp @@ -141,7 +141,7 @@ Core::GeneratedFiles JsonWizardScannerGenerator::scan(const QString &dir, const if (!directory.exists()) return result; - QList entries = directory.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot, + QFileInfoList entries = directory.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot, QDir::DirsLast | QDir::Name); foreach (const QFileInfo &fi, entries) { const QString relativePath = base.relativeFilePath(fi.absoluteFilePath()); diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index 769d83fe517..dfc07ec534e 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -356,7 +356,7 @@ static QList scanForFilesRecursively(const Utils::FileName &director if (visitedCount == visited.count()) return result; - const QList entries = baseDir.entryInfoList(QStringList(), QDir::AllEntries|QDir::NoDotAndDotDot); + const QFileInfoList entries = baseDir.entryInfoList(QStringList(), QDir::AllEntries|QDir::NoDotAndDotDot); double progress = 0; const double progressIncrement = progressRange / static_cast(entries.count()); int lastIntProgress = 0; diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 3ff82eefd02..011107790a1 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -744,7 +744,7 @@ QStringList SessionManager::sessions() if (d->m_sessions.isEmpty()) { // We are not initialized yet, so do that now QDir sessionDir(ICore::userResourcePath()); - QList sessionFiles = sessionDir.entryInfoList(QStringList() << QLatin1String("*.qws"), QDir::NoFilter, QDir::Time); + QFileInfoList sessionFiles = sessionDir.entryInfoList(QStringList() << QLatin1String("*.qws"), QDir::NoFilter, QDir::Time); foreach (const QFileInfo &fileInfo, sessionFiles) { const QString &name = fileInfo.completeBaseName(); d->m_sessionDateTimes.insert(name, fileInfo.lastModified()); diff --git a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h index dc2f0732eee..da21c17cd92 100644 --- a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h +++ b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h @@ -60,7 +60,7 @@ private: // functions void addImport(int pos, const Import &import); void removeImport(int pos); void parseDirectories(); - QList watchedFiles(const QString &canonicalDirPath); + QFileInfoList watchedFiles(const QString &canonicalDirPath); void unregisterQmlFile(const QFileInfo &fileInfo, const QString &qualifier); void registerQmlFile(const QFileInfo &fileInfo, const QString &qualifier, bool addToLibrary); Model *model() const; diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index bc9dd3c1849..85a84af9a3f 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -202,8 +202,8 @@ void SubComponentManager::parseDirectory(const QString &canonicalDirPath, bool a dir.setNameFilters(QStringList(s_qmlFilePattern)); dir.setFilter(QDir::Files | QDir::Readable | QDir::CaseSensitive); - QList monitoredList = watchedFiles(canonicalDirPath); - QList newList; + QFileInfoList monitoredList = watchedFiles(canonicalDirPath); + QFileInfoList newList; foreach (const QFileInfo &qmlFile, dir.entryInfoList()) { if (QFileInfo(m_filePath.toLocalFile()) == qmlFile) { // do not parse main file @@ -280,9 +280,9 @@ void SubComponentManager::parseFile(const QString &canonicalFilePath) } // dirInfo must already contain a canonical path -QList SubComponentManager::watchedFiles(const QString &canonicalDirPath) +QFileInfoList SubComponentManager::watchedFiles(const QString &canonicalDirPath) { - QList files; + QFileInfoList files; foreach (const QString &monitoredFile, m_watcher.files()) { QFileInfo fileInfo(monitoredFile); diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp index b28e99e7a0f..b5458e0aa36 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp @@ -328,7 +328,7 @@ void pathComplete(const AssistInterface *interface, QList entryInfoList + const QFileInfoList entryInfoList = baseDir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot); for (const QFileInfo &entry : entryInfoList) { const QString &fileName = entry.fileName(); diff --git a/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp b/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp index fd6a54b59b9..886a920ed4d 100644 --- a/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp +++ b/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp @@ -124,7 +124,7 @@ private slots: void test(); private: - QList m_files; + QFileInfoList m_files; QStringList m_basePaths; };