diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2017-12-06 10:27:27 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-12-08 09:09:59 +0000 |
commit | 18f38ff18ee0b4be28d6c904bf0ebf97b364b149 (patch) | |
tree | 92bca7d3afcccd4e359c18da177a3fe1f8c48006 /src/plugins/modeleditor/modelindexer.cpp | |
parent | e6fb9f08db4250dfa12cd492311e59e11a99de1d (diff) | |
download | qt-creator-18f38ff18ee0b4be28d6c904bf0ebf97b364b149.tar.gz |
Project: Make Project::files return a FileNameList
Change-Id: I75ceb22ac65b8288d824f229d44089cba6fc8ea3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/modeleditor/modelindexer.cpp')
-rw-r--r-- | src/plugins/modeleditor/modelindexer.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp index 476edaae26..4df25cd54e 100644 --- a/src/plugins/modeleditor/modelindexer.cpp +++ b/src/plugins/modeleditor/modelindexer.cpp @@ -392,15 +392,15 @@ void ModelIndexer::scanProject(ProjectExplorer::Project *project) return; // TODO harmonize following code with findFirstModel()? - QStringList files = project->files(ProjectExplorer::Project::SourceFiles); + const Utils::FileNameList files = project->files(ProjectExplorer::Project::SourceFiles); QQueue<QueuedFile> filesQueue; QSet<QueuedFile> filesSet; - foreach (const QString &file, files) { - QFileInfo fileInfo(file); + for (const Utils::FileName &file : files) { + QFileInfo fileInfo = file.toFileInfo(); Utils::MimeType mimeType = Utils::mimeTypeForFile(fileInfo); if (mimeType.name() == QLatin1String(Constants::MIME_TYPE_MODEL)) { - QueuedFile queuedFile(file, project, fileInfo.lastModified()); + QueuedFile queuedFile(file.toString(), project, fileInfo.lastModified()); filesQueue.append(queuedFile); filesSet.insert(queuedFile); } @@ -474,20 +474,21 @@ QString ModelIndexer::findFirstModel(ProjectExplorer::FolderNode *folderNode) void ModelIndexer::forgetProject(ProjectExplorer::Project *project) { - QStringList files = project->files(ProjectExplorer::Project::SourceFiles); + const Utils::FileNameList files = project->files(ProjectExplorer::Project::SourceFiles); QMutexLocker locker(&d->indexerMutex); - foreach (const QString &file, files) { + for (const Utils::FileName &file : files) { + const QString fileString = file.toString(); // remove file from queue - QueuedFile queuedFile(file, project); + QueuedFile queuedFile(fileString, project); if (d->queuedFilesSet.contains(queuedFile)) { QMT_CHECK(d->filesQueue.contains(queuedFile)); d->filesQueue.removeOne(queuedFile); QMT_CHECK(!d->filesQueue.contains(queuedFile)); d->queuedFilesSet.remove(queuedFile); } - removeModelFile(file, project); - removeDiagramReferenceFile(file, project); + removeModelFile(fileString, project); + removeDiagramReferenceFile(fileString, project); } } |