From e72e07963d3069f913e727bc7982eaf8e546d84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Wed, 18 Mar 2009 17:43:55 +0100
Subject: [PATCH] Initialize run mode correctly
It was missing for CustomExecutableRunConfiguration and
Qt4RunConfiguration.
Reviewed-by: dt
---
.../cmakeprojectmanager/cmakerunconfiguration.cpp | 6 +++++-
src/plugins/genericprojectmanager/genericmakestep.cpp | 4 ++--
.../projectexplorer/customexecutablerunconfiguration.cpp | 5 +++--
src/plugins/qt4projectmanager/makestep.cpp | 7 ++++---
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 9 +++++----
5 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index c86d50f0b06..28213df1e89 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -39,7 +39,11 @@ using namespace CMakeProjectManager;
using namespace CMakeProjectManager::Internal;
CMakeRunConfiguration::CMakeRunConfiguration(CMakeProject *pro, const QString &target, const QString &workingDirectory, const QString &title)
- : ProjectExplorer::ApplicationRunConfiguration(pro), m_runMode(Gui), m_target(target), m_workingDirectory(workingDirectory), m_title(title)
+ : ProjectExplorer::ApplicationRunConfiguration(pro)
+ , m_runMode(Gui)
+ , m_target(target)
+ , m_workingDirectory(workingDirectory)
+ , m_title(title)
{
setName(title);
}
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index cc707266e84..65ae59f8358 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -255,9 +255,9 @@ GenericMakeStepConfigWidget::GenericMakeStepConfigWidget(GenericMakeStep *makeSt
connect(m_ui->targetsList, SIGNAL(itemChanged(QListWidgetItem*)),
this, SLOT(itemChanged(QListWidgetItem*)));
- connect(m_ui->makeLineEdit, SIGNAL(textEdited(const QString&)),
+ connect(m_ui->makeLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(makeLineEditTextEdited()));
- connect(m_ui->makeArgumentsLineEdit, SIGNAL(textEdited(const QString&)),
+ connect(m_ui->makeArgumentsLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(makeArgumentsLineEditTextEdited()));
}
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 7aa185d7386..054663daa77 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -61,7 +61,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
{
m_runConfiguration = rc;
- QFormLayout *layout = new QFormLayout();
+ QFormLayout *layout = new QFormLayout;
layout->setMargin(0);
m_userName = new QLineEdit(this);
@@ -147,7 +147,8 @@ void CustomExecutableConfigurationWidget::changed()
CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Project *pro)
: ApplicationRunConfiguration(pro),
- m_userSetName(false)
+ m_userSetName(false),
+ m_runMode(Gui)
{
m_workingDirectory = "$BUILDDIR";
setName("Custom Executable");
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 362bc881064..b97cf2e4c58 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -272,9 +272,9 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
: BuildStepConfigWidget(), m_makeStep(makeStep)
{
m_ui.setupUi(this);
- connect(m_ui.makeLineEdit, SIGNAL(textEdited(const QString&)),
+ connect(m_ui.makeLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(makeLineEditTextEdited()));
- connect(m_ui.makeArgumentsLineEdit, SIGNAL(textEdited(const QString&)),
+ connect(m_ui.makeArgumentsLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(makeArgumentsLineEditTextEdited()));
}
@@ -312,5 +312,6 @@ void MakeStepConfigWidget::makeLineEditTextEdited()
void MakeStepConfigWidget::makeArgumentsLineEditTextEdited()
{
Q_ASSERT(!m_buildConfiguration.isNull());
- m_makeStep->setValue(m_buildConfiguration, "makeargs", ProjectExplorer::Environment::parseCombinedArgString(m_ui.makeArgumentsLineEdit->text()));
+ m_makeStep->setValue(m_buildConfiguration, "makeargs",
+ ProjectExplorer::Environment::parseCombinedArgString(m_ui.makeArgumentsLineEdit->text()));
}
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 8d784f5f490..433630e54c1 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -54,6 +54,7 @@ using ProjectExplorer::PersistentSettingsWriter;
Qt4RunConfiguration::Qt4RunConfiguration(Qt4Project *pro, QString proFilePath)
: ApplicationRunConfiguration(pro),
m_proFilePath(proFilePath),
+ m_runMode(Gui),
m_userSetName(false),
m_configWidget(0),
m_executableLabel(0),
@@ -111,11 +112,11 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
m_useTerminalCheck->setChecked(m_qt4RunConfiguration->runMode() == ProjectExplorer::ApplicationRunConfiguration::Console);
toplayout->addRow(QString(), m_useTerminalCheck);
- connect(m_argumentsLineEdit, SIGNAL(textEdited(const QString&)),
- this, SLOT(setCommandLineArguments(const QString&)));
+ connect(m_argumentsLineEdit, SIGNAL(textEdited(QString)),
+ this, SLOT(setCommandLineArguments(QString)));
- connect(m_nameLineEdit, SIGNAL(textEdited(const QString&)),
- this, SLOT(nameEdited(const QString&)));
+ connect(m_nameLineEdit, SIGNAL(textEdited(QString)),
+ this, SLOT(nameEdited(QString)));
connect(m_useTerminalCheck, SIGNAL(toggled(bool)),
this, SLOT(termToggled(bool)));
--
GitLab