ProjectManager: Return FilePaths from ProjectImporter::importCandidates

Proliferates FilePath use a bit further. Actual changes to the
individual importers are left for further patches.

Change-Id: Ie7c6b2e3f4ac7d0eca6d2f56d30fb23354bb404b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2022-09-26 14:21:12 +02:00
parent bcadea2285
commit 985c8b1a43
11 changed files with 28 additions and 49 deletions

View File

@@ -25,15 +25,13 @@
#include <utils/temporarydirectory.h>
#include <QApplication>
#include <QDir>
#include <QLoggingCategory>
using namespace ProjectExplorer;
using namespace QtSupport;
using namespace Utils;
namespace CMakeProjectManager {
namespace Internal {
namespace CMakeProjectManager::Internal {
static Q_LOGGING_CATEGORY(cmInputLog, "qtc.cmake.import", QtWarningMsg);
@@ -104,7 +102,7 @@ CMakeProjectImporter::CMakeProjectImporter(const FilePath &path, const PresetsDa
}
QStringList CMakeProjectImporter::importCandidates()
FilePaths CMakeProjectImporter::importCandidates()
{
FilePaths candidates;
@@ -131,7 +129,7 @@ QStringList CMakeProjectImporter::importCandidates()
const FilePaths finalists = Utils::filteredUnique(candidates);
qCInfo(cmInputLog) << "import candidates:" << finalists;
return finalists;
return Utils::transform(finalists, &FilePath::fromString);
}
static CMakeConfig configurationFromPresetProbe(
@@ -685,8 +683,7 @@ void CMakeProjectImporter::persistTemporaryCMake(Kit *k, const QVariantList &vl)
qCDebug(cmInputLog) << "Temporary CMake tool made persistent.";
}
} // namespace Internal
} // namespace CMakeProjectManager
} // CMakeProjectManager::Internal
#ifdef WITH_TESTS