diff options
Diffstat (limited to 'src/plugins')
74 files changed, 388 insertions, 484 deletions
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/analyzerbase/analyzerruncontrol.h index f070df31b2..d13adc98b7 100644 --- a/src/plugins/analyzerbase/analyzerruncontrol.h +++ b/src/plugins/analyzerbase/analyzerruncontrol.h @@ -45,8 +45,7 @@ class ANALYZER_EXPORT AnalyzerRunControl : public ProjectExplorer::RunControl Q_OBJECT public: - AnalyzerRunControl(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id runMode); + AnalyzerRunControl(ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode); /// Start analyzation process. virtual bool startEngine() = 0; @@ -62,12 +61,12 @@ public: virtual void notifyRemoteFinished() {} // ProjectExplorer::RunControl - void start(); - StopResult stop(); - bool isRunning() const; + void start() override; + StopResult stop() override; + bool isRunning() const override; public slots: - virtual void logApplicationMessage(const QString &, Utils::OutputFormat) {} + virtual void logApplicationMessage(const QString &, Utils::OutputFormat) { } private slots: void stopIt(); @@ -78,7 +77,7 @@ signals: void starting(); private: - bool supportsReRunning() const { return false; } + bool supportsReRunning() const override { return false; } protected: bool m_isRunning; diff --git a/src/plugins/android/androiddeployconfiguration.h b/src/plugins/android/androiddeployconfiguration.h index 33f44f8666..d1cd85b054 100644 --- a/src/plugins/android/androiddeployconfiguration.h +++ b/src/plugins/android/androiddeployconfiguration.h @@ -51,16 +51,16 @@ class AndroidDeployConfigurationFactory : public ProjectExplorer::DeployConfigur public: explicit AndroidDeployConfigurationFactory(QObject *parent = 0); - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; - ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id); - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; - ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source) const; - ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source); + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; + ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) override; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; + ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map) override; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source) const override; + ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source) override; - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const override; // used to translate the ids to names to display to the user - QString displayNameForId(Core::Id id) const; + QString displayNameForId(Core::Id id) const override; }; } // namespace Internal diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h index fce53c2175..acd0b9aa96 100644 --- a/src/plugins/android/androiddeployqtstep.h +++ b/src/plugins/android/androiddeployqtstep.h @@ -50,19 +50,19 @@ class AndroidDeployQtStepFactory : public ProjectExplorer::IBuildStepFactory public: explicit AndroidDeployQtStepFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; bool canClone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product) const; + ProjectExplorer::BuildStep *product) const override; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product); + ProjectExplorer::BuildStep *product) override; }; class AndroidDeployQtStep : public ProjectExplorer::BuildStep diff --git a/src/plugins/android/androidruncontrol.h b/src/plugins/android/androidruncontrol.h index b027a1d16e..2ee21c3bcb 100644 --- a/src/plugins/android/androidruncontrol.h +++ b/src/plugins/android/androidruncontrol.h @@ -40,12 +40,12 @@ class AndroidRunControl : public ProjectExplorer::RunControl public: explicit AndroidRunControl(AndroidRunConfiguration *runConfig); - ~AndroidRunControl(); + ~AndroidRunControl() override; - void start(); - StopResult stop(); - bool isRunning() const; - QString displayName() const; + void start() override; + StopResult stop() override; + bool isRunning() const override; + QString displayName() const override; private slots: void handleRemoteProcessFinished(const QString &error); @@ -53,8 +53,7 @@ private slots: void handleRemoteErrorOutput(const QString &output); private: - - AndroidRunner * const m_runner; + AndroidRunner *const m_runner; bool m_running; }; diff --git a/src/plugins/android/androidrunfactories.h b/src/plugins/android/androidrunfactories.h index 256c31580d..58362cf8c8 100644 --- a/src/plugins/android/androidrunfactories.h +++ b/src/plugins/android/androidrunfactories.h @@ -48,10 +48,9 @@ public: explicit AndroidRunControlFactory(QObject *parent = 0); bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id mode) const; + Core::Id mode) const override; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id mode, - QString *errorMessage); + Core::Id mode, QString *errorMessage) override; }; } // namespace Internal diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h index cdf9bab4e1..3845b93643 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.h +++ b/src/plugins/autotoolsprojectmanager/autogenstep.h @@ -56,14 +56,14 @@ class AutogenStepFactory : public ProjectExplorer::IBuildStepFactory public: AutogenStepFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const; - QString displayNameForId(Core::Id id) const; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const; - ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source); - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const override; + QString displayNameForId(Core::Id id) const override; + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const override; + ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) override; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; bool canHandle(ProjectExplorer::BuildStepList *parent) const; }; diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h index 188a23f569..8182b98eea 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.h @@ -55,15 +55,15 @@ class AutoreconfStepFactory : public ProjectExplorer::IBuildStepFactory public: AutoreconfStepFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const; - QString displayNameForId(Core::Id id) const; - - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const; - ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source); - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const override; + QString displayNameForId(Core::Id id) const override; + + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const override; + ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) override; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; bool canHandle(ProjectExplorer::BuildStepList *parent) const; }; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h index fc9bbbe61d..09e890bbe9 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h @@ -47,9 +47,9 @@ class AutotoolsBuildConfiguration : public ProjectExplorer::BuildConfiguration public: explicit AutotoolsBuildConfiguration(ProjectExplorer::Target *parent); - ProjectExplorer::NamedWidget *createConfigWidget(); + ProjectExplorer::NamedWidget *createConfigWidget() override; - BuildType buildType() const; + BuildType buildType() const override; protected: AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id); @@ -58,7 +58,7 @@ protected: friend class AutotoolsBuildSettingsWidget; private: - void setBuildDirectory(const Utils::FileName &directory); + void setBuildDirectory(const Utils::FileName &directory) override; }; class AutotoolsBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory @@ -68,18 +68,18 @@ class AutotoolsBuildConfigurationFactory : public ProjectExplorer::IBuildConfigu public: explicit AutotoolsBuildConfigurationFactory(QObject *parent = 0); - int priority(const ProjectExplorer::Target *parent) const; - QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const; - int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const; + int priority(const ProjectExplorer::Target *parent) const override; + QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const override; + int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const override; QList<ProjectExplorer::BuildInfo *> availableSetups(const ProjectExplorer::Kit *k, - const QString &projectPath) const; + const QString &projectPath) const override; ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent, - const ProjectExplorer::BuildInfo *info) const; + const ProjectExplorer::BuildInfo *info) const override; - bool canClone(const ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const; - AutotoolsBuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source); - bool canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const; - AutotoolsBuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); + bool canClone(const ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const override; + AutotoolsBuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) override; + bool canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const override; + AutotoolsBuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map) override; private: bool canHandle(const ProjectExplorer::Target *t) const; diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h index 6b7291e006..c95d6c9bca 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.h +++ b/src/plugins/autotoolsprojectmanager/configurestep.h @@ -55,15 +55,15 @@ class ConfigureStepFactory : public ProjectExplorer::IBuildStepFactory public: ConfigureStepFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const; - QString displayNameForId(Core::Id id) const; - - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const; - ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source); - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const override; + QString displayNameForId(Core::Id id) const override; + + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const override; + ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) override; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; bool canHandle(ProjectExplorer::BuildStepList *parent) const; }; diff --git a/src/plugins/autotoolsprojectmanager/makestep.h b/src/plugins/autotoolsprojectmanager/makestep.h index 4a55052d24..974d84a105 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.h +++ b/src/plugins/autotoolsprojectmanager/makestep.h @@ -56,15 +56,15 @@ class MakeStepFactory : public ProjectExplorer::IBuildStepFactory public: MakeStepFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const; - QString displayNameForId(Core::Id id) const; - - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const; - ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source); - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const override; + QString displayNameForId(Core::Id id) const override; + + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const override; + ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) override; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; }; ///////////////////// diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp index 3e769a2d9a..676c3dd8ad 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp +++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp @@ -56,10 +56,6 @@ BareMetalRunConfigurationFactory::BareMetalRunConfigurationFactory(QObject *pare setObjectName(QLatin1String("BareMetalRunConfigurationFactory")); } -BareMetalRunConfigurationFactory::~BareMetalRunConfigurationFactory() -{ -} - bool BareMetalRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { if (!canHandle(parent)) diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.h b/src/plugins/baremetal/baremetalrunconfigurationfactory.h index ea19c05ece..c83fd163a0 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationfactory.h +++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.h @@ -37,24 +37,23 @@ class BareMetalRunConfigurationFactory : public ProjectExplorer::IRunConfigurati public: explicit BareMetalRunConfigurationFactory(QObject *parent = 0); - ~BareMetalRunConfigurationFactory(); - QString displayNameForId(Core::Id id) const; - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; + QString displayNameForId(Core::Id id) const override; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const override; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const override; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, - ProjectExplorer::RunConfiguration *source); + ProjectExplorer::RunConfiguration *source) override; private: bool canHandle(const ProjectExplorer::Target *target) const; - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id) override; ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, - const QVariantMap &map); + const QVariantMap &map) override; }; } // namespace Internal diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.cpp b/src/plugins/baremetal/baremetalruncontrolfactory.cpp index 2265ec2157..8f508fbdec 100644 --- a/src/plugins/baremetal/baremetalruncontrolfactory.cpp +++ b/src/plugins/baremetal/baremetalruncontrolfactory.cpp @@ -62,10 +62,6 @@ BareMetalRunControlFactory::BareMetalRunControlFactory(QObject *parent) : { } -BareMetalRunControlFactory::~BareMetalRunControlFactory() -{ -} - bool BareMetalRunControlFactory::canRun(RunConfiguration *runConfiguration, Core::Id mode) const { if (mode != ProjectExplorer::Constants::NORMAL_RUN_MODE diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.h b/src/plugins/baremetal/baremetalruncontrolfactory.h index 00078ecae8..740d7138c5 100644 --- a/src/plugins/baremetal/baremetalruncontrolfactory.h +++ b/src/plugins/baremetal/baremetalruncontrolfactory.h @@ -41,11 +41,10 @@ class BareMetalRunControlFactory : public ProjectExplorer::IRunControlFactory public: explicit BareMetalRunControlFactory(QObject *parent = 0); - ~BareMetalRunControlFactory(); - bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, Core::Id mode) const; + + bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, Core::Id mode) const override; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id mode, - QString *errorMessage); + Core::Id mode, QString *errorMessage) override; }; } // namespace Internal diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h index 06cbc7ed93..b74bfb3032 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h @@ -57,8 +57,8 @@ public: Core::Id runMode, const CppTools::ProjectInfo &projectInfo); - bool startEngine(); - void stopEngine(); + bool startEngine() override; + void stopEngine() override; bool success() const { return m_success; } // For testing. diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h index 6f9e5fc81c..a116b1df94 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h @@ -42,11 +42,10 @@ public: QObject *parent = 0); bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id runMode) const; + Core::Id runMode) const override; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id runMode, - QString *errorMessage); + Core::Id runMode, QString *errorMessage) override; private: ClangStaticAnalyzerTool *m_tool; diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h index 59e89fb53e..ebeaa378bb 100644 --- a/src/plugins/debugger/debuggerruncontrol.h +++ b/src/plugins/debugger/debuggerruncontrol.h @@ -47,20 +47,19 @@ DEBUGGER_EXPORT DebuggerRunControl *createDebuggerRunControl(const DebuggerStart QString *errorMessage, Core::Id runMode = ProjectExplorer::Constants::DEBUG_RUN_MODE); -class DEBUGGER_EXPORT DebuggerRunControl - : public ProjectExplorer::RunControl +class DEBUGGER_EXPORT DebuggerRunControl : public ProjectExplorer::RunControl { Q_OBJECT public: - ~DebuggerRunControl(); + ~DebuggerRunControl() override; // ProjectExplorer::RunControl - void start(); - bool promptToStop(bool *prompt = 0) const; - StopResult stop(); // Called from SnapshotWindow. - bool isRunning() const; - QString displayName() const; + void start() override; + bool promptToStop(bool *prompt = 0) const override; + StopResult stop() override; // Called from SnapshotWindow. + bool isRunning() const override; + QString displayName() const override; void startFailed(); void notifyEngineRemoteServerRunning(const QByteArray &msg, int pid); diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h index fd37e8a79b..434fac91df 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h @@ -49,9 +49,9 @@ class GenericBuildConfiguration : public ProjectExplorer::BuildConfiguration public: explicit GenericBuildConfiguration(ProjectExplorer::Target *parent); - ProjectExplorer::NamedWidget *createConfigWidget(); + ProjectExplorer::NamedWidget *createConfigWidget() override; - BuildType buildType() const; + BuildType buildType() const override; protected: GenericBuildConfiguration(ProjectExplorer::Target *parent, GenericBuildConfiguration *source); @@ -68,18 +68,18 @@ public: explicit GenericBuildConfigurationFactory(QObject *parent = 0); ~GenericBuildConfigurationFactory(); - int priority(const ProjectExplorer::Target *parent) const; - QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const; - int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const; + int priority(const ProjectExplorer::Target *parent) const override; + QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const override; + int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const override; QList<ProjectExplorer::BuildInfo *> availableSetups(const ProjectExplorer::Kit *k, - const QString &projectPath) const; + const QString &projectPath) const override; ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent, - const ProjectExplorer::BuildInfo *info) const; + const ProjectExplorer::BuildInfo *info) const override; - bool canClone(const ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const; - ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source); - bool canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const; - ProjectExplorer::BuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); + bool canClone(const ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const override; + ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) override; + bool canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map) override; private: bool canHandle(const ProjectExplorer::Target *t) const; diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index dd1f174d2c..4784a262ee 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/src/plugins/genericprojectmanager/genericmakestep.h @@ -108,18 +108,18 @@ class GenericMakeStepFactory : public ProjectExplorer::IBuildStepFactory public: explicit GenericMakeStepFactory(QObject *parent = 0); - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; bool canClone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *source) const; + ProjectExplorer::BuildStep *source) const override; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *source); - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; + ProjectExplorer::BuildStep *source) override; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, - const QVariantMap &map); + const QVariantMap &map) override; - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const override; + QString displayNameForId(Core::Id id) const override; }; } // namespace Internal diff --git a/src/plugins/ios/iosruncontrol.h b/src/plugins/ios/iosruncontrol.h index 57bce8d58f..e265025640 100644 --- a/src/plugins/ios/iosruncontrol.h +++ b/src/plugins/ios/iosruncontrol.h @@ -40,7 +40,7 @@ class IosRunControl : public ProjectExplorer::RunControl public: explicit IosRunControl(IosRunConfiguration *runConfig); - ~IosRunControl(); + ~IosRunControl() override; void start() override; @@ -54,8 +54,7 @@ private slots: void handleRemoteErrorOutput(const QString &output); private: - - IosRunner * const m_runner; + IosRunner *const m_runner; bool m_running; }; diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 238a3ab0a7..9f97420459 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -116,14 +116,13 @@ private: mutable Utils::Environment m_cachedEnvironment; }; -class PROJECTEXPLORER_EXPORT IBuildConfigurationFactory : - public QObject +class PROJECTEXPLORER_EXPORT IBuildConfigurationFactory : public QObject { Q_OBJECT public: explicit IBuildConfigurationFactory(QObject *parent = 0); - virtual ~IBuildConfigurationFactory(); + ~IBuildConfigurationFactory() override; // The priority is negative if this factory can not create anything for the target. // It is 0 for the "default" factory that wants to handle the target. diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index 0f49bec4fb..3ad657ffff 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -203,6 +203,3 @@ bool BuildStep::enabled() const IBuildStepFactory::IBuildStepFactory(QObject *parent) : QObject(parent) { } - -IBuildStepFactory::~IBuildStepFactory() -{ } diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 161989af48..d3c0c74d4c 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -101,7 +101,6 @@ class PROJECTEXPLORER_EXPORT IBuildStepFactory : public: explicit IBuildStepFactory(QObject *parent = 0); - virtual ~IBuildStepFactory(); // used to show the list of possible additons to a target, returns a list of types virtual QList<Core::Id> availableCreationIds(BuildStepList *parent) const = 0; diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp index fd1773bd6e..1b2f9c1fd1 100644 --- a/src/plugins/projectexplorer/deployconfiguration.cpp +++ b/src/plugins/projectexplorer/deployconfiguration.cpp @@ -174,9 +174,6 @@ DeployConfigurationFactory::DeployConfigurationFactory(QObject *parent) : QObject(parent) { setObjectName(QLatin1String("DeployConfigurationFactory")); } -DeployConfigurationFactory::~DeployConfigurationFactory() -{ } - DeployConfigurationFactory *DeployConfigurationFactory::find(Target *parent, const QVariantMap &map) { return ExtensionSystem::PluginManager::getObject<DeployConfigurationFactory>( diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 9a1f105c92..4044c86f98 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -85,14 +85,12 @@ protected: DefaultDeployConfiguration(Target *target, DeployConfiguration *source); }; -class PROJECTEXPLORER_EXPORT DeployConfigurationFactory : - public QObject +class PROJECTEXPLORER_EXPORT DeployConfigurationFactory : public QObject { Q_OBJECT public: explicit DeployConfigurationFactory(QObject *parent = 0); - virtual ~DeployConfigurationFactory(); // used to show the list of possible additons to a target, returns a list of types virtual QList<Core::Id> availableCreationIds(Target *parent) const = 0; @@ -118,15 +116,15 @@ signals: class DefaultDeployConfigurationFactory : public DeployConfigurationFactory { public: - QList<Core::Id> availableCreationIds(Target *parent) const; + QList<Core::Id> availableCreationIds(Target *parent) const override; // used to translate the types to names to display to the user - QString displayNameForId(Core::Id id) const; - bool canCreate(Target *parent, Core::Id id) const; - DeployConfiguration *create(Target *parent, Core::Id id); - bool canRestore(Target *parent, const QVariantMap &map) const; - DeployConfiguration *restore(Target *parent, const QVariantMap &map); - bool canClone(Target *parent, DeployConfiguration *product) const; - DeployConfiguration *clone(Target *parent, DeployConfiguration *product); + QString displayNameForId(Core::Id id) const override; + bool canCreate(Target *parent, Core::Id id) const override; + DeployConfiguration *create(Target *parent, Core::Id id) override; + bool canRestore(Target *parent, const QVariantMap &map) const override; + DeployConfiguration *restore(Target *parent, const QVariantMap &map) override; + bool canClone(Target *parent, DeployConfiguration *product) const override; + DeployConfiguration *clone(Target *parent, DeployConfiguration *product) override; private: bool canHandle(Target *parent) const; }; diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.h b/src/plugins/projectexplorer/localapplicationruncontrol.h index 2ca0020cba..7206ef9018 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.h +++ b/src/plugins/projectexplorer/localapplicationruncontrol.h @@ -35,8 +35,8 @@ class LocalApplicationRunControlFactory : public IRunControlFactory { Q_OBJECT public: - bool canRun(RunConfiguration *runConfiguration, Core::Id mode) const; - RunControl* create(RunConfiguration *runConfiguration, Core::Id mode, QString *errorMessage); + bool canRun(RunConfiguration *runConfiguration, Core::Id mode) const override; + RunControl* create(RunConfiguration *runConfiguration, Core::Id mode, QString *errorMessage) override; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index fd0d1f31f7..9220f16aa2 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -156,14 +156,6 @@ bool ProcessStep::fromMap(const QVariantMap &map) // ProcessStepFactory //******* -ProcessStepFactory::ProcessStepFactory() -{ -} - -ProcessStepFactory::~ProcessStepFactory() -{ -} - bool ProcessStepFactory::canCreate(BuildStepList *parent, Core::Id id) const { Q_UNUSED(parent); diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h index 271786497b..5e862af421 100644 --- a/src/plugins/projectexplorer/processstep.h +++ b/src/plugins/projectexplorer/processstep.h @@ -38,18 +38,15 @@ class ProcessStepFactory : public IBuildStepFactory Q_OBJECT public: - ProcessStepFactory(); - ~ProcessStepFactory(); - - virtual QList<Core::Id> availableCreationIds(BuildStepList *parent) const; - virtual QString displayNameForId(Core::Id id) const; - - virtual bool canCreate(BuildStepList *parent, Core::Id id) const; - virtual BuildStep *create(BuildStepList *parent, Core::Id id); - virtual bool canRestore(BuildStepList *parent, const QVariantMap &map) const; - virtual BuildStep *restore(BuildStepList *parent, const QVariantMap &map); - virtual bool canClone(BuildStepList *parent, BuildStep *product) const; - virtual BuildStep *clone(BuildStepList *parent, BuildStep *product); + virtual QList<Core::Id> availableCreationIds(BuildStepList *parent) const override; + virtual QString displayNameForId(Core::Id id) const override; + + virtual bool canCreate(BuildStepList *parent, Core::Id id) const override; + virtual BuildStep *create(BuildStepList *parent, Core::Id id) override; + virtual bool canRestore(BuildStepList *parent, const QVariantMap &map) const override; + virtual BuildStep *restore(BuildStepList *parent, const QVariantMap &map) override; + virtual bool canClone(BuildStepList *parent, BuildStep *product) const override; + virtual BuildStep *clone(BuildStepList *parent, BuildStep *product) override; }; class ProcessStep : public AbstractProcessStep diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index 2802a6d94f..11461984bb 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -45,7 +45,7 @@ class PROJECTEXPLORER_EXPORT ProjectConfiguration : public QObject public: // ctors are protected - virtual ~ProjectConfiguration(); + ~ProjectConfiguration() override; Core::Id id() const; QString displayName() const; diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index e59714b63a..7fbfdce344 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -431,10 +431,6 @@ IRunConfigurationFactory::IRunConfigurationFactory(QObject *parent) : { } -IRunConfigurationFactory::~IRunConfigurationFactory() -{ -} - RunConfiguration *IRunConfigurationFactory::create(Target *parent, Core::Id id) { if (!canCreate(parent, id)) @@ -505,10 +501,6 @@ IRunControlFactory::IRunControlFactory(QObject *parent) { } -IRunControlFactory::~IRunControlFactory() -{ -} - /*! Returns an IRunConfigurationAspect to carry options for RunControls this factory can create. diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 49336fd17b..e7586595a1 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -282,7 +282,6 @@ class PROJECTEXPLORER_EXPORT IRunConfigurationFactory : public QObject public: explicit IRunConfigurationFactory(QObject *parent = 0); - virtual ~IRunConfigurationFactory(); enum CreationMode {UserCreate, AutoCreate}; virtual QList<Core::Id> availableCreationIds(Target *parent, CreationMode mode = UserCreate) const = 0; @@ -312,7 +311,6 @@ class PROJECTEXPLORER_EXPORT IRunControlFactory : public QObject Q_OBJECT public: explicit IRunControlFactory(QObject *parent = 0); - virtual ~IRunControlFactory(); virtual bool canRun(RunConfiguration *runConfiguration, Core::Id mode) const = 0; virtual RunControl *create(RunConfiguration *runConfiguration, Core::Id mode, QString *errorMessage) = 0; @@ -345,7 +343,7 @@ public: }; RunControl(RunConfiguration *runConfiguration, Core::Id mode); - virtual ~RunControl(); + ~RunControl() override; virtual void start() = 0; virtual bool promptToStop(bool *optionalPrompt = 0) const; diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index f97c77ff2c..a3f92a9884 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -1049,8 +1049,8 @@ bool PythonProjectNode::renameFile(const QString &filePath, const QString &newFi class PythonRunControlFactory : public IRunControlFactory { public: - bool canRun(RunConfiguration *runConfiguration, Core::Id mode) const; - RunControl *create(RunConfiguration *runConfiguration, Core::Id mode, QString *errorMessage); + bool canRun(RunConfiguration *runConfiguration, Core::Id mode) const override; + RunControl *create(RunConfiguration *runConfiguration, Core::Id mode, QString *errorMessage) override; }; bool PythonRunControlFactory::canRun(RunConfiguration *runConfiguration, Core::Id mode) const diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 0e73925a5f..25b3f84ad7 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -358,9 +358,6 @@ QbsBuildConfigurationFactory::QbsBuildConfigurationFactory(QObject *parent) : IBuildConfigurationFactory(parent) { } -QbsBuildConfigurationFactory::~QbsBuildConfigurationFactory() -{ } - bool QbsBuildConfigurationFactory::canHandle(const Target *t) const { return qobject_cast<Internal::QbsProject *>(t->project()); diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h index ca39c80f06..6d80991932 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h @@ -52,7 +52,7 @@ class QbsBuildConfiguration : public ProjectExplorer::BuildConfiguration public: explicit QbsBuildConfiguration(ProjectExplorer::Target *target); - ProjectExplorer::NamedWidget *createConfigWidget(); + ProjectExplorer::NamedWidget *createConfigWidget() override; QbsBuildStep *qbsStep() const; QVariantMap qbsConfiguration() const; @@ -61,10 +61,10 @@ public: ProjectExplorer::IOutputParser *createOutputParser() const; - bool isEnabled() const; - QString disabledReason() const; + bool isEnabled() const override; + QString disabledReason() const override; - BuildType buildType() const; + BuildType buildType() const override; void setChangedFiles(const QStringList &files); QStringList changedFiles() const; @@ -113,20 +113,19 @@ class QbsBuildConfigurationFactory : public ProjectExplorer::IBuildConfiguration public: explicit QbsBuildConfigurationFactory(QObject *parent = 0); - ~QbsBuildConfigurationFactory(); - int priority(const ProjectExplorer::Target *parent) const; - QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const; - int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const; + int priority(const ProjectExplorer::Target *parent) const override; + QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const override; + int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const override; QList<ProjectExplorer::BuildInfo *> availableSetups(const ProjectExplorer::Kit *k, - const QString &projectPath) const; + const QString &projectPath) const override; ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent, - const ProjectExplorer::BuildInfo *info) const; + const ProjectExplorer::BuildInfo *info) const override; - bool canClone(const ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const; - ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source); - bool canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const; - ProjectExplorer::BuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); + bool canClone(const ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const override; + ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) override; + bool canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map) override; private: bool canHandle(const ProjectExplorer::Target *t) const; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index c6f0b3f959..27f7d38b53 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h @@ -161,7 +161,6 @@ private: bool m_ignoreChange; }; - class QbsBuildStepFactory : public ProjectExplorer::IBuildStepFactory { Q_OBJECT @@ -170,20 +169,19 @@ public: explicit QbsBuildStepFactory(QObject *parent = 0); // used to show the list of possible additons to a target, returns a list of types - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; // used to translate the types to names to display to the user - QString displayNameForId(Core::Id id) const; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; // used to recreate the runConfigurations when restoring settings - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) const; - ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product); + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) const override; + ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) override; }; - } // namespace Internal } // namespace QbsProjectManager diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index 408a4ba8e2..0ba08b2cf4 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/src/plugins/qbsprojectmanager/qbscleanstep.h @@ -118,7 +118,6 @@ private: QString m_summary; }; - class QbsCleanStepFactory : public ProjectExplorer::IBuildStepFactory { Q_OBJECT @@ -127,20 +126,19 @@ public: explicit QbsCleanStepFactory(QObject *parent = 0); // used to show the list of possible additons to a target, returns a list of types - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; // used to translate the types to names to display to the user - QString displayNameForId(Core::Id id) const; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; // used to recreate the runConfigurations when restoring settings - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) const; - ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product); + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) const override; + ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) override; }; - } // namespace Internal } // namespace QbsProjectManager diff --git a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h index f56585d64c..6f7553622b 100644 --- a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h +++ b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h @@ -58,15 +58,15 @@ class QbsDeployConfigurationFactory : public ProjectExplorer::DeployConfiguratio public: explicit QbsDeployConfigurationFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; - QString displayNameForId(Core::Id id) const; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; - ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id); - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; - ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *product) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const override; + QString displayNameForId(Core::Id id) const override; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; + ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) override; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; + ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map) override; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *product) const override; ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent, - ProjectExplorer::DeployConfiguration *product); + ProjectExplorer::DeployConfiguration *product) override; }; } // namespace Internal diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h index 30115e04cd..6f50e53f7a 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.h +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h @@ -121,7 +121,6 @@ private: bool m_ignoreChange; }; - class QbsInstallStepFactory : public ProjectExplorer::IBuildStepFactory { Q_OBJECT @@ -130,20 +129,19 @@ public: explicit QbsInstallStepFactory(QObject *parent = 0); // used to show the list of possible additons to a target, returns a list of types - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; // used to translate the types to names to display to the user - QString displayNameForId(Core::Id id) const; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; // used to recreate the runConfigurations when restoring settings - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) const; - ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product); + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) const override; + ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *product) override; }; - } // namespace Internal } // namespace QbsProjectManager diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 3af53c933a..f15b98787a 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -406,9 +406,6 @@ QbsRunConfigurationFactory::QbsRunConfigurationFactory(QObject *parent) : setObjectName(QLatin1String("QbsRunConfigurationFactory")); } -QbsRunConfigurationFactory::~QbsRunConfigurationFactory() -{ } - bool QbsRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { if (!canHandle(parent)) diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h index 7a5562df4e..25d7b33a82 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h @@ -134,22 +134,21 @@ class QbsRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFact public: explicit QbsRunConfigurationFactory(QObject *parent = 0); - ~QbsRunConfigurationFactory(); - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; - ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source); + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const override; + ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) override; - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const override; + QString displayNameForId(Core::Id id) const override; private: bool canHandle(ProjectExplorer::Target *t) const; - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id) override; ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, - const QVariantMap &map); + const QVariantMap &map) override; }; } // namespace Internal diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h index bc5d78eae0..9bb3ce1fe7 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h @@ -37,20 +37,20 @@ class AndroidPackageInstallationFactory: public ProjectExplorer::IBuildStepFacto public: explicit AndroidPackageInstallationFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; bool canRestore(ProjectExplorer::BuildStepList *parent, - const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); + const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; bool canClone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product) const; + ProjectExplorer::BuildStep *product) const override; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product); + ProjectExplorer::BuildStep *product) override; }; } // namespace Internal diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h index 728deefefa..c2044cc1ad 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h @@ -38,13 +38,13 @@ public: : QmakeBuildConfigurationFactory(parent) { } - int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const; - int priority(const ProjectExplorer::Target *parent) const; + int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const override; + int priority(const ProjectExplorer::Target *parent) const override; ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent, - const ProjectExplorer::BuildInfo *info) const; - ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source); - ProjectExplorer::BuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); + const ProjectExplorer::BuildInfo *info) const override; + ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) override; + ProjectExplorer::BuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map) override; }; class AndroidQmakeBuildConfiguration : public QmakeProjectManager::QmakeBuildConfiguration @@ -55,7 +55,7 @@ public: explicit AndroidQmakeBuildConfiguration(ProjectExplorer::Target *target); AndroidQmakeBuildConfiguration(ProjectExplorer::Target *target, AndroidQmakeBuildConfiguration *source); AndroidQmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); - void addToEnvironment(Utils::Environment &env) const; + void addToEnvironment(Utils::Environment &env) const override; void manifestSaved(); using BuildConfiguration::emitEnvironmentChanged; diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h index 5cfd6091b7..a3b56871c5 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h @@ -38,19 +38,19 @@ class QmakeAndroidBuildApkStepFactory : public ProjectExplorer::IBuildStepFactor public: explicit QmakeAndroidBuildApkStepFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; bool canClone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product) const; + ProjectExplorer::BuildStep *product) const override; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product); + ProjectExplorer::BuildStep *product) override; private: bool canHandle(ProjectExplorer::Target *t) const; diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h index 79c49990a1..e11c6d4ea1 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h @@ -47,15 +47,15 @@ class QmakeAndroidRunConfigurationFactory : public ProjectExplorer::IRunConfigur public: explicit QmakeAndroidRunConfigurationFactory(QObject *parent = 0); - QString displayNameForId(Core::Id id) const; - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const; + QString displayNameForId(Core::Id id) const override; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const override; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; - ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source); + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const override; + ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) override; QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t, ProjectExplorer::Node *n); @@ -63,9 +63,9 @@ public: private: bool canHandle(ProjectExplorer::Target *t) const; - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id) override; ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, - const QVariantMap &map); + const QVariantMap &map) override; }; } // namespace Internal diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp index 8f2ada2954..afcca92053 100644 --- a/src/plugins/qmakeprojectmanager/makestep.cpp +++ b/src/plugins/qmakeprojectmanager/makestep.cpp @@ -477,10 +477,6 @@ MakeStepFactory::MakeStepFactory(QObject *parent) : { } -MakeStepFactory::~MakeStepFactory() -{ -} - bool MakeStepFactory::canCreate(BuildStepList *parent, Core::Id id) const { if (parent->target()->project()->id() == Constants::QMAKEPROJECT_ID) diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/makestep.h index 5671581e19..2d49ba5fb6 100644 --- a/src/plugins/qmakeprojectmanager/makestep.h +++ b/src/plugins/qmakeprojectmanager/makestep.h @@ -51,17 +51,16 @@ class MakeStepFactory : public ProjectExplorer::IBuildStepFactory public: explicit MakeStepFactory(QObject *parent = 0); - virtual ~MakeStepFactory(); - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const; - ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source); - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const override; + ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) override; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; + QString displayNameForId(Core::Id id) const override; }; } //namespace Internal diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 207575445d..426d5cac31 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -535,10 +535,6 @@ QmakeBuildConfigurationFactory::QmakeBuildConfigurationFactory(QObject *parent) this, &QmakeBuildConfigurationFactory::update); } -QmakeBuildConfigurationFactory::~QmakeBuildConfigurationFactory() -{ -} - void QmakeBuildConfigurationFactory::update() { emit availableCreationIdsChanged(); diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h index 400fc555ae..ffb3775f00 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h @@ -51,7 +51,7 @@ public: explicit QmakeBuildConfiguration(ProjectExplorer::Target *target); ~QmakeBuildConfiguration(); - ProjectExplorer::NamedWidget *createConfigWidget(); + ProjectExplorer::NamedWidget *createConfigWidget() override; bool isShadowBuild() const; void setSubNodeBuild(QmakeProjectManager::QmakeProFileNode *node); @@ -91,14 +91,14 @@ public: const QString &directory, const QtSupport::BaseQtVersion *version, QStringList *outArgs = 0); - QVariantMap toMap() const; + QVariantMap toMap() const override; - virtual bool isEnabled() const; - virtual QString disabledReason() const; + virtual bool isEnabled() const override; + virtual QString disabledReason() const override; /// \internal For QmakeProject, since that manages the parsing information void setEnabled(bool enabled); - BuildType buildType() const; + BuildType buildType() const override; public slots: void emitProFileEvaluateNeeded(); @@ -117,8 +117,8 @@ private slots: protected: QmakeBuildConfiguration(ProjectExplorer::Target *target, QmakeBuildConfiguration *source); QmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); - virtual bool fromMap(const QVariantMap &map); - void setBuildDirectory(const Utils::FileName &directory); + bool fromMap(const QVariantMap &map) override; + void setBuildDirectory(const Utils::FileName &directory) override; private: void ctor(); @@ -154,20 +154,19 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfigurationFactory : public Project public: explicit QmakeBuildConfigurationFactory(QObject *parent = 0); - ~QmakeBuildConfigurationFactory(); - int priority(const ProjectExplorer::Target *parent) const; - QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const; - int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const; + int priority(const ProjectExplorer::Target *parent) const override; + QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const override; + int priority(const ProjectExplorer::Kit *k, const QString &projectPath) const override; QList<ProjectExplorer::BuildInfo *> availableSetups(const ProjectExplorer::Kit *k, - const QString &projectPath) const; + const QString &projectPath) const override; ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent, - const ProjectExplorer::BuildInfo *info) const; + const ProjectExplorer::BuildInfo *info) const override; - bool canClone(const ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const; - ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source); - bool canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const; - ProjectExplorer::BuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); + bool canClone(const ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const override; + ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) override; + bool canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map) override; protected: void configureBuildConfiguration(ProjectExplorer::Target *parent, QmakeBuildConfiguration *bc, const QmakeBuildInfo *info) const; diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 8e27b28f4c..1a7906cff7 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -731,10 +731,6 @@ QMakeStepFactory::QMakeStepFactory(QObject *parent) : { } -QMakeStepFactory::~QMakeStepFactory() -{ -} - bool QMakeStepFactory::canCreate(BuildStepList *parent, Core::Id id) const { if (parent->id() != ProjectExplorer::Constants::BUILDSTEPS_BUILD) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index 4808388271..3509e85981 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -59,15 +59,15 @@ class QMakeStepFactory : public ProjectExplorer::IBuildStepFactory public: explicit QMakeStepFactory(QObject *parent = 0); - virtual ~QMakeStepFactory(); - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *bs) const; - ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *bs); - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(Core::Id id) const; + + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *bs) const override; + ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *bs) override; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; + QString displayNameForId(Core::Id id) const override; }; } // namespace Internal diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h index fd043f5ff5..18b9d3a0a7 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h @@ -42,22 +42,22 @@ class QmlProfilerRunControl : public Analyzer::AnalyzerRunControl public: QmlProfilerRunControl(ProjectExplorer::RunConfiguration *runConfiguration, Internal::QmlProfilerTool *tool); - ~QmlProfilerRunControl(); + ~QmlProfilerRunControl() override; void registerProfilerStateManager( QmlProfilerStateManager *profilerState ); - void notifyRemoteSetupDone(quint16 port); - StopResult stop(); + void notifyRemoteSetupDone(quint16 port) override; + StopResult stop() override; signals: void processRunning(quint16 port); public slots: - bool startEngine(); - void stopEngine(); + bool startEngine() override; + void stopEngine() override; void cancelProcess(); - void notifyRemoteFinished(); - void logApplicationMessage(const QString &msg, Utils::OutputFormat format); + void notifyRemoteFinished() override; + void logApplicationMessage(const QString &msg, Utils::OutputFormat format) override; private slots: void wrongSetupMessageBox(const QString &errorMessage); diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.h b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.h index 33787dc717..af72840db1 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.h +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.h @@ -40,14 +40,13 @@ public: explicit QmlProfilerRunControlFactory(QObject *parent = 0); // IRunControlFactory implementation - bool canRun(RunConfiguration *runConfiguration, Core::Id mode) const; + bool canRun(RunConfiguration *runConfiguration, Core::Id mode) const override; - ProjectExplorer::RunControl *create(RunConfiguration *runConfiguration, - Core::Id mode, - QString *errorMessage); + ProjectExplorer::RunControl *create(RunConfiguration *runConfiguration, Core::Id mode, + QString *errorMessage) override; ProjectExplorer::IRunConfigurationAspect *createRunConfigurationAspect( - ProjectExplorer::RunConfiguration *rc); + ProjectExplorer::RunConfiguration *rc) override; }; } // namespace Internal diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp index f193fe8ec6..7cf17cb7bb 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp @@ -42,10 +42,6 @@ QmlProjectRunConfigurationFactory::QmlProjectRunConfigurationFactory(QObject *pa setObjectName(QLatin1String("QmlProjectRunConfigurationFactory")); } -QmlProjectRunConfigurationFactory::~QmlProjectRunConfigurationFactory() -{ -} - QList<Core::Id> QmlProjectRunConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const { Q_UNUSED(mode) diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h index 866d087b96..e042060d63 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h @@ -37,22 +37,21 @@ class QmlProjectRunConfigurationFactory : public ProjectExplorer::IRunConfigurat public: explicit QmlProjectRunConfigurationFactory(QObject *parent = 0); - ~QmlProjectRunConfigurationFactory(); - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const override; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; - ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source); + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const override; + ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) override; private: bool canHandle(ProjectExplorer::Target *parent) const; - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id) override; ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, - const QVariantMap &map); + const QVariantMap &map) override; }; } // namespace Internal diff --git a/src/plugins/qnx/qnxdeployconfigurationfactory.h b/src/plugins/qnx/qnxdeployconfigurationfactory.h index 376f445e90..f6a7edd509 100644 --- a/src/plugins/qnx/qnxdeployconfigurationfactory.h +++ b/src/plugins/qnx/qnxdeployconfigurationfactory.h @@ -37,20 +37,20 @@ class QnxDeployConfigurationFactory : public ProjectExplorer::DeployConfiguratio public: explicit QnxDeployConfigurationFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const override; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; - ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id); + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; + ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) override; - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, - const QVariantMap &map); + const QVariantMap &map) override; bool canClone(ProjectExplorer::Target *parent, - ProjectExplorer::DeployConfiguration *source) const; + ProjectExplorer::DeployConfiguration *source) const override; ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent, - ProjectExplorer::DeployConfiguration *source); + ProjectExplorer::DeployConfiguration *source) override; private: bool canHandle(ProjectExplorer::Target *t) const; }; diff --git a/src/plugins/qnx/qnxdeploystepfactory.h b/src/plugins/qnx/qnxdeploystepfactory.h index f626e87775..1e3d2702c6 100644 --- a/src/plugins/qnx/qnxdeploystepfactory.h +++ b/src/plugins/qnx/qnxdeploystepfactory.h @@ -37,20 +37,20 @@ class QnxDeployStepFactory : public ProjectExplorer::IBuildStepFactory public: explicit QnxDeployStepFactory(); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, - const QVariantMap &map); + const QVariantMap &map) override; bool canClone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product) const; + ProjectExplorer::BuildStep *product) const override; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product); + ProjectExplorer::BuildStep *product) override; }; } // namespace Internal diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.h b/src/plugins/qnx/qnxrunconfigurationfactory.h index 0767ab4ab4..8d1e15d907 100644 --- a/src/plugins/qnx/qnxrunconfigurationfactory.h +++ b/src/plugins/qnx/qnxrunconfigurationfactory.h @@ -39,23 +39,23 @@ class QnxRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFact public: explicit QnxRunConfigurationFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const override; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const override; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, - ProjectExplorer::RunConfiguration *source); + ProjectExplorer::RunConfiguration *source) override; private: bool canHandle(ProjectExplorer::Target *t) const; - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id) override; ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, - const QVariantMap &map); + const QVariantMap &map) override; }; } // namespace Internal diff --git a/src/plugins/qnx/qnxruncontrol.h b/src/plugins/qnx/qnxruncontrol.h index ce1019da01..39b2902091 100644 --- a/src/plugins/qnx/qnxruncontrol.h +++ b/src/plugins/qnx/qnxruncontrol.h @@ -39,7 +39,7 @@ class QnxRunControl : public RemoteLinux::RemoteLinuxRunControl public: explicit QnxRunControl(ProjectExplorer::RunConfiguration *runConfig); - RemoteLinux::RemoteLinuxRunControl::StopResult stop(); + RemoteLinux::RemoteLinuxRunControl::StopResult stop() override; private slots: void printMissingWarning(); diff --git a/src/plugins/qnx/qnxruncontrolfactory.h b/src/plugins/qnx/qnxruncontrolfactory.h index 91cbdad075..003b523e75 100644 --- a/src/plugins/qnx/qnxruncontrolfactory.h +++ b/src/plugins/qnx/qnxruncontrolfactory.h @@ -39,9 +39,9 @@ public: explicit QnxRunControlFactory(QObject *parent = 0); bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id mode) const; + Core::Id mode) const override; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id mode, QString *errorMessage); + Core::Id mode, QString *errorMessage) override; }; } // namespace Internal diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp index 13e0623343..c1c79f1e3d 100644 --- a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp +++ b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp @@ -329,9 +329,6 @@ CustomExecutableRunConfigurationFactory::CustomExecutableRunConfigurationFactory IRunConfigurationFactory(parent) { setObjectName(QLatin1String("CustomExecutableRunConfigurationFactory")); } -CustomExecutableRunConfigurationFactory::~CustomExecutableRunConfigurationFactory() -{ } - bool CustomExecutableRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { if (!canHandle(parent)) diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.h b/src/plugins/qtsupport/customexecutablerunconfiguration.h index 919310f206..0b980ded78 100644 --- a/src/plugins/qtsupport/customexecutablerunconfiguration.h +++ b/src/plugins/qtsupport/customexecutablerunconfiguration.h @@ -104,23 +104,22 @@ class CustomExecutableRunConfigurationFactory : public ProjectExplorer::IRunConf public: explicit CustomExecutableRunConfigurationFactory(QObject *parent = 0); - ~CustomExecutableRunConfigurationFactory(); - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(Core::Id id) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const override; + QString displayNameForId(Core::Id id) const override; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product) const; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product) const override; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, - ProjectExplorer::RunConfiguration *source); + ProjectExplorer::RunConfiguration *source) override; private: bool canHandle(ProjectExplorer::Target *parent) const; - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id) override; ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, - const QVariantMap &map); + const QVariantMap &map) override; }; } // namespace QtSupport diff --git a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h index 84d6613caa..812a2c9e91 100644 --- a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h +++ b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h @@ -37,17 +37,17 @@ class GenericRemoteLinuxDeployStepFactory : public ProjectExplorer::IBuildStepFa public: GenericRemoteLinuxDeployStepFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(Core::Id id) const; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; + QString displayNameForId(Core::Id id) const override; + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, - const QVariantMap &map); + const QVariantMap &map) override; bool canClone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product) const; + ProjectExplorer::BuildStep *product) const override; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product); + ProjectExplorer::BuildStep *product) override; }; } // namespace Internal diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h index ecee5b8841..485d4bd279 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h @@ -38,15 +38,15 @@ class RemoteLinuxDeployConfigurationFactory : public ProjectExplorer::DeployConf public: explicit RemoteLinuxDeployConfigurationFactory(QObject *parent = 0); - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *target) const; - QString displayNameForId(Core::Id id) const; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; - ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id); - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; - ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *product) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *target) const override; + QString displayNameForId(Core::Id id) const override; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; + ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) override; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; + ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map) override; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *product) const override; ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent, - ProjectExplorer::DeployConfiguration *product); + ProjectExplorer::DeployConfiguration *product) override; static Core::Id genericDeployConfigurationId(); }; diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp index 26893e695e..8745163fca 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp @@ -59,10 +59,6 @@ RemoteLinuxRunConfigurationFactory::RemoteLinuxRunConfigurationFactory(QObject * setObjectName(QLatin1String("RemoteLinuxRunConfigurationFactory")); } -RemoteLinuxRunConfigurationFactory::~RemoteLinuxRunConfigurationFactory() -{ -} - bool RemoteLinuxRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const { if (!canHandle(parent)) diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h index a4c0b284b6..a6ed022327 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h @@ -37,25 +37,24 @@ class RemoteLinuxRunConfigurationFactory : public ProjectExplorer::IRunConfigura public: explicit RemoteLinuxRunConfigurationFactory(QObject *parent = 0); - ~RemoteLinuxRunConfigurationFactory(); - QString displayNameForId(Core::Id id) const; - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; + QString displayNameForId(Core::Id id) const override; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const override; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const override; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, - ProjectExplorer::RunConfiguration *source); + ProjectExplorer::RunConfiguration *source) override; private: bool canHandle(const ProjectExplorer::Target *target) const; - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id) override; ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, - const QVariantMap &map); + const QVariantMap &map) override; }; } // namespace Internal diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.h b/src/plugins/remotelinux/remotelinuxruncontrol.h index bdc1f13429..2f5fe92551 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrol.h +++ b/src/plugins/remotelinux/remotelinuxruncontrol.h @@ -37,11 +37,11 @@ class REMOTELINUX_EXPORT RemoteLinuxRunControl : public ProjectExplorer::RunCont Q_OBJECT public: explicit RemoteLinuxRunControl(ProjectExplorer::RunConfiguration *runConfig); - virtual ~RemoteLinuxRunControl(); + ~RemoteLinuxRunControl() override; - virtual void start(); - virtual StopResult stop(); - virtual bool isRunning() const; + virtual void start() override; + virtual StopResult stop() override; + virtual bool isRunning() const override; private slots: void handleErrorMessage(const QString &error); diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp index fcbe442e72..0bd402aa92 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp @@ -61,10 +61,6 @@ RemoteLinuxRunControlFactory::RemoteLinuxRunControlFactory(QObject *parent) { } -RemoteLinuxRunControlFactory::~RemoteLinuxRunControlFactory() -{ -} - bool RemoteLinuxRunControlFactory::canRun(RunConfiguration *runConfiguration, Core::Id mode) const { if (mode != ProjectExplorer::Constants::NORMAL_RUN_MODE diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.h b/src/plugins/remotelinux/remotelinuxruncontrolfactory.h index 56e59660d4..effffcc235 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.h +++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.h @@ -36,12 +36,11 @@ class RemoteLinuxRunControlFactory : public ProjectExplorer::IRunControlFactory Q_OBJECT public: explicit RemoteLinuxRunControlFactory(QObject *parent = 0); - ~RemoteLinuxRunControlFactory(); bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id mode) const; + Core::Id mode) const override; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id mode, QString *errorMessage); + Core::Id mode, QString *errorMessage) override; }; } // namespace Internal diff --git a/src/plugins/valgrind/callgrindengine.h b/src/plugins/valgrind/callgrindengine.h index 15f30ed0a3..706774335d 100644 --- a/src/plugins/valgrind/callgrindengine.h +++ b/src/plugins/valgrind/callgrindengine.h @@ -41,18 +41,18 @@ class CallgrindRunControl : public ValgrindRunControl public: CallgrindRunControl(ProjectExplorer::RunConfiguration *runConfiguration); - bool startEngine(); + bool startEngine() override; Valgrind::Callgrind::ParseData *takeParserData(); - bool canPause() const { return true; } + bool canPause() const override { return true; } public slots: /// controller actions void dump(); void reset(); - void pause(); - void unpause(); + void pause() override; + void unpause() override; /// marks the callgrind process as paused /// calls pause() and unpause() if there's an active run @@ -61,9 +61,9 @@ public slots: void setToggleCollectFunction(const QString &toggleCollectFunction); protected: - virtual QStringList toolArguments() const; - virtual QString progressTitle() const; - virtual Valgrind::ValgrindRunner *runner(); + QStringList toolArguments() const override; + QString progressTitle() const override; + Valgrind::ValgrindRunner *runner() override; signals: void parserDataReady(CallgrindRunControl *engine); diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h index 9f1824c790..8cddd32165 100644 --- a/src/plugins/valgrind/valgrindengine.h +++ b/src/plugins/valgrind/valgrindengine.h @@ -46,8 +46,8 @@ public: ValgrindRunControl(ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode); - bool startEngine(); - void stopEngine(); + bool startEngine() override; + void stopEngine() override; QString executable() const; diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.h b/src/plugins/valgrind/valgrindruncontrolfactory.h index ebd6bdf940..65d618dae0 100644 --- a/src/plugins/valgrind/valgrindruncontrolfactory.h +++ b/src/plugins/valgrind/valgrindruncontrolfactory.h @@ -40,12 +40,11 @@ public: explicit ValgrindRunControlFactory(QObject *parent = 0); // IRunControlFactory implementation - bool canRun(RunConfiguration *runConfiguration, Core::Id mode) const; + bool canRun(RunConfiguration *runConfiguration, Core::Id mode) const override; - ProjectExplorer::RunControl *create(RunConfiguration *runConfiguration, - Core::Id mode, - QString *errorMessage); - ProjectExplorer::IRunConfigurationAspect *createRunConfigurationAspect(ProjectExplorer::RunConfiguration *rc); + ProjectExplorer::RunControl *create(RunConfiguration *runConfiguration, Core::Id mode, + QString *errorMessage) override; + ProjectExplorer::IRunConfigurationAspect *createRunConfigurationAspect(ProjectExplorer::RunConfiguration *rc) override; }; } // namespace Internal diff --git a/src/plugins/winrt/winrtdeployconfiguration.h b/src/plugins/winrt/winrtdeployconfiguration.h index 220c5e4b84..00a6d67ae6 100644 --- a/src/plugins/winrt/winrtdeployconfiguration.h +++ b/src/plugins/winrt/winrtdeployconfiguration.h @@ -36,29 +36,29 @@ class WinRtDeployConfigurationFactory : public ProjectExplorer::DeployConfigurat { public: explicit WinRtDeployConfigurationFactory(QObject *parent = 0); - QString displayNameForId(Core::Id id) const; - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; - ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id); - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; - ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map); - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source) const; + QString displayNameForId(Core::Id id) const override; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const override; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; + ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) override; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; + ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map) override; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source) const override; ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent, - ProjectExplorer::DeployConfiguration *source); + ProjectExplorer::DeployConfiguration *source) override; }; class WinRtDeployStepFactory : public ProjectExplorer::IBuildStepFactory { public: - QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const; - QString displayNameForId(Core::Id id) const; - bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id); - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map); - bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override; + QString displayNameForId(Core::Id id) const override; + bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override; + bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const override; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *source); + ProjectExplorer::BuildStep *source) override; }; class WinRtDeployConfiguration : public ProjectExplorer::DeployConfiguration diff --git a/src/plugins/winrt/winrtruncontrol.h b/src/plugins/winrt/winrtruncontrol.h index cdc429a5b0..d1ff61804f 100644 --- a/src/plugins/winrt/winrtruncontrol.h +++ b/src/plugins/winrt/winrtruncontrol.h @@ -51,9 +51,9 @@ class WinRtRunControl : public ProjectExplorer::RunControl public: explicit WinRtRunControl(WinRtRunConfiguration *runConfiguration, Core::Id mode); - void start(); - StopResult stop(); - bool isRunning() const; + void start() override; + StopResult stop() override; + bool isRunning() const override; private slots: void onProcessStarted(); diff --git a/src/plugins/winrt/winrtrunfactories.h b/src/plugins/winrt/winrtrunfactories.h index 10d842f2c4..09b8986828 100644 --- a/src/plugins/winrt/winrtrunfactories.h +++ b/src/plugins/winrt/winrtrunfactories.h @@ -39,18 +39,18 @@ class WinRtRunConfigurationFactory : public ProjectExplorer::IRunConfigurationF public: WinRtRunConfigurationFactory(); - QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const; - QString displayNameForId(Core::Id id) const; - bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const; - bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const; - bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product) const; + QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode) const override; + QString displayNameForId(Core::Id id) const override; + bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override; + bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override; + bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product) const override; ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, - ProjectExplorer::RunConfiguration *product); + ProjectExplorer::RunConfiguration *product) override; private: bool canHandle(ProjectExplorer::Target *parent) const; - virtual ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id); - virtual ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, const QVariantMap &map); + virtual ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, Core::Id id) override; + virtual ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, const QVariantMap &map) override; }; class WinRtRunControlFactory : public ProjectExplorer::IRunControlFactory @@ -59,9 +59,9 @@ class WinRtRunControlFactory : public ProjectExplorer::IRunControlFactory public: WinRtRunControlFactory(); bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id mode) const; + Core::Id mode) const override; ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, - Core::Id mode, QString *errorMessage); + Core::Id mode, QString *errorMessage) override; QString displayName() const; }; |