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

KitInformation: Add 'override' in derived classes

Browse Source 
Safer to refactor.

Change-Id: Ie52e08836c0fedd4fbad425163d17b1965a3c1f1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2016-01-04 13:39:02 +01:00
parent e36662e97d
commit c04361995a
5 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidgdbserverkitinformation.h
View File

@@ -73,13 +73,13 @@ class AndroidGdbServerKitInformation : public ProjectExplorer::KitInformation
public: public:
AndroidGdbServerKitInformation(); AndroidGdbServerKitInformation();
QVariant defaultValue(ProjectExplorer::Kit *) const; QVariant defaultValue(ProjectExplorer::Kit *) const override;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *) const; QList<ProjectExplorer::Task> 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 Core::Id id();
static bool isAndroidKit(const ProjectExplorer::Kit *kit); static bool isAndroidKit(const ProjectExplorer::Kit *kit);

14
src/plugins/debugger/debuggerkitinformation.h
View File

@@ -46,23 +46,23 @@ class DEBUGGER_EXPORT DebuggerKitInformation : public ProjectExplorer::KitInform
public: public:
DebuggerKitInformation(); DebuggerKitInformation();
QVariant defaultValue(ProjectExplorer::Kit *k) const; QVariant defaultValue(ProjectExplorer::Kit *k) const override;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const override
{ return DebuggerKitInformation::validateDebugger(k); } { return DebuggerKitInformation::validateDebugger(k); }
void setup(ProjectExplorer::Kit *k); void setup(ProjectExplorer::Kit *k) override;
void fix(ProjectExplorer::Kit *k); void fix(ProjectExplorer::Kit *k) override;
static const DebuggerItem *debugger(const ProjectExplorer::Kit *kit); static const DebuggerItem *debugger(const ProjectExplorer::Kit *kit);
static QList<ProjectExplorer::Task> validateDebugger(const ProjectExplorer::Kit *k); static QList<ProjectExplorer::Task> validateDebugger(const ProjectExplorer::Kit *k);
static bool isValidDebugger(const ProjectExplorer::Kit *k); static bool isValidDebugger(const ProjectExplorer::Kit *k);
ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const; ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const override;
void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const; 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); static void setDebugger(ProjectExplorer::Kit *k, const QVariant &id);

68
src/plugins/projectexplorer/kitinformation.h
View File

@@ -55,13 +55,13 @@ class PROJECTEXPLORER_EXPORT SysRootKitInformation : public KitInformation
public: public:
SysRootKitInformation(); SysRootKitInformation();
QVariant defaultValue(Kit *k) const; QVariant defaultValue(Kit *k) const override;
QList<Task> validate(const Kit *k) const; QList<Task> 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 Core::Id id();
static bool hasSysRoot(const Kit *k); static bool hasSysRoot(const Kit *k);
@@ -80,21 +80,21 @@ class PROJECTEXPLORER_EXPORT ToolChainKitInformation : public KitInformation
public: public:
ToolChainKitInformation(); ToolChainKitInformation();
QVariant defaultValue(Kit *k) const; QVariant defaultValue(Kit *k) const override;
QList<Task> validate(const Kit *k) const; QList<Task> validate(const Kit *k) const override;
void fix(Kit *k); void fix(Kit *k) override;
void setup(Kit *k); 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 addToEnvironment(const Kit *k, Utils::Environment &env) const override;
void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const; void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override;
IOutputParser *createOutputParser(const Kit *k) const; IOutputParser *createOutputParser(const Kit *k) const override;
static Core::Id id(); static Core::Id id();
static ToolChain *toolChain(const Kit *k); static ToolChain *toolChain(const Kit *k);
@@ -119,13 +119,13 @@ class PROJECTEXPLORER_EXPORT DeviceTypeKitInformation : public KitInformation
public: public:
DeviceTypeKitInformation(); DeviceTypeKitInformation();
QVariant defaultValue(Kit *k) const; QVariant defaultValue(Kit *k) const override;
QList<Task> validate(const Kit *k) const; QList<Task> 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 id();
static const Core::Id deviceTypeId(const Kit *k); static const Core::Id deviceTypeId(const Kit *k);
@@ -133,8 +133,8 @@ public:
static KitMatcher deviceTypeMatcher(Core::Id type); static KitMatcher deviceTypeMatcher(Core::Id type);
QSet<Core::Id> supportedPlatforms(const Kit *k) const; QSet<Core::Id> supportedPlatforms(const Kit *k) const override;
QSet<Core::Id> availableFeatures(const Kit *k) const; QSet<Core::Id> availableFeatures(const Kit *k) const override;
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -148,19 +148,19 @@ class PROJECTEXPLORER_EXPORT DeviceKitInformation : public KitInformation
public: public:
DeviceKitInformation(); DeviceKitInformation();
QVariant defaultValue(Kit *k) const; QVariant defaultValue(Kit *k) const override;
QList<Task> validate(const Kit *k) const; QList<Task> validate(const Kit *k) const override;
void fix(Kit *k); void fix(Kit *k) override;
void setup(Kit *k); 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 Core::Id id();
static IDevice::ConstPtr device(const Kit *k); static IDevice::ConstPtr device(const Kit *k);
@@ -186,15 +186,15 @@ class PROJECTEXPLORER_EXPORT EnvironmentKitInformation : public KitInformation
public: public:
EnvironmentKitInformation(); EnvironmentKitInformation();
QVariant defaultValue(Kit *k) const; QVariant defaultValue(Kit *k) const override;
QList<Task> validate(const Kit *k) const; QList<Task> validate(const Kit *k) const override;
void fix(Kit *k); void fix(Kit *k) override;
void addToEnvironment(const Kit *k, Utils::Environment &env) const; void addToEnvironment(const Kit *k, Utils::Environment &env) 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 Core::Id id();
static QList<Utils::EnvironmentItem> environmentChanges(const Kit *k); static QList<Utils::EnvironmentItem> environmentChanges(const Kit *k);

10
src/plugins/qmakeprojectmanager/qmakekitinformation.h
View File

@@ -44,14 +44,14 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::K
public: public:
QmakeKitInformation(); QmakeKitInformation();
QVariant defaultValue(ProjectExplorer::Kit *k) const; QVariant defaultValue(ProjectExplorer::Kit *k) const override;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const; QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const override;
void setup(ProjectExplorer::Kit *k); 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 Core::Id id();
static void setMkspec(ProjectExplorer::Kit *k, const Utils::FileName &fn); static void setMkspec(ProjectExplorer::Kit *k, const Utils::FileName &fn);

22
src/plugins/qtsupport/qtkitinformation.h
View File

@@ -48,20 +48,20 @@ class QTSUPPORT_EXPORT QtKitInformation : public ProjectExplorer::KitInformation
public: public:
QtKitInformation(); QtKitInformation();
QVariant defaultValue(ProjectExplorer::Kit *k) const; QVariant defaultValue(ProjectExplorer::Kit *k) const override;
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const; QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const override;
void fix(ProjectExplorer::Kit *); 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; void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override;
ProjectExplorer::IOutputParser *createOutputParser(const ProjectExplorer::Kit *k) const; ProjectExplorer::IOutputParser *createOutputParser(const ProjectExplorer::Kit *k) const override;
void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const; void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
static Core::Id id(); static Core::Id id();
static int qtVersionId(const ProjectExplorer::Kit *k); static int qtVersionId(const ProjectExplorer::Kit *k);
@@ -74,8 +74,8 @@ public:
const QtVersionNumber &min = QtVersionNumber(0, 0, 0), const QtVersionNumber &min = QtVersionNumber(0, 0, 0),
const QtVersionNumber &max = QtVersionNumber(INT_MAX, INT_MAX, INT_MAX)); const QtVersionNumber &max = QtVersionNumber(INT_MAX, INT_MAX, INT_MAX));
QSet<Core::Id> supportedPlatforms(const ProjectExplorer::Kit *k) const; QSet<Core::Id> supportedPlatforms(const ProjectExplorer::Kit *k) const override;
QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const; QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const override;
private slots: private slots:
void qtVersionsChanged(const QList<int> &addedIds, void qtVersionsChanged(const QList<int> &addedIds,