From 1d31955abce751aa6b0c577d1c0fb988c9d026a9 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Wed, 20 May 2015 12:12:12 +0200
Subject: [PATCH] ProjectExplorer: Remove
IRunConfigurationAspect::addToMain*Widget base
Not needed in the current use cases. The original plan was to
use a loop in the *RunConfigurationWidgets constructors, making
them less dependent on the actual RunConfiguration they serve
(and potentially have a one or few generic RunConfigurationWidget).
Change-Id: I2209213414248a1e13b50447f05e8f189620a6f1
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
---
src/plugins/projectexplorer/runconfiguration.h | 3 +--
src/plugins/projectexplorer/runconfigurationaspects.h | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index f68316fe7c..43890d3ad9 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -122,8 +122,7 @@ public:
virtual IRunConfigurationAspect *create(RunConfiguration *runConfig) const = 0;
virtual IRunConfigurationAspect *clone(RunConfiguration *runConfig) const;
- virtual RunConfigWidget *createConfigurationWidget(); // Either this...
- virtual void addToMainConfigurationWidget(QWidget* /*parent*/, QFormLayout* /*layout*/) {} // ... or this.
+ virtual RunConfigWidget *createConfigurationWidget();
void setId(Core::Id id) { m_id = id; }
void setDisplayName(const QString &displayName) { m_displayName = displayName; }
diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h
index 497715d281..a619fd3fb7 100644
--- a/src/plugins/projectexplorer/runconfigurationaspects.h
+++ b/src/plugins/projectexplorer/runconfigurationaspects.h
@@ -57,7 +57,7 @@ public:
TerminalAspect *create(RunConfiguration *runConfig) const override;
TerminalAspect *clone(RunConfiguration *runConfig) const override;
- void addToMainConfigurationWidget(QWidget *parent, QFormLayout *layout) override;
+ void addToMainConfigurationWidget(QWidget *parent, QFormLayout *layout);
bool useTerminal() const;
void setUseTerminal(bool useTerminal);
@@ -90,7 +90,7 @@ public:
WorkingDirectoryAspect *create(RunConfiguration *runConfig) const override;
WorkingDirectoryAspect *clone(RunConfiguration *runConfig) const override;
- void addToMainConfigurationWidget(QWidget *parent, QFormLayout *layout) override;
+ void addToMainConfigurationWidget(QWidget *parent, QFormLayout *layout);
QString workingDirectory() const;
QString unexpandedWorkingDirectory() const;
@@ -116,7 +116,7 @@ public:
ArgumentsAspect *create(RunConfiguration *runConfig) const override;
ArgumentsAspect *clone(RunConfiguration *runConfig) const override;
- void addToMainConfigurationWidget(QWidget *parent, QFormLayout *layout) override;
+ void addToMainConfigurationWidget(QWidget *parent, QFormLayout *layout);
QString arguments() const;
QString unexpandedArguments() const;
@@ -145,7 +145,7 @@ public:
ExecutableAspect *create(RunConfiguration *runConfig) const override;
ExecutableAspect *clone(RunConfiguration *runConfig) const override;
- void addToMainConfigurationWidget(QWidget *parent, QFormLayout *layout) override;
+ void addToMainConfigurationWidget(QWidget *parent, QFormLayout *layout);
QString executable() const;
QString unexpandedExecutable() const;
--
GitLab