Use "override" in command line parser classes

Change-Id: Ie76308a94dc3b6735cb64a032d2d077a52c17be2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

2 files changed, 147 insertions, 147 deletions

diff --git a/src/app/qbs/parser/commandlineoption.h b/src/app/qbs/parser/commandlineoption.h
index 40699f8ee..db0bc9397 100644
--- a/src/app/qbs/parser/commandlineoption.h
+++ b/src/app/qbs/parser/commandlineoption.h
@@ -98,10 +98,10 @@ public:
     QString projectFilePath() const { return m_projectFilePath; }
 
 private:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
-    void doParse(const QString &representation, QStringList &input);
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
+    void doParse(const QString &representation, QStringList &input) override;
 
 private:
     QString m_projectFilePath;
@@ -115,10 +115,10 @@ public:
     static QString magicProjectDirString();
 
 private:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
-    void doParse(const QString &representation, QStringList &input);
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
+    void doParse(const QString &representation, QStringList &input) override;
 
 private:
     QString m_projectBuildDirectory;
@@ -130,10 +130,10 @@ public:
     QString generatorName() const { return m_generatorName; }
 
 private:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
-    void doParse(const QString &representation, QStringList &input);
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
+    void doParse(const QString &representation, QStringList &input) override;
 
 private:
     QString m_generatorName;
@@ -148,24 +148,24 @@ protected:
     CountingOption() : m_count(0) {}
 
 private:
-    bool canAppearMoreThanOnce() const { return true; }
-    void doParse(const QString & /* representation */, QStringList & /* input */) { ++m_count; }
+    bool canAppearMoreThanOnce() const  override{ return true; }
+    void doParse(const QString &, QStringList &) override { ++m_count;  }
 
     int m_count;
 };
 
 class VerboseOption : public CountingOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
 };
 
 class QuietOption : public CountingOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
 };
 
 class JobsOption : public CommandLineOption
@@ -175,10 +175,10 @@ public:
     int jobCount() const { return m_jobCount; }
 
 private:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
-    void doParse(const QString &representation, QStringList &input);
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
+    void doParse(const QString &representation, QStringList &input) override;
 
     int m_jobCount;
 };
@@ -192,66 +192,66 @@ protected:
     OnOffOption() : m_enabled(false) {}
 
 private:
-    void doParse(const QString & /* representation */, QStringList & /* input */) { m_enabled = true; }
+    void doParse(const QString &, QStringList &) override { m_enabled = true; }
 
     bool m_enabled;
 };
 
 class KeepGoingOption : public OnOffOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
 };
 
 class DryRunOption : public OnOffOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
 };
 
 class ForceProbesOption : public OnOffOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 class NoInstallOption : public OnOffOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 class ShowProgressOption : public OnOffOption
 {
 public:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 class ForceTimeStampCheckOption : public OnOffOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 class ForceOutputCheckOption : public OnOffOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 class BuildNonDefaultOption : public OnOffOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 
@@ -261,24 +261,24 @@ public:
     QStringList arguments() const { return m_arguments; }
 
 private:
-    void doParse(const QString &representation, QStringList &input);
+    void doParse(const QString &representation, QStringList &input) override;
 
     QStringList m_arguments;
 };
 
 class ChangedFilesOption : public StringListOption
 {
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 class ProductsOption : public StringListOption
 {
 public:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
 };
 
 class LogLevelOption : public CommandLineOption
@@ -288,10 +288,10 @@ public:
     int logLevel() const { return m_logLevel; }
 
 private:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
-    void doParse(const QString &representation, QStringList &input);
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
+    void doParse(const QString &representation, QStringList &input) override;
 
     int m_logLevel;
 };
@@ -304,12 +304,12 @@ public:
     QString installRoot() const { return m_installRoot; }
     bool useSysroot() const { return m_useSysroot; }
 
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 
 private:
-    void doParse(const QString &representation, QStringList &input);
+    void doParse(const QString &representation, QStringList &input) override;
 
     QString m_installRoot;
     bool m_useSysroot;
@@ -318,25 +318,25 @@ private:
 class RemoveFirstOption : public OnOffOption
 {
 public:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 class NoBuildOption : public OnOffOption
 {
 public:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 class LogTimeOption : public OnOffOption
 {
 public:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const;
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override;
+    QString longRepresentation() const override;
 };
 
 class CommandEchoModeOption : public CommandLineOption
@@ -344,13 +344,13 @@ class CommandEchoModeOption : public CommandLineOption
 public:
     CommandEchoModeOption();
 
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
     CommandEchoMode commandEchoMode() const;
 
 private:
-    void doParse(const QString &representation, QStringList &input);
+    void doParse(const QString &representation, QStringList &input) override;
 
     CommandEchoMode m_echoMode = CommandEchoModeInvalid;
 };
@@ -362,12 +362,12 @@ public:
 
     QString settingsDir() const { return m_settingsDir; }
 
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 
 private:
-    void doParse(const QString &representation, QStringList &input);
+    void doParse(const QString &representation, QStringList &input) override;
 
     QString m_settingsDir;
 };
@@ -375,9 +375,9 @@ private:
 class WaitLockOption : public OnOffOption
 {
 public:
-    QString description(CommandType command) const;
-    QString shortRepresentation() const { return QString(); }
-    QString longRepresentation() const;
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
 };
 
 } // namespace qbs
diff --git a/src/app/qbs/parser/parsercommand.h b/src/app/qbs/parser/parsercommand.h
index dcfad7a82..11b589a2e 100644
--- a/src/app/qbs/parser/parsercommand.h
+++ b/src/app/qbs/parser/parsercommand.h
@@ -88,11 +88,11 @@ public:
     ResolveCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const { return ResolveCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
+    CommandType type() const override { return ResolveCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
 };
 
 class GenerateCommand : public Command
@@ -101,11 +101,11 @@ public:
     GenerateCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const { return GenerateCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
+    CommandType type() const override { return GenerateCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
 };
 
 class BuildCommand : public Command
@@ -114,11 +114,11 @@ public:
     BuildCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const { return BuildCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
+    CommandType type() const override { return BuildCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
 };
 
 class CleanCommand : public Command
@@ -127,11 +127,11 @@ public:
     CleanCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const { return CleanCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
+    CommandType type() const override { return CleanCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
 };
 
 class InstallCommand : public Command
@@ -140,11 +140,11 @@ public:
     InstallCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const { return InstallCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
+    CommandType type() const override { return InstallCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
 };
 
 class RunCommand : public Command
@@ -154,12 +154,12 @@ public:
     QStringList targetParameters() const { return m_targetParameters; }
 
 private:
-    CommandType type() const { return RunCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
-    void parseNext(QStringList &input);
+    CommandType type() const override { return RunCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
+    void parseNext(QStringList &input) override;
 
     QStringList m_targetParameters;
 };
@@ -170,11 +170,11 @@ public:
     ShellCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const { return ShellCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
+    CommandType type() const override { return ShellCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
 };
 
 // TODO: It seems wrong that a configuration has to be given here. Ideally, this command would just track *all* files regardless of conditions. Is that possible?
@@ -184,11 +184,11 @@ public:
     StatusCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const { return StatusCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
+    CommandType type() const override { return StatusCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
 };
 
 class UpdateTimestampsCommand : public Command
@@ -197,11 +197,11 @@ public:
     UpdateTimestampsCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const { return UpdateTimestampsCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
+    CommandType type() const override { return UpdateTimestampsCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
 };
 
 class DumpNodesTreeCommand : public Command
@@ -210,11 +210,11 @@ public:
     DumpNodesTreeCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const Q_DECL_OVERRIDE { return DumpNodesTreeCommandType; }
-    QString shortDescription() const Q_DECL_OVERRIDE;
-    QString longDescription() const Q_DECL_OVERRIDE;
-    QString representation() const Q_DECL_OVERRIDE;
-    QList<CommandLineOption::Type> supportedOptions() const Q_DECL_OVERRIDE;
+    CommandType type() const override{ return DumpNodesTreeCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
 };
 
 class ListProductsCommand : public Command
@@ -237,12 +237,12 @@ public:
     QString commandToDescribe() const { return m_command; }
 
 private:
-    CommandType type() const { return HelpCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
-    void parseNext(QStringList &input);
+    CommandType type() const override { return HelpCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
+    void parseNext(QStringList &input) override;
 
     QString m_command;
 };
@@ -253,12 +253,12 @@ public:
     VersionCommand(CommandLineOptionPool &optionPool) : Command(optionPool) {}
 
 private:
-    CommandType type() const { return VersionCommandType; }
-    QString shortDescription() const;
-    QString longDescription() const;
-    QString representation() const;
-    QList<CommandLineOption::Type> supportedOptions() const;
-    void parseNext(QStringList &input);
+    CommandType type() const override { return VersionCommandType; }
+    QString shortDescription() const override;
+    QString longDescription() const override;
+    QString representation() const override;
+    QList<CommandLineOption::Type> supportedOptions() const override;
+    void parseNext(QStringList &input) override;
 };
 
 } // namespace qbs