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

Nim: Finalize toolchain related classes

Browse Source 
Change-Id: Ic4fdcdad0f3f886efbf673d0cb4c165cece21a8f
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2017-01-30 10:19:19 +01:00
parent 1e827206f3
commit cccfcfff2f
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,23 +40,23 @@ public:
ProjectExplorer::Abi targetAbi() const override;
bool isValid() const override;
QByteArray predefinedMacros(const QStringList &flags) const override;
CompilerFlags compilerFlags(const QStringList &flags) const;
ProjectExplorer::WarningFlags warningFlags(const QStringList &flags) const;
QByteArray predefinedMacros(const QStringList &flags) const final;
CompilerFlags compilerFlags(const QStringList &flags) const final;
ProjectExplorer::WarningFlags warningFlags(const QStringList &flags) const final;
QList<ProjectExplorer::HeaderPath> systemHeaderPaths(const QStringList &flags,
const Utils::FileName &sysRoot) const override;
void addToEnvironment(Utils::Environment &env) const override;
QString makeCommand(const Utils::Environment &env) const override;
Utils::FileName compilerCommand() const override;
const Utils::FileName &sysRoot) const final;
void addToEnvironment(Utils::Environment &env) const final;
QString makeCommand(const Utils::Environment &env) const final;
Utils::FileName compilerCommand() const final;
QString compilerVersion() const;
void setCompilerCommand(const Utils::FileName &compilerCommand);
ProjectExplorer::IOutputParser *outputParser() const override;
ProjectExplorer::ToolChainConfigWidget *configurationWidget() override;
ProjectExplorer::ToolChain *clone() const override;
ProjectExplorer::IOutputParser *outputParser() const final;
ProjectExplorer::ToolChainConfigWidget *configurationWidget() final;
ProjectExplorer::ToolChain *clone() const final;
QVariantMap toMap() const override;
bool fromMap(const QVariantMap &data) override;
QVariantMap toMap() const final;
bool fromMap(const QVariantMap &data) final;
static bool parseVersion(const Utils::FileName &path, std::tuple<int, int, int> &version);

20
src/plugins/nim/project/nimtoolchainfactory.h
View File

@@ -41,12 +41,12 @@ class NimToolChainFactory : public ProjectExplorer::ToolChainFactory
public:
NimToolChainFactory();
bool canCreate() override;
ProjectExplorer::ToolChain *create(Core::Id l) override;
bool canRestore(const QVariantMap &data) override;
ProjectExplorer::ToolChain *restore(const QVariantMap &data) override;
QSet<Core::Id> supportedLanguages() const override;
QList<ProjectExplorer::ToolChain *> autoDetect(const QList<ProjectExplorer::ToolChain *> &alreadyKnown) override;
bool canCreate() final;
ProjectExplorer::ToolChain *create(Core::Id l) final;
bool canRestore(const QVariantMap &data) final;
ProjectExplorer::ToolChain *restore(const QVariantMap &data) final;
QSet<Core::Id> supportedLanguages() const final;
QList<ProjectExplorer::ToolChain *> autoDetect(const QList<ProjectExplorer::ToolChain *> &alreadyKnown) final;
};
class NimToolChainConfigWidget : public ProjectExplorer::ToolChainConfigWidget
@@ -57,10 +57,10 @@ public:
explicit NimToolChainConfigWidget(NimToolChain *tc);
protected:
void applyImpl() override;
void discardImpl() override;
bool isDirtyImpl() const override;
void makeReadOnlyImpl() override;
void applyImpl() final;
void discardImpl() final;
bool isDirtyImpl() const final;
void makeReadOnlyImpl() final;
private:
void fillUI();