diff options
author | hjk <hjk@qt.io> | 2019-05-28 13:49:26 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-28 12:23:26 +0000 |
commit | 473a741c9fcf09febba312464fab8385e2351181 (patch) | |
tree | 2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/plugins/modeleditor | |
parent | 4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff) | |
download | qt-creator-473a741c9fcf09febba312464fab8385e2351181.tar.gz |
Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.
Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/modeleditor')
-rw-r--r-- | src/plugins/modeleditor/modeldocument.cpp | 4 | ||||
-rw-r--r-- | src/plugins/modeleditor/modelindexer.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/modeleditor/modeldocument.cpp b/src/plugins/modeleditor/modeldocument.cpp index e47c0d1a97..875a8bc5c3 100644 --- a/src/plugins/modeleditor/modeldocument.cpp +++ b/src/plugins/modeleditor/modeldocument.cpp @@ -96,7 +96,7 @@ bool ModelDocument::save(QString *errorString, const QString &name, bool autoSav if (autoSave) { d->documentController->projectController()->setModified(); } else { - setFilePath(Utils::FileName::fromString(d->documentController->projectController()->project()->fileName())); + setFilePath(Utils::FilePath::fromString(d->documentController->projectController()->project()->fileName())); emit changed(); } @@ -152,7 +152,7 @@ Core::IDocument::OpenResult ModelDocument::load(QString *errorString, const QStr try { d->documentController->loadProject(fileName); - setFilePath(Utils::FileName::fromString(d->documentController->projectController()->project()->fileName())); + setFilePath(Utils::FilePath::fromString(d->documentController->projectController()->project()->fileName())); } catch (const qmt::FileNotFoundException &ex) { *errorString = ex.errorMessage(); return OpenResult::ReadError; diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp index 3fa1703ea9..e03fb4eb03 100644 --- a/src/plugins/modeleditor/modelindexer.cpp +++ b/src/plugins/modeleditor/modelindexer.cpp @@ -392,11 +392,11 @@ void ModelIndexer::scanProject(ProjectExplorer::Project *project) return; // TODO harmonize following code with findFirstModel()? - const Utils::FileNameList files = project->files(ProjectExplorer::Project::SourceFiles); + const Utils::FilePathList files = project->files(ProjectExplorer::Project::SourceFiles); QQueue<QueuedFile> filesQueue; QSet<QueuedFile> filesSet; - for (const Utils::FileName &file : files) { + for (const Utils::FilePath &file : files) { QFileInfo fileInfo = file.toFileInfo(); Utils::MimeType mimeType = Utils::mimeTypeForFile(fileInfo); if (mimeType.name() == QLatin1String(Constants::MIME_TYPE_MODEL)) { @@ -474,10 +474,10 @@ QString ModelIndexer::findFirstModel(ProjectExplorer::FolderNode *folderNode) void ModelIndexer::forgetProject(ProjectExplorer::Project *project) { - const Utils::FileNameList files = project->files(ProjectExplorer::Project::SourceFiles); + const Utils::FilePathList files = project->files(ProjectExplorer::Project::SourceFiles); QMutexLocker locker(&d->indexerMutex); - for (const Utils::FileName &file : files) { + for (const Utils::FilePath &file : files) { const QString fileString = file.toString(); // remove file from queue QueuedFile queuedFile(fileString, project); |