aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/autotoolsprojectmanager
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-10-15 17:52:15 +0200
committerhjk <hjk@qt.io>2018-10-17 06:14:55 +0000
commitd6c605d84c1eb20e3614532aa0d535d8506da8dd (patch)
tree1a941723591a5f7b832f5995c6ef9197677891bf /src/plugins/autotoolsprojectmanager
parentfb1c562c2ed9cd43f16773f3228d64bd8ff32173 (diff)
ProjectExplorer: Change BuildStepConfigWidget::summaryWidget()
From a virtual function to a normal one backed by a real data member. That's essentially what several re-implementations did, the other ones used a fixed value instead. Change-Id: I61e45f1d4f7f0f80fe2eb1f2729785f37e7bb803 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
-rw-r--r--src/plugins/autotoolsprojectmanager/autogenstep.cpp9
-rw-r--r--src/plugins/autotoolsprojectmanager/autogenstep.h3
-rw-r--r--src/plugins/autotoolsprojectmanager/autoreconfstep.cpp9
-rw-r--r--src/plugins/autotoolsprojectmanager/autoreconfstep.h3
-rw-r--r--src/plugins/autotoolsprojectmanager/configurestep.cpp9
-rw-r--r--src/plugins/autotoolsprojectmanager/configurestep.h3
6 files changed, 6 insertions, 30 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
index 6635dc242af..4e0dc50a503 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
@@ -176,11 +176,6 @@ AutogenStepConfigWidget::AutogenStepConfigWidget(AutogenStep *autogenStep) :
this, &AutogenStepConfigWidget::updateDetails);
}
-QString AutogenStepConfigWidget::summaryText() const
-{
- return m_summaryText;
-}
-
void AutogenStepConfigWidget::updateDetails()
{
BuildConfiguration *bc = m_autogenStep->buildConfiguration();
@@ -192,6 +187,6 @@ void AutogenStepConfigWidget::updateDetails()
param.setWorkingDirectory(projectDir);
param.setCommand("./autogen.sh");
param.setArguments(m_autogenStep->additionalArguments());
- m_summaryText = param.summary(displayName());
- emit updateSummary();
+
+ setSummaryText(param.summary(displayName()));
}
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h
index e047c57ab6d..2da51829d10 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.h
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.h
@@ -111,13 +111,10 @@ class AutogenStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
AutogenStepConfigWidget(AutogenStep *autogenStep);
- QString summaryText() const override;
-
private:
void updateDetails();
AutogenStep *m_autogenStep;
- QString m_summaryText;
QLineEdit *m_additionalArguments;
};
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
index bdfb32e5a27..a6204116902 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
@@ -169,11 +169,6 @@ AutoreconfStepConfigWidget::AutoreconfStepConfigWidget(AutoreconfStep *autorecon
this, &AutoreconfStepConfigWidget::updateDetails);
}
-QString AutoreconfStepConfigWidget::summaryText() const
-{
- return m_summaryText;
-}
-
void AutoreconfStepConfigWidget::updateDetails()
{
BuildConfiguration *bc = m_autoreconfStep->buildConfiguration();
@@ -185,6 +180,6 @@ void AutoreconfStepConfigWidget::updateDetails()
param.setWorkingDirectory(projectDir);
param.setCommand("autoreconf");
param.setArguments(m_autoreconfStep->additionalArguments());
- m_summaryText = param.summary(displayName());
- emit updateSummary();
+
+ setSummaryText(param.summary(displayName()));
}
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h
index 435b7d0579c..2011660e7ab 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.h
@@ -110,13 +110,10 @@ class AutoreconfStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
AutoreconfStepConfigWidget(AutoreconfStep *autoreconfStep);
- QString summaryText() const override;
-
private:
void updateDetails();
AutoreconfStep *m_autoreconfStep;
- QString m_summaryText;
QLineEdit *m_additionalArguments;
};
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp
index 880547fb248..88966567d45 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
@@ -194,11 +194,6 @@ ConfigureStepConfigWidget::ConfigureStepConfigWidget(ConfigureStep *configureSte
this, &ConfigureStepConfigWidget::updateDetails);
}
-QString ConfigureStepConfigWidget::summaryText() const
-{
- return m_summaryText;
-}
-
void ConfigureStepConfigWidget::updateDetails()
{
BuildConfiguration *bc = m_configureStep->buildConfiguration();
@@ -209,6 +204,6 @@ void ConfigureStepConfigWidget::updateDetails()
param.setWorkingDirectory(bc->buildDirectory().toString());
param.setCommand(projectDirRelativeToBuildDir(bc) + "configure");
param.setArguments(m_configureStep->additionalArguments());
- m_summaryText = param.summaryInWorkdir(displayName());
- emit updateSummary();
+
+ setSummaryText(param.summaryInWorkdir(displayName()));
}
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h
index b87e5d7b94f..fb31ce525e2 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.h
+++ b/src/plugins/autotoolsprojectmanager/configurestep.h
@@ -111,13 +111,10 @@ class ConfigureStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
ConfigureStepConfigWidget(ConfigureStep *configureStep);
- QString summaryText() const override;
-
private:
void updateDetails();
ConfigureStep *m_configureStep;
- QString m_summaryText;
QLineEdit *m_additionalArguments;
};