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

ProjectExplorer: Reduce GccToolchain interface a bit

Browse Source 
Change-Id: I6c867869d2157611bc8b08b1309d0bce43417f2f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2024-01-18 15:28:45 +01:00
parent 6d4bbba27a
commit a92a4aad9a
2 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,9 +206,9 @@ static ProjectExplorer::Macros gccPredefinedMacros(const FilePath &gcc,
return predefinedMacros; return predefinedMacros;
} }
HeaderPaths GccToolchain::gccHeaderPaths(const FilePath &gcc, static HeaderPaths gccHeaderPaths(const FilePath &gcc,
const QStringList &arguments, const QStringList &arguments,
const Environment &env) const Environment &env)
{ {
HeaderPaths builtInHeaderPaths; HeaderPaths builtInHeaderPaths;
QByteArray line; QByteArray line;
@@ -729,16 +729,16 @@ void GccToolchain::initExtraHeaderPathsFunction(ExtraHeaderPathsFunction &&extra
m_extraHeaderPathsFunction = std::move(extraHeaderPathsFunction); m_extraHeaderPathsFunction = std::move(extraHeaderPathsFunction);
} }
HeaderPaths GccToolchain::builtInHeaderPaths(const Environment &env, static HeaderPaths builtInHeaderPaths(const Environment &env,
const FilePath &compilerCommand, const FilePath &compilerCommand,
const QStringList &platformCodeGenFlags, const QStringList &platformCodeGenFlags,
OptionsReinterpreter reinterpretOptions, std::function<QStringList(const QStringList &options)> reinterpretOptions,
HeaderPathsCache headerCache, GccToolchain::HeaderPathsCache headerCache,
Id languageId, Id languageId,
ExtraHeaderPathsFunction extraHeaderPathsFunction, std::function<void(HeaderPaths &)> extraHeaderPathsFunction,
const QStringList &flags, const QStringList &flags,
const FilePath &sysRoot, const FilePath &sysRoot,
const QString &originalTargetTriple) const QString &originalTargetTriple)
{ {
QStringList arguments = gccPrepareArguments(flags, QStringList arguments = gccPrepareArguments(flags,
sysRoot, sysRoot,

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

@@ -110,21 +110,6 @@ protected:
using ExtraHeaderPathsFunction = std::function<void(HeaderPaths &)>; using ExtraHeaderPathsFunction = std::function<void(HeaderPaths &)>;
void initExtraHeaderPathsFunction(ExtraHeaderPathsFunction &&extraHeaderPathsFunction) const; void initExtraHeaderPathsFunction(ExtraHeaderPathsFunction &&extraHeaderPathsFunction) const;
static HeaderPaths builtInHeaderPaths(const Utils::Environment &env,
const Utils::FilePath &compilerCommand,
const QStringList &platformCodeGenFlags,
OptionsReinterpreter reinterpretOptions,
HeaderPathsCache headerCache,
Utils::Id languageId,
ExtraHeaderPathsFunction extraHeaderPathsFunction,
const QStringList &flags,
const Utils::FilePath &sysRoot,
const QString &originalTargetTriple);
static HeaderPaths gccHeaderPaths(const Utils::FilePath &gcc,
const QStringList &args,
const Utils::Environment &env);
int priority() const override { return m_priority; } int priority() const override { return m_priority; }
QString sysRoot() const override; QString sysRoot() const override;