From 39164fd08c4ddfdaba18a4af14cb10683fc8d08a Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Wed, 29 Feb 2012 17:58:07 +0100
Subject: [PATCH] Rename S60DeployStep::finished signal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
I introduced a finished signal to the base class.
Task-number: QTCREATORBUG-6984
Change-Id: I785ca3dae496b3ca220ae4d1bc9c9b091c6e7237
Reviewed-by: Paweł Polański <pawel.3.polanski@nokia.com>
---
.../qt4projectmanager/qt-s60/s60deploystep.cpp | 12 ++++++------
src/plugins/qt4projectmanager/qt-s60/s60deploystep.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
index 1db4799c86e..b7b196b9dda 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -197,7 +197,7 @@ void S60DeployStep::reportError(const QString &error)
error,
Utils::FileName(), -1,
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
- emit finished(false);
+ emit s60DeploymentFinished(false);
}
bool S60DeployStep::processPackageName(QString &errorMessage)
@@ -273,7 +273,7 @@ void S60DeployStep::stop()
SymbianDeviceManager::instance()->releaseCodaDevice(m_codaDevice);
}
setState(StateUninit);
- emit finished(false);
+ emit s60DeploymentFinished(false);
}
void S60DeployStep::setupConnections()
@@ -331,10 +331,10 @@ void S60DeployStep::run(QFutureInterface<bool> &fi)
m_futureInterface->setProgressRange(0, 100*m_signedPackages.count());
- connect(this, SIGNAL(finished(bool)), this, SLOT(deploymentFinished(bool)));
+ connect(this, SIGNAL(s60DeploymentFinished(bool)), this, SLOT(deploymentFinished(bool)));
connect(this, SIGNAL(finishNow(bool)), this, SLOT(deploymentFinished(bool)), Qt::DirectConnection);
connect(this, SIGNAL(allFilesSent()), this, SLOT(startInstalling()), Qt::DirectConnection);
- connect(this, SIGNAL(allFilesInstalled()), this, SIGNAL(finished()), Qt::DirectConnection);
+ connect(this, SIGNAL(allFilesInstalled()), this, SIGNAL(s60DeploymentFinished()), Qt::DirectConnection);
connect(this, SIGNAL(copyProgressChanged(int)), this, SLOT(updateProgress(int)));
start();
@@ -577,7 +577,7 @@ void S60DeployStep::checkForTimeout()
return;
QMessageBox *mb = CodaRunControl::createCodaWaitingMessageBox(Core::ICore::mainWindow());
connect(this, SIGNAL(codaConnected()), mb, SLOT(close()));
- connect(this, SIGNAL(finished()), mb, SLOT(close()));
+ connect(this, SIGNAL(s60DeploymentFinished()), mb, SLOT(close()));
connect(this, SIGNAL(finishNow()), mb, SLOT(close()));
connect(mb, SIGNAL(finished(int)), this, SLOT(slotWaitingForCodaClosed(int)));
mb->open();
@@ -590,7 +590,7 @@ void S60DeployStep::showManualInstallationInfo()
QMessageBox *mb = new QMessageBox(QMessageBox::Information, title, text,
QMessageBox::Ok, Core::ICore::mainWindow());
connect(this, SIGNAL(allFilesInstalled()), mb, SLOT(close()));
- connect(this, SIGNAL(finished()), mb, SLOT(close()));
+ connect(this, SIGNAL(s60DeploymentFinished()), mb, SLOT(close()));
connect(this, SIGNAL(finishNow()), mb, SLOT(close()));
mb->open();
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
index 1ba08c87629..33e379bc69c 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
@@ -128,7 +128,7 @@ private slots:
void updateProgress(int progress);
signals:
- void finished(bool success = true);
+ void s60DeploymentFinished(bool success = true);
void finishNow(bool success = true);
void allFilesSent();
--
GitLab