From d654612cfb350b3b509ce5eed4ac04db24af0874 Mon Sep 17 00:00:00 2001
From: Pawel Polanski <pawel.3.polanski@nokia.com>
Date: Tue, 3 Aug 2010 15:07:26 +0200
Subject: [PATCH] Small cleanup for Symbian's RunConfiguration
---
.../qt-s60/s60devicerunconfiguration.cpp | 8 ++++----
.../qt4projectmanager/qt-s60/s60devicerunconfiguration.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 311f2c32035..613930cedf6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -603,8 +603,8 @@ void S60DeviceRunControlBase::start()
{
m_deployProgress = new QFutureInterface<void>;
Core::ICore::instance()->progressManager()->addTask(m_deployProgress->future(),
- tr("Deploying"),
- QLatin1String("Symbian.Deploy"));
+ tr("Launching"),
+ QLatin1String("Symbian.Launch"));
m_deployProgress->setProgressRange(0, PROGRESS_MAX);
m_deployProgress->setProgressValue(0);
m_deployProgress->reportStarted();
@@ -631,7 +631,7 @@ void S60DeviceRunControlBase::start()
return;
}
- startDeployment();
+ startLaunching();
}
static inline void stopProcess(QProcess *p)
@@ -657,7 +657,7 @@ bool S60DeviceRunControlBase::isRunning() const
return false;
}
-void S60DeviceRunControlBase::startDeployment()
+void S60DeviceRunControlBase::startLaunching()
{
QString errorMessage;
bool success = false;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index b2c7a4883a2..83e57633ce6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -193,7 +193,7 @@ private slots:
void reportDeployFinished();
private:
- void startDeployment();
+ void startLaunching();
ProjectExplorer::ToolChain::ToolChainType m_toolChain;
QString m_serialPortName;
--
GitLab