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

ProjectExplorer: Remove unused virtual Toolchain::predefinedMacros()

Browse Source 
Change-Id: I24e515ba1767c72cbf43ae250908f571f0229e9f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-27 11:46:58 +01:00
parent bd17dd445b
commit f772f09853
16 changed files with 11 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/baremetal/iarewtoolchain.cpp
View File

@@ -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;

1
src/plugins/baremetal/iarewtoolchain.h
View File

@@ -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;

5
src/plugins/baremetal/keiltoolchain.cpp
View File

@@ -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;

1
src/plugins/baremetal/keiltoolchain.h
View File

@@ -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;

5
src/plugins/baremetal/sdcctoolchain.cpp
View File

@@ -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;

1
src/plugins/baremetal/sdcctoolchain.h
View File

@@ -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;

5
src/plugins/nim/project/nimtoolchain.cpp
View File

@@ -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;

1
src/plugins/nim/project/nimtoolchain.h
View File

@@ -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;

5
src/plugins/projectexplorer/customtoolchain.cpp
View File

@@ -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;

1
src/plugins/projectexplorer/customtoolchain.h
View File

@@ -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;

27
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -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,

1
src/plugins/projectexplorer/gcctoolchain.h
View File

@@ -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,

5
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -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;

1
src/plugins/projectexplorer/msvctoolchain.h
View File

@@ -77,7 +77,6 @@ public:
std::unique_ptr<ToolChainConfigWidget> 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(

1
src/plugins/projectexplorer/toolchain.h
View File

@@ -134,7 +134,6 @@ public:
// A MacroInspectionRunner is created in the ui thread and runs in another thread.
using MacroInspectionRunner = std::function<MacroInspectionReport(const QStringList &cxxflags)>;
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<HeaderPaths(

1
src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
View File

@@ -315,7 +315,6 @@ public:
Abi targetAbi() const override { return Abi::hostAbi(); }
bool isValid() const override { return m_valid; }
MacroInspectionRunner createMacroInspectionRunner() const override { return MacroInspectionRunner(); }
Macros predefinedMacros(const QStringList &cxxflags) const override { Q_UNUSED(cxxflags) return Macros(); }
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 Utils::Environment &) const override { return BuiltInHeaderPathsRunner(); }