From b58297fe25a4b441ec47a39367e82f47ad4cec9a Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 16 Feb 2010 12:26:18 +0100
Subject: [PATCH] Use the ProjectConfiguration's displayNameChanged signal
Reviewed-by: dt
---
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 8 ++++----
src/plugins/qt4projectmanager/qt4runconfiguration.h | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index c57728b9f18..417778848cc 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -287,8 +287,8 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
connect(qt4RunConfiguration, SIGNAL(commandLineArgumentsChanged(QString)),
this, SLOT(commandLineArgumentsChanged(QString)));
- connect(qt4RunConfiguration, SIGNAL(displayNameChanged(QString)),
- this, SLOT(displayNameChanged(QString)));
+ connect(qt4RunConfiguration, SIGNAL(displayNameChanged()),
+ this, SLOT(displayNameChanged()));
connect(qt4RunConfiguration, SIGNAL(runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode)),
this, SLOT(runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode)));
connect(qt4RunConfiguration, SIGNAL(usingDyldImageSuffixChanged(bool)),
@@ -395,10 +395,10 @@ void Qt4RunConfigurationWidget::commandLineArgumentsChanged(const QString &args)
m_argumentsLineEdit->setText(args);
}
-void Qt4RunConfigurationWidget::displayNameChanged(const QString &name)
+void Qt4RunConfigurationWidget::displayNameChanged()
{
if (!m_ignoreChange)
- m_nameLineEdit->setText(name);
+ m_nameLineEdit->setText(m_qt4RunConfiguration->displayName());
}
void Qt4RunConfigurationWidget::runModeChanged(LocalApplicationRunConfiguration::RunMode runMode)
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 3bb94154f4d..2d12ddc1a51 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -99,7 +99,6 @@ public slots:
void invalidateCachedTargetInformation();
signals:
- void displayNameChanged(const QString&);
void commandLineArgumentsChanged(const QString&);
void workingDirectoryChanged(const QString&);
void runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode);
@@ -171,7 +170,7 @@ private slots:
void workingDirectoryChanged(const QString &workingDirectory);
void commandLineArgumentsChanged(const QString &args);
- void displayNameChanged(const QString &name);
+ void displayNameChanged();
void runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode);
void userEnvironmentChangesChanged(const QList<ProjectExplorer::EnvironmentItem> &userChanges);
void baseEnvironmentChanged();
--
GitLab