Commit 66bdd609 authored by Tobias Hunger's avatar Tobias Hunger Committed by hjk

ProjectExplorer: Sprinkle overrides over the code

Sprinkle overrides over code derived from classes in ProjectExplorer

Change-Id: Ia4cc25649f7dc00b0ea126d8176a59afbc5ed574
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
parent 221b03a1
......@@ -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;
......
......@@ -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
......
......@@ -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
......
......@@ -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;
};
......
......@@ -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
......
......@@ -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;
};
......
......@@ -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;
};
......
......@@ -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;
......
......@@ -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;
};
......
......@@ -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;
};
/////////////////////
......
......@@ -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))
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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.
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
};
......
......@@ -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.
......
......@@ -203,6 +203,3 @@ bool BuildStep::enabled() const
IBuildStepFactory::IBuildStepFactory(QObject *parent) :
QObject(parent)
{ }
IBuildStepFactory::~IBuildStepFactory()
{ }
......@@ -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;
......
......@@ -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>(
......
......@@ -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;
};
......
......@@ -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
......
......@@ -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);
......
......@@ -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