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

ProjectExplorer: Remove IRunConfigurationAspect::addToMain*Widget base

Browse Source 
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>
This commit is contained in:
hjk
2015-05-20 12:12:12 +02:00
parent 89f37e30fd
commit 1d31955abc
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -122,8 +122,7 @@ public:
virtual IRunConfigurationAspect *create(RunConfiguration *runConfig) const = 0; virtual IRunConfigurationAspect *create(RunConfiguration *runConfig) const = 0;
virtual IRunConfigurationAspect *clone(RunConfiguration *runConfig) const; virtual IRunConfigurationAspect *clone(RunConfiguration *runConfig) const;
virtual RunConfigWidget *createConfigurationWidget(); // Either this... virtual RunConfigWidget *createConfigurationWidget();
virtual void addToMainConfigurationWidget(QWidget* /*parent*/, QFormLayout* /*layout*/) {} // ... or this.
void setId(Core::Id id) { m_id = id; } void setId(Core::Id id) { m_id = id; }
void setDisplayName(const QString &displayName) { m_displayName = displayName; } void setDisplayName(const QString &displayName) { m_displayName = displayName; }

8
src/plugins/projectexplorer/runconfigurationaspects.h
View File

@@ -57,7 +57,7 @@ public:
TerminalAspect *create(RunConfiguration *runConfig) const override; TerminalAspect *create(RunConfiguration *runConfig) const override;
TerminalAspect *clone(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; bool useTerminal() const;
void setUseTerminal(bool useTerminal); void setUseTerminal(bool useTerminal);
@@ -90,7 +90,7 @@ public:
WorkingDirectoryAspect *create(RunConfiguration *runConfig) const override; WorkingDirectoryAspect *create(RunConfiguration *runConfig) const override;
WorkingDirectoryAspect *clone(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 workingDirectory() const;
QString unexpandedWorkingDirectory() const; QString unexpandedWorkingDirectory() const;
@@ -116,7 +116,7 @@ public:
ArgumentsAspect *create(RunConfiguration *runConfig) const override; ArgumentsAspect *create(RunConfiguration *runConfig) const override;
ArgumentsAspect *clone(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 arguments() const;
QString unexpandedArguments() const; QString unexpandedArguments() const;
@@ -145,7 +145,7 @@ public:
ExecutableAspect *create(RunConfiguration *runConfig) const override; ExecutableAspect *create(RunConfiguration *runConfig) const override;
ExecutableAspect *clone(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 executable() const;
QString unexpandedExecutable() const; QString unexpandedExecutable() const;