From f772f098531f8218eb6c897519e3c6ce78fcc9ae Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 27 Nov 2020 11:46:58 +0100 Subject: [PATCH] ProjectExplorer: Remove unused virtual Toolchain::predefinedMacros() Change-Id: I24e515ba1767c72cbf43ae250908f571f0229e9f Reviewed-by: hjk --- src/plugins/baremetal/iarewtoolchain.cpp | 5 ---- src/plugins/baremetal/iarewtoolchain.h | 1 - src/plugins/baremetal/keiltoolchain.cpp | 5 ---- src/plugins/baremetal/keiltoolchain.h | 1 - src/plugins/baremetal/sdcctoolchain.cpp | 5 ---- src/plugins/baremetal/sdcctoolchain.h | 1 - src/plugins/nim/project/nimtoolchain.cpp | 5 ---- src/plugins/nim/project/nimtoolchain.h | 1 - .../projectexplorer/customtoolchain.cpp | 5 ---- src/plugins/projectexplorer/customtoolchain.h | 1 - src/plugins/projectexplorer/gcctoolchain.cpp | 27 ++++++++----------- src/plugins/projectexplorer/gcctoolchain.h | 1 - src/plugins/projectexplorer/msvctoolchain.cpp | 5 ---- src/plugins/projectexplorer/msvctoolchain.h | 1 - src/plugins/projectexplorer/toolchain.h | 1 - .../toolchainsettingsaccessor.cpp | 1 - 16 files changed, 11 insertions(+), 55 deletions(-) diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 0296a3e8094..76e1f97481b 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -344,11 +344,6 @@ ToolChain::MacroInspectionRunner IarToolChain::createMacroInspectionRunner() con }; } -Macros IarToolChain::predefinedMacros(const QStringList &cxxflags) const -{ - return createMacroInspectionRunner()(cxxflags).macros; -} - Utils::LanguageExtensions IarToolChain::languageExtensions(const QStringList &) const { return LanguageExtension::None; diff --git a/src/plugins/baremetal/iarewtoolchain.h b/src/plugins/baremetal/iarewtoolchain.h index ffe3384908d..9d17879a5e0 100644 --- a/src/plugins/baremetal/iarewtoolchain.h +++ b/src/plugins/baremetal/iarewtoolchain.h @@ -59,7 +59,6 @@ public: bool isValid() const final; MacroInspectionRunner createMacroInspectionRunner() const final; - ProjectExplorer::Macros predefinedMacros(const QStringList &cxxflags) const final; Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const final; Utils::WarningFlags warningFlags(const QStringList &cxxflags) const final; diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 3728017baa9..4473a4f1cec 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -476,11 +476,6 @@ ToolChain::MacroInspectionRunner KeilToolChain::createMacroInspectionRunner() co }; } -Macros KeilToolChain::predefinedMacros(const QStringList &cxxflags) const -{ - return createMacroInspectionRunner()(cxxflags).macros; -} - Utils::LanguageExtensions KeilToolChain::languageExtensions(const QStringList &) const { return LanguageExtension::None; diff --git a/src/plugins/baremetal/keiltoolchain.h b/src/plugins/baremetal/keiltoolchain.h index 63e527d937e..3fbd3d1717a 100644 --- a/src/plugins/baremetal/keiltoolchain.h +++ b/src/plugins/baremetal/keiltoolchain.h @@ -59,7 +59,6 @@ public: bool isValid() const final; MacroInspectionRunner createMacroInspectionRunner() const final; - ProjectExplorer::Macros predefinedMacros(const QStringList &cxxflags) const final; Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const final; Utils::WarningFlags warningFlags(const QStringList &cxxflags) const final; diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index fe9754cce80..aef3894c7f9 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -262,11 +262,6 @@ ToolChain::MacroInspectionRunner SdccToolChain::createMacroInspectionRunner() co }; } -Macros SdccToolChain::predefinedMacros(const QStringList &cxxflags) const -{ - return createMacroInspectionRunner()(cxxflags).macros; -} - Utils::LanguageExtensions SdccToolChain::languageExtensions(const QStringList &) const { return LanguageExtension::None; diff --git a/src/plugins/baremetal/sdcctoolchain.h b/src/plugins/baremetal/sdcctoolchain.h index c888b15bd26..3b4d0f51e30 100644 --- a/src/plugins/baremetal/sdcctoolchain.h +++ b/src/plugins/baremetal/sdcctoolchain.h @@ -58,7 +58,6 @@ public: bool isValid() const final; MacroInspectionRunner createMacroInspectionRunner() const final; - ProjectExplorer::Macros predefinedMacros(const QStringList &cxxflags) const final; Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const final; Utils::WarningFlags warningFlags(const QStringList &cxxflags) const final; diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp index 74c31a828f7..06448300f0b 100644 --- a/src/plugins/nim/project/nimtoolchain.cpp +++ b/src/plugins/nim/project/nimtoolchain.cpp @@ -70,11 +70,6 @@ ToolChain::MacroInspectionRunner NimToolChain::createMacroInspectionRunner() con return ToolChain::MacroInspectionRunner(); } -Macros NimToolChain::predefinedMacros(const QStringList &) const -{ - return Macros(); -} - LanguageExtensions NimToolChain::languageExtensions(const QStringList &) const { return LanguageExtension::None; diff --git a/src/plugins/nim/project/nimtoolchain.h b/src/plugins/nim/project/nimtoolchain.h index 4f883e6bbc0..0f7d6da6a41 100644 --- a/src/plugins/nim/project/nimtoolchain.h +++ b/src/plugins/nim/project/nimtoolchain.h @@ -42,7 +42,6 @@ public: bool isValid() const override; MacroInspectionRunner createMacroInspectionRunner() const override; - ProjectExplorer::Macros predefinedMacros(const QStringList &flags) const final; Utils::LanguageExtensions languageExtensions(const QStringList &flags) const final; Utils::WarningFlags warningFlags(const QStringList &flags) const final; diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index e18becd9793..ab115a2dbd6 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -123,11 +123,6 @@ ToolChain::MacroInspectionRunner CustomToolChain::createMacroInspectionRunner() }; } -Macros CustomToolChain::predefinedMacros(const QStringList &cxxflags) const -{ - return createMacroInspectionRunner()(cxxflags).macros; -} - Utils::LanguageExtensions CustomToolChain::languageExtensions(const QStringList &) const { return LanguageExtension::None; diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h index bd1ccd367f0..5bc7250e3f9 100644 --- a/src/plugins/projectexplorer/customtoolchain.h +++ b/src/plugins/projectexplorer/customtoolchain.h @@ -70,7 +70,6 @@ public: bool isValid() const override; MacroInspectionRunner createMacroInspectionRunner() const override; - Macros predefinedMacros(const QStringList &cxxflags) const override; Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const override; Utils::WarningFlags warningFlags(const QStringList &cxxflags) const override; const Macros &rawPredefinedMacros() const; diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index b104863c7ef..eaa93a4b05e 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -450,7 +450,16 @@ ToolChain::MacroInspectionRunner GccToolChain::createMacroInspectionRunner() con MacrosCache macroCache = predefinedMacrosCache(); Utils::Id lang = language(); - // This runner must be thread-safe! + /* + * Asks compiler for set of predefined macros + * flags are the compiler flags collected from project settings + * returns the list of defines, one per line, e.g. "#define __GXX_WEAK__ 1" + * Note: changing compiler flags sometimes changes macros set, e.g. -fopenmp + * adds _OPENMP macro, for full list of macro search by word "when" on this page: + * http://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html + * + * This runner must be thread-safe! + */ return [env, compilerCommand, platformCodeGenFlags, reinterpretOptions, macroCache, lang] (const QStringList &flags) { QStringList allFlags = platformCodeGenFlags + flags; // add only cxxflags is empty? @@ -480,20 +489,6 @@ ToolChain::MacroInspectionRunner GccToolChain::createMacroInspectionRunner() con }; } -/** - * @brief Asks compiler for set of predefined macros - * @param cxxflags - compiler flags collected from project settings - * @return defines list, one per line, e.g. "#define __GXX_WEAK__ 1" - * - * @note changing compiler flags sometimes changes macros set, e.g. -fopenmp - * adds _OPENMP macro, for full list of macro search by word "when" on this page: - * http://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html - */ -ProjectExplorer::Macros GccToolChain::predefinedMacros(const QStringList &cxxflags) const -{ - return createMacroInspectionRunner()(cxxflags).macros; -} - /** * @brief Parses gcc flags -std=*, -fopenmp, -fms-extensions. * @see http://gcc.gnu.org/onlinedocs/gcc/C-Dialect-Options.html @@ -874,7 +869,7 @@ GccToolChain::DetectedAbisResult GccToolChain::detectSupportedAbis() const { Environment env = Environment::systemEnvironment(); addToEnvironment(env); - ProjectExplorer::Macros macros = predefinedMacros(QStringList()); + ProjectExplorer::Macros macros = createMacroInspectionRunner()({}).macros; return guessGccAbi(findLocalCompiler(m_compilerCommand, env), env.toStringList(), macros, diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h index 1de34ce6556..d3d05cc611a 100644 --- a/src/plugins/projectexplorer/gcctoolchain.h +++ b/src/plugins/projectexplorer/gcctoolchain.h @@ -84,7 +84,6 @@ public: Utils::WarningFlags warningFlags(const QStringList &cflags) const override; MacroInspectionRunner createMacroInspectionRunner() const override; - Macros predefinedMacros(const QStringList &cxxflags) const override; BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(const Utils::Environment &env) const override; HeaderPaths builtInHeaderPaths(const QStringList &flags, diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 4df88de60bd..c7ae6943a66 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -1004,11 +1004,6 @@ ToolChain::MacroInspectionRunner MsvcToolChain::createMacroInspectionRunner() co }; } -Macros MsvcToolChain::predefinedMacros(const QStringList &cxxflags) const -{ - return createMacroInspectionRunner()(cxxflags).macros; -} - Utils::LanguageExtensions MsvcToolChain::languageExtensions(const QStringList &cxxflags) const { using Utils::LanguageExtension; diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 149e5d37b8c..811d5630708 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -77,7 +77,6 @@ public: std::unique_ptr createConfigurationWidget() override; MacroInspectionRunner createMacroInspectionRunner() const override; - Macros predefinedMacros(const QStringList &cxxflags) const override; Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const override; Utils::WarningFlags warningFlags(const QStringList &cflags) const override; BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner( diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index 9eed36d2a0c..141be739904 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -134,7 +134,6 @@ public: // A MacroInspectionRunner is created in the ui thread and runs in another thread. using MacroInspectionRunner = std::function; virtual MacroInspectionRunner createMacroInspectionRunner() const = 0; - virtual Macros predefinedMacros(const QStringList &cxxflags) const = 0; // A BuiltInHeaderPathsRunner is created in the ui thread and runs in another thread. using BuiltInHeaderPathsRunner = std::function