ProjectExplorer: Apply clang-format to msvctoolchain files

Change-Id: I92d7f216a514ad855c9bee2119f29617ecb9f52d
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-01-07 15:58:49 +01:00
parent 773a6e1b42
commit e4f488cb5c
2 changed files with 364 additions and 319 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -38,7 +38,9 @@
QT_FORWARD_DECLARE_CLASS(QLabel) QT_FORWARD_DECLARE_CLASS(QLabel)
QT_FORWARD_DECLARE_CLASS(QVersionNumber) QT_FORWARD_DECLARE_CLASS(QVersionNumber)
namespace Utils { class PathChooser; } namespace Utils {
class PathChooser;
}
namespace ProjectExplorer { namespace ProjectExplorer {
namespace Internal { namespace Internal {
@@ -51,20 +53,14 @@ class MsvcToolChain : public ToolChain
{ {
public: public:
enum Type { WindowsSDK, VS }; enum Type { WindowsSDK, VS };
enum Platform { x86, enum Platform { x86, amd64, x86_amd64, ia64, x86_ia64, arm, x86_arm, amd64_arm, amd64_x86 };
amd64,
x86_amd64,
ia64,
x86_ia64,
arm,
x86_arm,
amd64_arm,
amd64_x86
};
explicit MsvcToolChain(const QString &name, const Abi &abi, explicit MsvcToolChain(const QString &name,
const QString &varsBat, const QString &varsBatArg, const Abi &abi,
Core::Id l, Detection d = ManualDetection); const QString &varsBat,
const QString &varsBatArg,
Core::Id l,
Detection d = ManualDetection);
MsvcToolChain(const MsvcToolChain &other); MsvcToolChain(const MsvcToolChain &other);
MsvcToolChain(); MsvcToolChain();
~MsvcToolChain() override; ~MsvcToolChain() override;
@@ -104,7 +100,7 @@ public:
QString varsBat() const { return m_vcvarsBat; } QString varsBat() const { return m_vcvarsBat; }
void setVarsBatArg(const QString &varsBA) { m_varsBatArg = varsBA; } void setVarsBatArg(const QString &varsBA) { m_varsBatArg = varsBA; }
bool operator == (const ToolChain &) const override; bool operator==(const ToolChain &) const override;
static void cancelMsvcToolChainDetection(); static void cancelMsvcToolChainDetection();
static Utils::optional<QString> generateEnvironmentSettings(const Utils::Environment &env, static Utils::optional<QString> generateEnvironmentSettings(const Utils::Environment &env,
@@ -112,7 +108,6 @@ public:
const QString &batchArgs, const QString &batchArgs,
QMap<QString, QString> &envPairs); QMap<QString, QString> &envPairs);
protected: protected:
class WarningFlagAdder class WarningFlagAdder
{ {
@@ -120,22 +115,27 @@ protected:
WarningFlags &m_flags; WarningFlags &m_flags;
bool m_doesEnable = false; bool m_doesEnable = false;
bool m_triggered = false; bool m_triggered = false;
public: public:
WarningFlagAdder(const QString &flag, WarningFlags &flags); WarningFlagAdder(const QString &flag, WarningFlags &flags);
void operator ()(int warningCode, WarningFlags flagsSet); void operator()(int warningCode, WarningFlags flagsSet);
bool triggered() const; bool triggered() const;
}; };
explicit MsvcToolChain(Core::Id typeId, const QString &name, const Abi &abi, explicit MsvcToolChain(Core::Id typeId,
const QString &varsBat, const QString &varsBatArg, const QString &name,
Core::Id l, Detection d); const Abi &abi,
const QString &varsBat,
const QString &varsBatArg,
Core::Id l,
Detection d);
explicit MsvcToolChain(Core::Id typeId); explicit MsvcToolChain(Core::Id typeId);
static void inferWarningsForLevel(int warningLevel, WarningFlags &flags); static void inferWarningsForLevel(int warningLevel, WarningFlags &flags);
void toolChainUpdated() override; void toolChainUpdated() override;
Utils::Environment readEnvironmentSetting(const Utils::Environment& env) const; Utils::Environment readEnvironmentSetting(const Utils::Environment &env) const;
// Function must be thread-safe! // Function must be thread-safe!
virtual Macros msvcPredefinedMacros(const QStringList &cxxflags, virtual Macros msvcPredefinedMacros(const QStringList &cxxflags,
const Utils::Environment &env) const; const Utils::Environment &env) const;
@@ -149,7 +149,8 @@ protected:
QList<Utils::EnvironmentItem> environmentItems; QList<Utils::EnvironmentItem> environmentItems;
}; };
static void environmentModifications(QFutureInterface<GenerateEnvResult> &future, static void environmentModifications(QFutureInterface<GenerateEnvResult> &future,
QString vcvarsBat, QString varsBatArg); QString vcvarsBat,
QString varsBatArg);
void initEnvModWatcher(const QFuture<GenerateEnvResult> &future); void initEnvModWatcher(const QFuture<GenerateEnvResult> &future);
private: private:
@@ -177,9 +178,7 @@ protected:
class ClangClToolChain : public MsvcToolChain class ClangClToolChain : public MsvcToolChain
{ {
public: public:
ClangClToolChain(const QString &name, const QString &llvmDir, ClangClToolChain(const QString &name, const QString &llvmDir, Core::Id language, Detection d);
Core::Id language,
Detection d);
ClangClToolChain(); ClangClToolChain();
bool isValid() const override; bool isValid() const override;
@@ -204,7 +203,8 @@ public:
const Core::Id &language, const Core::Id &language,
const Macros &macros) const override; const Macros &macros) const override;
bool operator ==(const ToolChain &) const override; bool operator==(const ToolChain &) const override;
private: private:
QString m_clangPath; QString m_clangPath;
}; };
@@ -226,7 +226,8 @@ public:
bool canRestore(const QVariantMap &data) override; bool canRestore(const QVariantMap &data) override;
ToolChain *restore(const QVariantMap &data) override; ToolChain *restore(const QVariantMap &data) override;
static QString vcVarsBatFor(const QString &basePath, MsvcToolChain::Platform platform, static QString vcVarsBatFor(const QString &basePath,
MsvcToolChain::Platform platform,
const QVersionNumber &v); const QVersionNumber &v);
}; };
@@ -246,7 +247,6 @@ public:
ToolChain *create(Core::Id l) override; ToolChain *create(Core::Id l) override;
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// MsvcBasedToolChainConfigWidget // MsvcBasedToolChainConfigWidget
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -259,10 +259,10 @@ public:
explicit MsvcBasedToolChainConfigWidget(ToolChain *); explicit MsvcBasedToolChainConfigWidget(ToolChain *);
protected: protected:
void applyImpl() override { } void applyImpl() override {}
void discardImpl() override { setFromMsvcToolChain(); } void discardImpl() override { setFromMsvcToolChain(); }
bool isDirtyImpl() const override { return false; } bool isDirtyImpl() const override { return false; }
void makeReadOnlyImpl() override { } void makeReadOnlyImpl() override {}
void setFromMsvcToolChain(); void setFromMsvcToolChain();