From 473a741c9fcf09febba312464fab8385e2351181 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 28 May 2019 13:49:26 +0200 Subject: 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 --- src/plugins/projectexplorer/toolchainsettingsaccessor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/projectexplorer/toolchainsettingsaccessor.cpp') diff --git a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp index 83ac914aca..d2c347dd37 100644 --- a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp +++ b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp @@ -184,7 +184,7 @@ ToolChainSettingsAccessor::ToolChainSettingsAccessor() : QCoreApplication::translate("ProjectExplorer::ToolChainManager", "Tool Chains"), Core::Constants::IDE_DISPLAY_NAME) { - setBaseFilePath(FileName::fromString(Core::ICore::userResourcePath() + TOOLCHAIN_FILENAME)); + setBaseFilePath(FilePath::fromString(Core::ICore::userResourcePath() + TOOLCHAIN_FILENAME)); addVersionUpgrader(std::make_unique()); } @@ -193,7 +193,7 @@ QList ToolChainSettingsAccessor::restoreToolChains(QWidget *parent) { // read all tool chains from SDK const QList systemFileTcs - = toolChains(restoreSettings(FileName::fromString(Core::ICore::installerResourcePath() + TOOLCHAIN_FILENAME), + = toolChains(restoreSettings(FilePath::fromString(Core::ICore::installerResourcePath() + TOOLCHAIN_FILENAME), parent)); for (ToolChain * const systemTc : systemFileTcs) systemTc->setDetection(ToolChain::AutoDetectionFromSdk); @@ -321,11 +321,11 @@ public: LanguageExtensions languageExtensions(const QStringList &cxxflags) const override { Q_UNUSED(cxxflags); return LanguageExtension::None; } WarningFlags warningFlags(const QStringList &cflags) const override { Q_UNUSED(cflags); return WarningFlags::NoWarnings; } BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner() const override { return BuiltInHeaderPathsRunner(); } - HeaderPaths builtInHeaderPaths(const QStringList &cxxflags, const FileName &sysRoot) const override + HeaderPaths builtInHeaderPaths(const QStringList &cxxflags, const FilePath &sysRoot) const override { Q_UNUSED(cxxflags); Q_UNUSED(sysRoot); return {}; } void addToEnvironment(Environment &env) const override { Q_UNUSED(env); } - FileName makeCommand(const Environment &) const override { return FileName::fromString("make"); } - FileName compilerCommand() const override { return Utils::FileName::fromString("/tmp/test/gcc"); } + FilePath makeCommand(const Environment &) const override { return FilePath::fromString("make"); } + FilePath compilerCommand() const override { return Utils::FilePath::fromString("/tmp/test/gcc"); } IOutputParser *outputParser() const override { return nullptr; } std::unique_ptr createConfigurationWidget() override { return nullptr; } bool operator ==(const ToolChain &other) const override { -- cgit v1.2.3