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

ToolChain: Use override on toolchains and related classes

Browse Source 
Change-Id: I5019aa3a067f54095ee21096adeb4dea6ad5dea4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-07 13:39:40 +02:00
parent cbf302893d
commit 8beeb6c870
7 changed files with 153 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/android/androidtoolchain.h
View File

@@ -40,25 +40,25 @@ namespace Internal {
class AndroidToolChain : public ProjectExplorer::GccToolChain class AndroidToolChain : public ProjectExplorer::GccToolChain
{ {
public: public:
~AndroidToolChain(); ~AndroidToolChain() override;
QString type() const; QString type() const override;
QString typeDisplayName() const; QString typeDisplayName() const override;
bool isValid() const; bool isValid() const override;
void addToEnvironment(Utils::Environment &env) const; void addToEnvironment(Utils::Environment &env) const override;
bool operator ==(const ProjectExplorer::ToolChain &) const; bool operator ==(const ProjectExplorer::ToolChain &) const override;
ProjectExplorer::ToolChainConfigWidget *configurationWidget(); ProjectExplorer::ToolChainConfigWidget *configurationWidget() override;
virtual Utils::FileName suggestedDebugger() const; virtual Utils::FileName suggestedDebugger() const override;
Utils::FileName suggestedGdbServer() const; Utils::FileName suggestedGdbServer() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
bool fromMap(const QVariantMap &data); bool fromMap(const QVariantMap &data) override;
QList<Utils::FileName> suggestedMkspecList() const; QList<Utils::FileName> suggestedMkspecList() const override;
QString makeCommand(const Utils::Environment &environment) const; QString makeCommand(const Utils::Environment &environment) const override;
QString ndkToolChainVersion() const; QString ndkToolChainVersion() const;
@@ -66,7 +66,7 @@ public:
void setSecondaryToolChain(bool b); void setSecondaryToolChain(bool b);
protected: protected:
QList<ProjectExplorer::Abi> detectSupportedAbis() const; QList<ProjectExplorer::Abi> detectSupportedAbis() const override;
private: private:
explicit AndroidToolChain(const ProjectExplorer::Abi &abi, const QString &ndkToolChainVersion, Detection d); explicit AndroidToolChain(const ProjectExplorer::Abi &abi, const QString &ndkToolChainVersion, Detection d);
@@ -88,10 +88,10 @@ public:
AndroidToolChainConfigWidget(AndroidToolChain *); AndroidToolChainConfigWidget(AndroidToolChain *);
private: private:
void applyImpl() {} void applyImpl() override {}
void discardImpl() {} void discardImpl() override {}
bool isDirtyImpl() const { return false; } bool isDirtyImpl() const override { return false; }
void makeReadOnlyImpl() {} void makeReadOnlyImpl() override {}
}; };
@@ -102,9 +102,9 @@ class AndroidToolChainFactory : public ProjectExplorer::ToolChainFactory
public: public:
AndroidToolChainFactory(); AndroidToolChainFactory();
QList<ProjectExplorer::ToolChain *> autoDetect(); QList<ProjectExplorer::ToolChain *> autoDetect() override;
bool canRestore(const QVariantMap &data); bool canRestore(const QVariantMap &data) override;
ProjectExplorer::ToolChain *restore(const QVariantMap &data); ProjectExplorer::ToolChain *restore(const QVariantMap &data) override;
class AndroidToolChainInformation class AndroidToolChainInformation
{ {

25
src/plugins/projectexplorer/abstractmsvctoolchain.h
View File

@@ -47,25 +47,26 @@ public:
explicit AbstractMsvcToolChain(const QByteArray &id, Detection d, const Abi &abi, const QString& vcvarsBat); explicit AbstractMsvcToolChain(const QByteArray &id, Detection d, const Abi &abi, const QString& vcvarsBat);
explicit AbstractMsvcToolChain(const QByteArray &id, Detection d); explicit AbstractMsvcToolChain(const QByteArray &id, Detection d);
Abi targetAbi() const; Abi targetAbi() const override;
bool isValid() const; bool isValid() const override;
QByteArray predefinedMacros(const QStringList &cxxflags) const; QByteArray predefinedMacros(const QStringList &cxxflags) const override;
CompilerFlags compilerFlags(const QStringList &cxxflags) const; CompilerFlags compilerFlags(const QStringList &cxxflags) const override;
WarningFlags warningFlags(const QStringList &cflags) const; WarningFlags warningFlags(const QStringList &cflags) const override;
QList<HeaderPath> systemHeaderPaths(const QStringList &cxxflags, const Utils::FileName &sysRoot) const; QList<HeaderPath> systemHeaderPaths(const QStringList &cxxflags,
void addToEnvironment(Utils::Environment &env) const; const Utils::FileName &sysRoot) const override;
void addToEnvironment(Utils::Environment &env) const override;
QString makeCommand(const Utils::Environment &environment) const; QString makeCommand(const Utils::Environment &environment) const override;
Utils::FileName compilerCommand() const; Utils::FileName compilerCommand() const override;
IOutputParser *outputParser() const; IOutputParser *outputParser() const override;
bool canClone() const; bool canClone() const override;
QString varsBat() const { return m_vcvarsBat; } QString varsBat() const { return m_vcvarsBat; }
bool operator ==(const ToolChain &) const; bool operator ==(const ToolChain &) const override;
static bool generateEnvironmentSettings(Utils::Environment &env, static bool generateEnvironmentSettings(Utils::Environment &env,
const QString &batchFile, const QString &batchFile,

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

@@ -76,37 +76,38 @@ public:
OutputParserCount OutputParserCount
}; };
QString type() const; QString type() const override;
QString typeDisplayName() const; QString typeDisplayName() const override;
Abi targetAbi() const; Abi targetAbi() const override;
void setTargetAbi(const Abi &); void setTargetAbi(const Abi &);
bool isValid() const; bool isValid() const override;
QByteArray predefinedMacros(const QStringList &cxxflags) const; QByteArray predefinedMacros(const QStringList &cxxflags) const override;
CompilerFlags compilerFlags(const QStringList &cxxflags) const; CompilerFlags compilerFlags(const QStringList &cxxflags) const override;
WarningFlags warningFlags(const QStringList &cxxflags) const; WarningFlags warningFlags(const QStringList &cxxflags) const override;
const QStringList &rawPredefinedMacros() const; const QStringList &rawPredefinedMacros() const;
void setPredefinedMacros(const QStringList &list); void setPredefinedMacros(const QStringList &list);
QList<HeaderPath> systemHeaderPaths(const QStringList &cxxFlags, const Utils::FileName &) const; QList<HeaderPath> systemHeaderPaths(const QStringList &cxxFlags,
void addToEnvironment(Utils::Environment &env) const; const Utils::FileName &) const override;
QList<Utils::FileName> suggestedMkspecList() const; void addToEnvironment(Utils::Environment &env) const override;
IOutputParser *outputParser() const; QList<Utils::FileName> suggestedMkspecList() const override;
IOutputParser *outputParser() const override;
QStringList headerPathsList() const; QStringList headerPathsList() const;
void setHeaderPaths(const QStringList &list); void setHeaderPaths(const QStringList &list);
QVariantMap toMap() const; QVariantMap toMap() const override;
bool fromMap(const QVariantMap &data); bool fromMap(const QVariantMap &data) override;
ToolChainConfigWidget *configurationWidget(); ToolChainConfigWidget *configurationWidget() override;
bool operator ==(const ToolChain &) const; bool operator ==(const ToolChain &) const override;
void setCompilerCommand(const Utils::FileName &); void setCompilerCommand(const Utils::FileName &);
Utils::FileName compilerCommand() const; Utils::FileName compilerCommand() const override;
void setMakeCommand(const Utils::FileName &); void setMakeCommand(const Utils::FileName &);
QString makeCommand(const Utils::Environment &environment) const; QString makeCommand(const Utils::Environment &environment) const override;
void setCxx11Flags(const QStringList &); void setCxx11Flags(const QStringList &);
const QStringList &cxx11Flags() const; const QStringList &cxx11Flags() const;
@@ -114,7 +115,7 @@ public:
void setMkspecs(const QString &); void setMkspecs(const QString &);
QString mkspecs() const; QString mkspecs() const;
ToolChain *clone() const; ToolChain *clone() const override;
OutputParser outputParserType() const; OutputParser outputParserType() const;
void setOutputParserType(OutputParser parser); void setOutputParserType(OutputParser parser);
@@ -154,12 +155,12 @@ class CustomToolChainFactory : public ToolChainFactory
public: public:
CustomToolChainFactory(); CustomToolChainFactory();
bool canCreate(); bool canCreate() override;
ToolChain *create(); ToolChain *create() override;
// Used by the ToolChainManager to restore user-generated tool chains // Used by the ToolChainManager to restore user-generated tool chains
bool canRestore(const QVariantMap &data); bool canRestore(const QVariantMap &data) override;
ToolChain *restore(const QVariantMap &data); ToolChain *restore(const QVariantMap &data) override;
protected: protected:
virtual CustomToolChain *createToolChain(bool autoDetect); virtual CustomToolChain *createToolChain(bool autoDetect);
@@ -186,10 +187,10 @@ private slots:
void openCustomParserSettingsDialog(); void openCustomParserSettingsDialog();
protected: protected:
void applyImpl(); void applyImpl() override;
void discardImpl() { setFromToolchain(); } void discardImpl() override { setFromToolchain(); }
bool isDirtyImpl() const; bool isDirtyImpl() const override;
void makeReadOnlyImpl(); void makeReadOnlyImpl() override;
void setFromToolchain(); void setFromToolchain();

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

@@ -58,40 +58,41 @@ class PROJECTEXPLORER_EXPORT GccToolChain : public ToolChain
{ {
public: public:
GccToolChain(const QByteArray &id, Detection d); GccToolChain(const QByteArray &id, Detection d);
QString type() const; QString type() const override;
QString typeDisplayName() const; QString typeDisplayName() const override;
Abi targetAbi() const; Abi targetAbi() const override;
QString version() const; QString version() const;
QList<Abi> supportedAbis() const; QList<Abi> supportedAbis() const;
void setTargetAbi(const Abi &); void setTargetAbi(const Abi &);
bool isValid() const; bool isValid() const override;
QByteArray predefinedMacros(const QStringList &cxxflags) const; QByteArray predefinedMacros(const QStringList &cxxflags) const override;
CompilerFlags compilerFlags(const QStringList &cxxflags) const; CompilerFlags compilerFlags(const QStringList &cxxflags) const override;
WarningFlags warningFlags(const QStringList &cflags) const; WarningFlags warningFlags(const QStringList &cflags) const override;
QList<HeaderPath> systemHeaderPaths(const QStringList &cxxflags, const Utils::FileName &sysRoot) const; QList<HeaderPath> systemHeaderPaths(const QStringList &cxxflags,
void addToEnvironment(Utils::Environment &env) const; const Utils::FileName &sysRoot) const override;
QString makeCommand(const Utils::Environment &environment) const; void addToEnvironment(Utils::Environment &env) const override;
QList<Utils::FileName> suggestedMkspecList() const; QString makeCommand(const Utils::Environment &environment) const override;
IOutputParser *outputParser() const; QList<Utils::FileName> suggestedMkspecList() const override;
IOutputParser *outputParser() const override;
QVariantMap toMap() const; QVariantMap toMap() const override;
bool fromMap(const QVariantMap &data); bool fromMap(const QVariantMap &data) override;
ToolChainConfigWidget *configurationWidget(); ToolChainConfigWidget *configurationWidget() override;
bool operator ==(const ToolChain &) const; bool operator ==(const ToolChain &) const override;
void resetToolChain(const Utils::FileName &); void resetToolChain(const Utils::FileName &);
Utils::FileName compilerCommand() const; Utils::FileName compilerCommand() const override;
void setPlatformCodeGenFlags(const QStringList &); void setPlatformCodeGenFlags(const QStringList &);
QStringList platformCodeGenFlags() const; QStringList platformCodeGenFlags() const;
void setPlatformLinkerFlags(const QStringList &); void setPlatformLinkerFlags(const QStringList &);
QStringList platformLinkerFlags() const; QStringList platformLinkerFlags() const;
ToolChain *clone() const; ToolChain *clone() const override;
static void addCommandPathToEnvironment(const Utils::FileName &command, Utils::Environment &env); static void addCommandPathToEnvironment(const Utils::FileName &command, Utils::Environment &env);
@@ -162,22 +163,22 @@ class PROJECTEXPLORER_EXPORT ClangToolChain : public GccToolChain
{ {
public: public:
explicit ClangToolChain(Detection d); explicit ClangToolChain(Detection d);
QString type() const; QString type() const override;
QString typeDisplayName() const; QString typeDisplayName() const override;
QString makeCommand(const Utils::Environment &environment) const; QString makeCommand(const Utils::Environment &environment) const override;
CompilerFlags compilerFlags(const QStringList &cxxflags) const; CompilerFlags compilerFlags(const QStringList &cxxflags) const override;
WarningFlags warningFlags(const QStringList &cflags) const; WarningFlags warningFlags(const QStringList &cflags) const override;
IOutputParser *outputParser() const; IOutputParser *outputParser() const override;
ToolChain *clone() const; ToolChain *clone() const override;
QList<Utils::FileName> suggestedMkspecList() const; QList<Utils::FileName> suggestedMkspecList() const override;
void addToEnvironment(Utils::Environment &env) const; void addToEnvironment(Utils::Environment &env) const override;
protected: protected:
virtual CompilerFlags defaultCompilerFlags() const; virtual CompilerFlags defaultCompilerFlags() const override;
private: private:
friend class Internal::ClangToolChainFactory; friend class Internal::ClangToolChainFactory;
@@ -191,13 +192,13 @@ private:
class PROJECTEXPLORER_EXPORT MingwToolChain : public GccToolChain class PROJECTEXPLORER_EXPORT MingwToolChain : public GccToolChain
{ {
public: public:
QString type() const; QString type() const override;
QString typeDisplayName() const; QString typeDisplayName() const override;
QString makeCommand(const Utils::Environment &environment) const; QString makeCommand(const Utils::Environment &environment) const override;
ToolChain *clone() const; ToolChain *clone() const override;
QList<Utils::FileName> suggestedMkspecList() const; QList<Utils::FileName> suggestedMkspecList() const override;
private: private:
explicit MingwToolChain(Detection d); explicit MingwToolChain(Detection d);
@@ -213,15 +214,15 @@ private:
class PROJECTEXPLORER_EXPORT LinuxIccToolChain : public GccToolChain class PROJECTEXPLORER_EXPORT LinuxIccToolChain : public GccToolChain
{ {
public: public:
QString type() const; QString type() const override;
QString typeDisplayName() const; QString typeDisplayName() const override;
CompilerFlags compilerFlags(const QStringList &cxxflags) const; CompilerFlags compilerFlags(const QStringList &cxxflags) const override;
IOutputParser *outputParser() const; IOutputParser *outputParser() const override;
ToolChain *clone() const; ToolChain *clone() const override;
QList<Utils::FileName> suggestedMkspecList() const; QList<Utils::FileName> suggestedMkspecList() const override;
private: private:
explicit LinuxIccToolChain(Detection d); explicit LinuxIccToolChain(Detection d);

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

@@ -60,29 +60,29 @@ public:
MsvcToolChain(const QString &name, const Abi &abi, MsvcToolChain(const QString &name, const Abi &abi,
const QString &varsBat, const QString &varsBatArg, Detection d = ManualDetection); const QString &varsBat, const QString &varsBatArg, Detection d = ManualDetection);
bool isValid() const; bool isValid() const override;
QList<Utils::FileName> suggestedMkspecList() const; QList<Utils::FileName> suggestedMkspecList() const override;
static MsvcToolChain *readFromMap(const QVariantMap &data); static MsvcToolChain *readFromMap(const QVariantMap &data);
QString type() const; QString type() const override;
QString typeDisplayName() const; QString typeDisplayName() const override;
QVariantMap toMap() const; QVariantMap toMap() const override;
bool fromMap(const QVariantMap &data); bool fromMap(const QVariantMap &data) override;
ToolChainConfigWidget *configurationWidget(); ToolChainConfigWidget *configurationWidget() override;
ToolChain *clone() const; ToolChain *clone() const override;
QString varsBatArg() const { return m_varsBatArg; } QString varsBatArg() const { return m_varsBatArg; }
bool operator == (const ToolChain &) const; bool operator == (const ToolChain &) const override;
protected: protected:
Utils::Environment readEnvironmentSetting(Utils::Environment& env) const; Utils::Environment readEnvironmentSetting(Utils::Environment& env) const override;
QByteArray msvcPredefinedMacros(const QStringList cxxflags, QByteArray msvcPredefinedMacros(const QStringList cxxflags,
const Utils::Environment &env) const; const Utils::Environment &env) const override;
private: private:
MsvcToolChain(); MsvcToolChain();
@@ -101,11 +101,11 @@ class MsvcToolChainFactory : public ToolChainFactory
public: public:
MsvcToolChainFactory(); MsvcToolChainFactory();
QList<ToolChain *> autoDetect(); QList<ToolChain *> autoDetect() override;
bool canRestore(const QVariantMap &data); bool canRestore(const QVariantMap &data) override;
ToolChain *restore(const QVariantMap &data) ToolChain *restore(const QVariantMap &data) override
{ return MsvcToolChain::readFromMap(data); } { return MsvcToolChain::readFromMap(data); }
ToolChainConfigWidget *configurationWidget(ToolChain *); ToolChainConfigWidget *configurationWidget(ToolChain *);
static QString vcVarsBatFor(const QString &basePath, const QString &toolchainName); static QString vcVarsBatFor(const QString &basePath, const QString &toolchainName);
@@ -126,10 +126,10 @@ public:
MsvcToolChainConfigWidget(ToolChain *); MsvcToolChainConfigWidget(ToolChain *);
private: private:
void applyImpl() {} void applyImpl() override {}
void discardImpl() { setFromToolChain(); } void discardImpl() override { setFromToolChain(); }
bool isDirtyImpl() const { return false; } bool isDirtyImpl() const override { return false; }
void makeReadOnlyImpl() {} void makeReadOnlyImpl() override {}
void setFromToolChain(); void setFromToolChain();

33
src/plugins/projectexplorer/wincetoolchain.h
View File

@@ -51,27 +51,28 @@ public:
const QString &libPath, const QString &libPath,
Detection d = ManualDetection); Detection d = ManualDetection);
QList<Utils::FileName> suggestedMkspecList() const; QList<Utils::FileName> suggestedMkspecList() const override;
static WinCEToolChain *readFromMap(const QVariantMap &data); static WinCEToolChain *readFromMap(const QVariantMap &data);
QString type() const; QString type() const override;
QString typeDisplayName() const; QString typeDisplayName() const override;
QString ceVer() const; QString ceVer() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
bool fromMap(const QVariantMap &data); bool fromMap(const QVariantMap &data) override;
ToolChainConfigWidget *configurationWidget(); ToolChainConfigWidget *configurationWidget() override;
ToolChain *clone() const; ToolChain *clone() const override;
static QString autoDetectCdbDebugger(QStringList *checkedDirectories = 0); static QString autoDetectCdbDebugger(QStringList *checkedDirectories = 0);
bool operator ==(const ToolChain &other) const; bool operator ==(const ToolChain &other) const override;
protected: protected:
Utils::Environment readEnvironmentSetting(Utils::Environment& env) const; Utils::Environment readEnvironmentSetting(Utils::Environment& env) const override;
private: private:
WinCEToolChain(); WinCEToolChain();
@@ -94,10 +95,10 @@ public:
WinCEToolChainConfigWidget(ToolChain *); WinCEToolChainConfigWidget(ToolChain *);
private: private:
void applyImpl() {} void applyImpl() override { }
void discardImpl() { } void discardImpl() override { }
bool isDirtyImpl() const {return false;} bool isDirtyImpl() const override { return false; }
void makeReadOnlyImpl() {} void makeReadOnlyImpl() override { }
}; };
class WinCEToolChainFactory : public ToolChainFactory class WinCEToolChainFactory : public ToolChainFactory
@@ -107,10 +108,10 @@ class WinCEToolChainFactory : public ToolChainFactory
public: public:
WinCEToolChainFactory(); WinCEToolChainFactory();
QList<ToolChain *> autoDetect(); QList<ToolChain *> autoDetect() override;
bool canRestore(const QVariantMap &data); bool canRestore(const QVariantMap &data) override;
ToolChain *restore(const QVariantMap &data); ToolChain *restore(const QVariantMap &data) override;
ToolChainConfigWidget *configurationWidget(ToolChain *); ToolChainConfigWidget *configurationWidget(ToolChain *);

34
src/plugins/qnx/qnxtoolchain.h
View File

@@ -44,24 +44,24 @@ class QnxToolChain : public ProjectExplorer::GccToolChain
public: public:
explicit QnxToolChain(Detection d); explicit QnxToolChain(Detection d);
QString type() const; QString type() const override;
QString typeDisplayName() const; QString typeDisplayName() const override;
ProjectExplorer::ToolChainConfigWidget *configurationWidget(); ProjectExplorer::ToolChainConfigWidget *configurationWidget() override;
void addToEnvironment(Utils::Environment &env) const; void addToEnvironment(Utils::Environment &env) const override;
QList<Utils::FileName> suggestedMkspecList() const; QList<Utils::FileName> suggestedMkspecList() const override;
QVariantMap toMap() const; QVariantMap toMap() const override;
bool fromMap(const QVariantMap &data); bool fromMap(const QVariantMap &data) override;
QString ndkPath() const; QString ndkPath() const;
void setNdkPath(const QString &ndkPath); void setNdkPath(const QString &ndkPath);
protected: protected:
virtual QList<ProjectExplorer::Abi> detectSupportedAbis() const; virtual QList<ProjectExplorer::Abi> detectSupportedAbis() const override;
QStringList reinterpretOptions(const QStringList &args) const; QStringList reinterpretOptions(const QStringList &args) const override;
private: private:
QString m_ndkPath; QString m_ndkPath;
@@ -78,11 +78,11 @@ class QnxToolChainFactory : public ProjectExplorer::ToolChainFactory
public: public:
QnxToolChainFactory(); QnxToolChainFactory();
bool canRestore(const QVariantMap &data); bool canRestore(const QVariantMap &data) override;
ProjectExplorer::ToolChain *restore(const QVariantMap &data); ProjectExplorer::ToolChain *restore(const QVariantMap &data) override;
bool canCreate(); bool canCreate() override;
ProjectExplorer::ToolChain *create(); ProjectExplorer::ToolChain *create() override;
}; };
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@@ -97,10 +97,10 @@ public:
QnxToolChainConfigWidget(QnxToolChain *tc); QnxToolChainConfigWidget(QnxToolChain *tc);
private: private:
void applyImpl(); void applyImpl() override;
void discardImpl(); void discardImpl() override;
bool isDirtyImpl() const; bool isDirtyImpl() const override;
void makeReadOnlyImpl() {} void makeReadOnlyImpl() override { }
Utils::PathChooser *m_compilerCommand; Utils::PathChooser *m_compilerCommand;
Utils::PathChooser *m_ndkPath; Utils::PathChooser *m_ndkPath;