diff --git a/src/plugins/nim/project/nimtoolchainfactory.cpp b/src/plugins/nim/project/nimtoolchainfactory.cpp index 5fc94c49261..69293f18af9 100644 --- a/src/plugins/nim/project/nimtoolchainfactory.cpp +++ b/src/plugins/nim/project/nimtoolchainfactory.cpp @@ -73,7 +73,7 @@ QList NimToolChainFactory::autoDetect(const QList &alr return result; } -QList NimToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) +QList NimToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language) { QList result; if (language == Constants::C_NIMLANGUAGE_ID) { diff --git a/src/plugins/nim/project/nimtoolchainfactory.h b/src/plugins/nim/project/nimtoolchainfactory.h index 70a49cbb371..af5a7a90c06 100644 --- a/src/plugins/nim/project/nimtoolchainfactory.h +++ b/src/plugins/nim/project/nimtoolchainfactory.h @@ -42,7 +42,7 @@ public: NimToolChainFactory(); QList autoDetect(const QList &alreadyKnown) final; - QList autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) final; + QList detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) final; }; class NimToolChainConfigWidget : public ProjectExplorer::ToolChainConfigWidget diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 9a1f126591b..fadedc3a927 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -880,7 +880,7 @@ QList GccToolChainFactory::autoDetect(const QList &alr return tcs; } -QList GccToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) +QList GccToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language) { const QString fileName = compilerPath.fileName(); if ((language == Constants::C_LANGUAGE_ID && (fileName.startsWith("gcc") @@ -1455,7 +1455,7 @@ QList ClangToolChainFactory::autoDetect(const QList &a return tcs; } -QList ClangToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) +QList ClangToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language) { const QString fileName = compilerPath.fileName(); if ((language == Constants::C_LANGUAGE_ID && fileName.startsWith("clang") && !fileName.startsWith("clang++")) @@ -1637,7 +1637,7 @@ QList MingwToolChainFactory::autoDetect(const QList &a return result; } -QList MingwToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) +QList MingwToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language) { const QString fileName = compilerPath.fileName(); if ((language == Constants::C_LANGUAGE_ID && (fileName.startsWith("gcc") @@ -1714,7 +1714,7 @@ QList LinuxIccToolChainFactory::autoDetect(const QList return result; } -QList LinuxIccToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) +QList LinuxIccToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language) { const QString fileName = compilerPath.fileName(); if ((language == Constants::CXX_LANGUAGE_ID && fileName.startsWith("icpc")) || diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h index e33ebcaa03c..6d3a75ca3b8 100644 --- a/src/plugins/projectexplorer/gcctoolchainfactories.h +++ b/src/plugins/projectexplorer/gcctoolchainfactories.h @@ -55,7 +55,7 @@ public: GccToolChainFactory(); QList autoDetect(const QList &alreadyKnown) override; - QList autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) override; + QList detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) override; protected: enum class DetectVariants { Yes, No }; @@ -138,7 +138,7 @@ public: ClangToolChainFactory(); QList autoDetect(const QList &alreadyKnown) override; - QList autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) final; + QList detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) final; }; // -------------------------------------------------------------------------- @@ -153,7 +153,7 @@ public: MingwToolChainFactory(); QList autoDetect(const QList &alreadyKnown) override; - QList autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) final; + QList detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) final; }; // -------------------------------------------------------------------------- @@ -168,7 +168,7 @@ public: LinuxIccToolChainFactory(); QList autoDetect(const QList &alreadyKnown) override; - QList autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) final; + QList detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) final; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index 4d32dba9d62..4b5717f146d 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -372,7 +372,7 @@ createToolChains(const Utils::FilePath &toolChainPath, const Core::Id &language) ProjectImporter::ToolChainData data; for (ToolChainFactory *factory : ToolChainFactory::allToolChainFactories()) { - data.tcs = factory->autoDetect(toolChainPath, language); + data.tcs = factory->detectForImport(toolChainPath, language); if (data.tcs.isEmpty()) continue; diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 5dae6cfac3f..b76c2470501 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -442,7 +442,7 @@ QList ToolChainFactory::autoDetect(const QList &alread return QList(); } -QList ToolChainFactory::autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) +QList ToolChainFactory::detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) { Q_UNUSED(compilerPath); Q_UNUSED(language); diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index fa14b4f127b..512c77fe16e 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -199,7 +199,7 @@ public: Core::Id supportedToolChainType() const; virtual QList autoDetect(const QList &alreadyKnown); - virtual QList autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language); + virtual QList detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language); virtual bool canCreate() const; virtual ToolChain *create();