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/qmljstools | |
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/qmljstools')
-rw-r--r-- | src/plugins/qmljstools/qmljslocatordata.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qmljstools/qmljsmodelmanager.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmljstools/qmljslocatordata.cpp b/src/plugins/qmljstools/qmljslocatordata.cpp index 01725f1d9f..3b68bf6521 100644 --- a/src/plugins/qmljstools/qmljslocatordata.cpp +++ b/src/plugins/qmljstools/qmljslocatordata.cpp @@ -48,7 +48,7 @@ LocatorData::LocatorData() connect(manager, &ModelManagerInterface::projectInfoUpdated, [manager](const ModelManagerInterface::ProjectInfo &info) { QStringList files; - for (const Utils::FileName &f: info.project->files(ProjectExplorer::Project::SourceFiles)) + for (const Utils::FilePath &f: info.project->files(ProjectExplorer::Project::SourceFiles)) files << f.toString(); manager->updateSourceFiles(files, true); }); @@ -82,7 +82,7 @@ public: if (!doc->componentName().isEmpty()) m_documentContext = doc->componentName(); else - m_documentContext = Utils::FileName::fromString(doc->fileName()).fileName(); + m_documentContext = Utils::FilePath::fromString(doc->fileName()).fileName(); accept(doc->ast(), m_documentContext); return m_entries; } diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index c06487cb67..2d996f4985 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -94,7 +94,7 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject( return fn && fn->fileType() == FileType::QML && qmlTypeNames.contains(Utils::mimeTypeForFile(fn->filePath().toString(), MimeMatchMode::MatchExtension).name()); - }), &FileName::toString); + }), &FilePath::toString); activeTarget = project->activeTarget(); } Kit *activeKit = activeTarget ? activeTarget->kit() : KitManager::defaultKit(); |