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

CMake: FilePath-ify CMakeProjectImporter

Browse Source 
Change-Id: Ifffd3328afae60a4015d88e36b3e60b4ee492c3b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2022-09-26 14:30:46 +02:00
parent 7b9fec2aa8
commit bcadea2285
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -59,15 +59,15 @@ struct DirectoryData
QVector<ToolChainDescription> toolChains; QVector<ToolChainDescription> toolChains;
}; };
static QStringList scanDirectory(const FilePath &path, const QString &prefix) static FilePaths scanDirectory(const FilePath &path, const QString &prefix)
{ {
QStringList result; FilePaths result;
qCDebug(cmInputLog) << "Scanning for directories matching" << prefix << "in" << path; qCDebug(cmInputLog) << "Scanning for directories matching" << prefix << "in" << path;
const FilePaths entries = path.dirEntries({{prefix + "*"}, QDir::Dirs | QDir::NoDotAndDotDot}); const FilePaths entries = path.dirEntries({{prefix + "*"}, QDir::Dirs | QDir::NoDotAndDotDot});
for (const FilePath &entry : entries) { for (const FilePath &entry : entries) {
QTC_ASSERT(entry.isDir(), continue); QTC_ASSERT(entry.isDir(), continue);
result.append(entry.toString()); result.append(entry);
} }
return result; return result;
} }
@@ -106,7 +106,7 @@ CMakeProjectImporter::CMakeProjectImporter(const FilePath &path, const PresetsDa
QStringList CMakeProjectImporter::importCandidates() QStringList CMakeProjectImporter::importCandidates()
{ {
QStringList candidates; FilePaths candidates;
candidates << scanDirectory(projectFilePath().absolutePath(), "build"); candidates << scanDirectory(projectFilePath().absolutePath(), "build");
@@ -126,10 +126,10 @@ QStringList CMakeProjectImporter::importCandidates()
const FilePath configPresetDir = m_presetsTempDir.filePath(configPreset.name); const FilePath configPresetDir = m_presetsTempDir.filePath(configPreset.name);
configPresetDir.createDir(); configPresetDir.createDir();
candidates << configPresetDir.toString(); candidates << configPresetDir;
} }
const QStringList finalists = Utils::filteredUnique(candidates); const FilePaths finalists = Utils::filteredUnique(candidates);
qCInfo(cmInputLog) << "import candidates:" << finalists; qCInfo(cmInputLog) << "import candidates:" << finalists;
return finalists; return finalists;
} }