feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use Qt's QFileInfoList instead of QList<QFileInfo>

Browse Source 
Helps to adapt to potential upstream changes in Qt 6

Change-Id: Ie154bd4fd513d46cb0493758be8943fc4581d71c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-05-28 08:40:56 +02:00
parent 7c93b26792
commit 92a52a7181
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
View File

@@ -1278,7 +1278,7 @@ void NodeInstanceServer::loadDummyContextObjectFile(const QFileInfo& qmlFileInfo
void NodeInstanceServer::loadDummyDataFiles(const QString& directory)
{
QDir dir(directory, "*.qml");
QList<QFileInfo> 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<QFileInfo> filePathList = dir.entryInfoList();
QFileInfoList filePathList = dir.entryInfoList();
QString baseName = QFileInfo(fileUrl().toLocalFile()).completeBaseName();
foreach (const QFileInfo &qmlFileInfo, filePathList) {
if (qmlFileInfo.completeBaseName() == baseName)

4
src/plugins/projectexplorer/customwizard/customwizard.cpp
View File

@@ -406,7 +406,7 @@ QList<Core::IWizardFactory *> CustomWizard::createWizards()
const QDir::Filters filters = QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot;
const QDir::SortFlags sortflags = QDir::Name|QDir::IgnoreCase;
QList<QFileInfo> 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<Core::IWizardFactory *> CustomWizard::createWizards()
break;
}
} else {
QList<QFileInfo> subDirs = dir.entryInfoList(filters, sortflags);
QFileInfoList subDirs = dir.entryInfoList(filters, sortflags);
if (!subDirs.isEmpty()) {
// There is no QList::prepend(QList)...
dirs.swap(subDirs);

2
src/plugins/projectexplorer/gnumakeparser.cpp
View File

@@ -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<QFileInfo> possibleFiles;
QFileInfoList possibleFiles;
foreach (const QString &dir, m_directories) {
QFileInfo candidate(dir + QLatin1Char('/') + filePath);
if (candidate.exists()

4
src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
View File

@@ -225,7 +225,7 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
const QDir::Filters filters = QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot;
const QDir::SortFlags sortflags = QDir::Name|QDir::IgnoreCase;
QList<QFileInfo> dirs = dir.entryInfoList(filters, sortflags);
QFileInfoList dirs = dir.entryInfoList(filters, sortflags);
while (!dirs.isEmpty()) {
const QFileInfo dirFi = dirs.takeFirst();
@@ -285,7 +285,7 @@ QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
result << factory;
} else {
QList<QFileInfo> subDirs = current.entryInfoList(filters, sortflags);
QFileInfoList subDirs = current.entryInfoList(filters, sortflags);
if (!subDirs.isEmpty()) {
// There is no QList::prepend(QList)...
dirs.swap(subDirs);

2
src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
View File

@@ -141,7 +141,7 @@ Core::GeneratedFiles JsonWizardScannerGenerator::scan(const QString &dir, const
if (!directory.exists())
return result;
QList<QFileInfo> 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());

2
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -356,7 +356,7 @@ static QList<FileNode *> scanForFilesRecursively(const Utils::FileName &director
if (visitedCount == visited.count())
return result;
const QList<QFileInfo> 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<double>(entries.count());
int lastIntProgress = 0;

2
src/plugins/projectexplorer/session.cpp
View File

@@ -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<QFileInfo> 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());

2
src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
View File

@@ -60,7 +60,7 @@ private: // functions
void addImport(int pos, const Import &import);
void removeImport(int pos);
void parseDirectories();
QList<QFileInfo> 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;

8
src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
View File

@@ -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<QFileInfo> monitoredList = watchedFiles(canonicalDirPath);
QList<QFileInfo> 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<QFileInfo> SubComponentManager::watchedFiles(const QString &canonicalDirPath)
QFileInfoList SubComponentManager::watchedFiles(const QString &canonicalDirPath)
{
QList<QFileInfo> files;
QFileInfoList files;
foreach (const QString &monitoredFile, m_watcher.files()) {
QFileInfo fileInfo(monitoredFile);

2
src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
View File

@@ -328,7 +328,7 @@ void pathComplete(const AssistInterface *interface, QList<AssistProposalItemInte
return;
}
const QList<QFileInfo> entryInfoList
const QFileInfoList entryInfoList
= baseDir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
for (const QFileInfo &entry : entryInfoList) {
const QString &fileName = entry.fileName();

2
tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp
View File

@@ -124,7 +124,7 @@ private slots:
void test();
private:
QList<QFileInfo> m_files;
QFileInfoList m_files;
QStringList m_basePaths;
};