From c04361995ad73c82d763cec05efc56de6464bd2b Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 4 Jan 2016 13:39:02 +0100 Subject: [PATCH] KitInformation: Add 'override' in derived classes Safer to refactor. Change-Id: Ie52e08836c0fedd4fbad425163d17b1965a3c1f1 Reviewed-by: Tobias Hunger --- .../android/androidgdbserverkitinformation.h | 8 +-- src/plugins/debugger/debuggerkitinformation.h | 14 ++-- src/plugins/projectexplorer/kitinformation.h | 68 +++++++++---------- .../qmakeprojectmanager/qmakekitinformation.h | 10 +-- src/plugins/qtsupport/qtkitinformation.h | 22 +++--- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/plugins/android/androidgdbserverkitinformation.h b/src/plugins/android/androidgdbserverkitinformation.h index aacf6cd90a5..16afa673240 100644 --- a/src/plugins/android/androidgdbserverkitinformation.h +++ b/src/plugins/android/androidgdbserverkitinformation.h @@ -73,13 +73,13 @@ class AndroidGdbServerKitInformation : public ProjectExplorer::KitInformation public: AndroidGdbServerKitInformation(); - QVariant defaultValue(ProjectExplorer::Kit *) const; + QVariant defaultValue(ProjectExplorer::Kit *) const override; - QList validate(const ProjectExplorer::Kit *) const; + QList validate(const ProjectExplorer::Kit *) const override; - ItemList toUserOutput(const ProjectExplorer::Kit *) const; + ItemList toUserOutput(const ProjectExplorer::Kit *) const override; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *) const; + ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *) const override; static Core::Id id(); static bool isAndroidKit(const ProjectExplorer::Kit *kit); diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h index eaf8fcdbfca..7f3a5d114af 100644 --- a/src/plugins/debugger/debuggerkitinformation.h +++ b/src/plugins/debugger/debuggerkitinformation.h @@ -46,23 +46,23 @@ class DEBUGGER_EXPORT DebuggerKitInformation : public ProjectExplorer::KitInform public: DebuggerKitInformation(); - QVariant defaultValue(ProjectExplorer::Kit *k) const; + QVariant defaultValue(ProjectExplorer::Kit *k) const override; - QList validate(const ProjectExplorer::Kit *k) const + QList validate(const ProjectExplorer::Kit *k) const override { return DebuggerKitInformation::validateDebugger(k); } - void setup(ProjectExplorer::Kit *k); - void fix(ProjectExplorer::Kit *k); + void setup(ProjectExplorer::Kit *k) override; + void fix(ProjectExplorer::Kit *k) override; static const DebuggerItem *debugger(const ProjectExplorer::Kit *kit); static QList validateDebugger(const ProjectExplorer::Kit *k); static bool isValidDebugger(const ProjectExplorer::Kit *k); - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const; - void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const; + ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; + void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override; - ItemList toUserOutput(const ProjectExplorer::Kit *k) const; + ItemList toUserOutput(const ProjectExplorer::Kit *k) const override; static void setDebugger(ProjectExplorer::Kit *k, const QVariant &id); diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index 748284e4d16..61180c8e951 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -55,13 +55,13 @@ class PROJECTEXPLORER_EXPORT SysRootKitInformation : public KitInformation public: SysRootKitInformation(); - QVariant defaultValue(Kit *k) const; + QVariant defaultValue(Kit *k) const override; - QList validate(const Kit *k) const; + QList validate(const Kit *k) const override; - KitConfigWidget *createConfigWidget(Kit *k) const; + KitConfigWidget *createConfigWidget(Kit *k) const override; - ItemList toUserOutput(const Kit *k) const; + ItemList toUserOutput(const Kit *k) const override; static Core::Id id(); static bool hasSysRoot(const Kit *k); @@ -80,21 +80,21 @@ class PROJECTEXPLORER_EXPORT ToolChainKitInformation : public KitInformation public: ToolChainKitInformation(); - QVariant defaultValue(Kit *k) const; + QVariant defaultValue(Kit *k) const override; - QList validate(const Kit *k) const; - void fix(Kit *k); - void setup(Kit *k); + QList validate(const Kit *k) const override; + void fix(Kit *k) override; + void setup(Kit *k) override; - KitConfigWidget *createConfigWidget(Kit *k) const; + KitConfigWidget *createConfigWidget(Kit *k) const override; - QString displayNamePostfix(const Kit *k) const; + QString displayNamePostfix(const Kit *k) const override; - ItemList toUserOutput(const Kit *k) const; + ItemList toUserOutput(const Kit *k) const override; - void addToEnvironment(const Kit *k, Utils::Environment &env) const; - void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const; - IOutputParser *createOutputParser(const Kit *k) const; + void addToEnvironment(const Kit *k, Utils::Environment &env) const override; + void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override; + IOutputParser *createOutputParser(const Kit *k) const override; static Core::Id id(); static ToolChain *toolChain(const Kit *k); @@ -119,13 +119,13 @@ class PROJECTEXPLORER_EXPORT DeviceTypeKitInformation : public KitInformation public: DeviceTypeKitInformation(); - QVariant defaultValue(Kit *k) const; + QVariant defaultValue(Kit *k) const override; - QList validate(const Kit *k) const; + QList validate(const Kit *k) const override; - KitConfigWidget *createConfigWidget(Kit *k) const; + KitConfigWidget *createConfigWidget(Kit *k) const override; - ItemList toUserOutput(const Kit *k) const; + ItemList toUserOutput(const Kit *k) const override; static const Core::Id id(); static const Core::Id deviceTypeId(const Kit *k); @@ -133,8 +133,8 @@ public: static KitMatcher deviceTypeMatcher(Core::Id type); - QSet supportedPlatforms(const Kit *k) const; - QSet availableFeatures(const Kit *k) const; + QSet supportedPlatforms(const Kit *k) const override; + QSet availableFeatures(const Kit *k) const override; }; // -------------------------------------------------------------------------- @@ -148,19 +148,19 @@ class PROJECTEXPLORER_EXPORT DeviceKitInformation : public KitInformation public: DeviceKitInformation(); - QVariant defaultValue(Kit *k) const; + QVariant defaultValue(Kit *k) const override; - QList validate(const Kit *k) const; - void fix(Kit *k); - void setup(Kit *k); + QList validate(const Kit *k) const override; + void fix(Kit *k) override; + void setup(Kit *k) override; - KitConfigWidget *createConfigWidget(Kit *k) const; + KitConfigWidget *createConfigWidget(Kit *k) const override; - QString displayNamePostfix(const Kit *k) const; + QString displayNamePostfix(const Kit *k) const override; - ItemList toUserOutput(const Kit *k) const; + ItemList toUserOutput(const Kit *k) const override; - virtual void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const; + virtual void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override; static Core::Id id(); static IDevice::ConstPtr device(const Kit *k); @@ -186,15 +186,15 @@ class PROJECTEXPLORER_EXPORT EnvironmentKitInformation : public KitInformation public: EnvironmentKitInformation(); - QVariant defaultValue(Kit *k) const; + QVariant defaultValue(Kit *k) const override; - QList validate(const Kit *k) const; - void fix(Kit *k); + QList validate(const Kit *k) const override; + void fix(Kit *k) override; - void addToEnvironment(const Kit *k, Utils::Environment &env) const; - KitConfigWidget *createConfigWidget(Kit *k) const; + void addToEnvironment(const Kit *k, Utils::Environment &env) const override; + KitConfigWidget *createConfigWidget(Kit *k) const override; - ItemList toUserOutput(const Kit *k) const; + ItemList toUserOutput(const Kit *k) const override; static Core::Id id(); static QList environmentChanges(const Kit *k); diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.h b/src/plugins/qmakeprojectmanager/qmakekitinformation.h index 5ad51dfaf4f..af020e44ad1 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.h +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.h @@ -44,14 +44,14 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::K public: QmakeKitInformation(); - QVariant defaultValue(ProjectExplorer::Kit *k) const; + QVariant defaultValue(ProjectExplorer::Kit *k) const override; - QList validate(const ProjectExplorer::Kit *k) const; - void setup(ProjectExplorer::Kit *k); + QList validate(const ProjectExplorer::Kit *k) const override; + void setup(ProjectExplorer::Kit *k) override; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const; + ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; - ItemList toUserOutput(const ProjectExplorer::Kit *k) const; + ItemList toUserOutput(const ProjectExplorer::Kit *k) const override; static Core::Id id(); static void setMkspec(ProjectExplorer::Kit *k, const Utils::FileName &fn); diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h index 62e02980f47..a934acd65cb 100644 --- a/src/plugins/qtsupport/qtkitinformation.h +++ b/src/plugins/qtsupport/qtkitinformation.h @@ -48,20 +48,20 @@ class QTSUPPORT_EXPORT QtKitInformation : public ProjectExplorer::KitInformation public: QtKitInformation(); - QVariant defaultValue(ProjectExplorer::Kit *k) const; + QVariant defaultValue(ProjectExplorer::Kit *k) const override; - QList validate(const ProjectExplorer::Kit *k) const; - void fix(ProjectExplorer::Kit *); + QList validate(const ProjectExplorer::Kit *k) const override; + void fix(ProjectExplorer::Kit *) override; - ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const; + ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; - QString displayNamePostfix(const ProjectExplorer::Kit *k) const; + QString displayNamePostfix(const ProjectExplorer::Kit *k) const override; - ItemList toUserOutput(const ProjectExplorer::Kit *k) const; + ItemList toUserOutput(const ProjectExplorer::Kit *k) const override; - void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const; - ProjectExplorer::IOutputParser *createOutputParser(const ProjectExplorer::Kit *k) const; - void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const; + void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override; + ProjectExplorer::IOutputParser *createOutputParser(const ProjectExplorer::Kit *k) const override; + void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override; static Core::Id id(); static int qtVersionId(const ProjectExplorer::Kit *k); @@ -74,8 +74,8 @@ public: const QtVersionNumber &min = QtVersionNumber(0, 0, 0), const QtVersionNumber &max = QtVersionNumber(INT_MAX, INT_MAX, INT_MAX)); - QSet supportedPlatforms(const ProjectExplorer::Kit *k) const; - QSet availableFeatures(const ProjectExplorer::Kit *k) const; + QSet supportedPlatforms(const ProjectExplorer::Kit *k) const override; + QSet availableFeatures(const ProjectExplorer::Kit *k) const override; private slots: void qtVersionsChanged(const QList &addedIds,