forked from qt-creator/qt-creator
Utils: Rename FilePathList to simply FilePaths
The exact storage type does not really matter here. Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -633,7 +633,7 @@ QList<ProjectExplorer::ExtraCompiler *> CMakeBuildSystem::findExtraCompilers()
|
||||
|
||||
// Find all files generated by any of the extra compilers, in a rather crude way.
|
||||
Project *p = project();
|
||||
const FilePathList fileList = p->files([&fileExtensions, p](const Node *n) {
|
||||
const FilePaths fileList = p->files([&fileExtensions, p](const Node *n) {
|
||||
if (!p->SourceFiles(n))
|
||||
return false;
|
||||
const QString fp = n->filePath().toString();
|
||||
@@ -660,7 +660,7 @@ QList<ProjectExplorer::ExtraCompiler *> CMakeBuildSystem::findExtraCompilers()
|
||||
if (generated.isEmpty())
|
||||
continue;
|
||||
|
||||
const FilePathList fileNames = transform(generated, [](const QString &s) {
|
||||
const FilePaths fileNames = transform(generated, [](const QString &s) {
|
||||
return FilePath::fromString(s);
|
||||
});
|
||||
extraCompilers.append(factory->create(p, file, fileNames));
|
||||
|
||||
@@ -61,7 +61,7 @@ int distance(const FilePath &targetDirectory, const FilePath &fileName)
|
||||
void CMakeCbpParser::sortFiles()
|
||||
{
|
||||
QLoggingCategory log("qtc.cmakeprojectmanager.filetargetmapping", QtWarningMsg);
|
||||
FilePathList fileNames = transform<QList>(m_fileList, &FileNode::filePath);
|
||||
FilePaths fileNames = transform<QList>(m_fileList, &FileNode::filePath);
|
||||
|
||||
sort(fileNames);
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools()
|
||||
{
|
||||
Utils::Environment env = Environment::systemEnvironment();
|
||||
|
||||
Utils::FilePathList path = env.path();
|
||||
Utils::FilePaths path = env.path();
|
||||
path = Utils::filteredUnique(path);
|
||||
|
||||
if (HostOsInfo::isWindowsHost()) {
|
||||
@@ -93,7 +93,7 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools()
|
||||
|
||||
const QStringList execs = env.appendExeExtensions(QLatin1String("cmake"));
|
||||
|
||||
FilePathList suspects;
|
||||
FilePaths suspects;
|
||||
foreach (const Utils::FilePath &base, path) {
|
||||
if (base.isEmpty())
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user