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

Utils: Rename FileName to FilePath

Browse Source 
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>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljstools/qmljslocatordata.cpp
View File

@@ -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;
}

2
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

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