Skip to content
Snippets Groups Projects
Commit 39164fd0 authored by Daniel Teske's avatar Daniel Teske Committed by Paweł Polański
Browse files

Rename S60DeployStep::finished signal


I introduced a finished signal to the base class.

Task-number: QTCREATORBUG-6984
Change-Id: I785ca3dae496b3ca220ae4d1bc9c9b091c6e7237
Reviewed-by: default avatarPaweł Polański <pawel.3.polanski@nokia.com>
parent 3641c8b8
No related branches found
No related tags found
No related merge requests found
...@@ -197,7 +197,7 @@ void S60DeployStep::reportError(const QString &error) ...@@ -197,7 +197,7 @@ void S60DeployStep::reportError(const QString &error)
error, error,
Utils::FileName(), -1, Utils::FileName(), -1,
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))); Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
emit finished(false); emit s60DeploymentFinished(false);
} }
bool S60DeployStep::processPackageName(QString &errorMessage) bool S60DeployStep::processPackageName(QString &errorMessage)
...@@ -273,7 +273,7 @@ void S60DeployStep::stop() ...@@ -273,7 +273,7 @@ void S60DeployStep::stop()
SymbianDeviceManager::instance()->releaseCodaDevice(m_codaDevice); SymbianDeviceManager::instance()->releaseCodaDevice(m_codaDevice);
} }
setState(StateUninit); setState(StateUninit);
emit finished(false); emit s60DeploymentFinished(false);
} }
void S60DeployStep::setupConnections() void S60DeployStep::setupConnections()
...@@ -331,10 +331,10 @@ void S60DeployStep::run(QFutureInterface<bool> &fi) ...@@ -331,10 +331,10 @@ void S60DeployStep::run(QFutureInterface<bool> &fi)
m_futureInterface->setProgressRange(0, 100*m_signedPackages.count()); 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(finishNow(bool)), this, SLOT(deploymentFinished(bool)), Qt::DirectConnection);
connect(this, SIGNAL(allFilesSent()), this, SLOT(startInstalling()), 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))); connect(this, SIGNAL(copyProgressChanged(int)), this, SLOT(updateProgress(int)));
start(); start();
...@@ -577,7 +577,7 @@ void S60DeployStep::checkForTimeout() ...@@ -577,7 +577,7 @@ void S60DeployStep::checkForTimeout()
return; return;
QMessageBox *mb = CodaRunControl::createCodaWaitingMessageBox(Core::ICore::mainWindow()); QMessageBox *mb = CodaRunControl::createCodaWaitingMessageBox(Core::ICore::mainWindow());
connect(this, SIGNAL(codaConnected()), mb, SLOT(close())); 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(this, SIGNAL(finishNow()), mb, SLOT(close()));
connect(mb, SIGNAL(finished(int)), this, SLOT(slotWaitingForCodaClosed(int))); connect(mb, SIGNAL(finished(int)), this, SLOT(slotWaitingForCodaClosed(int)));
mb->open(); mb->open();
...@@ -590,7 +590,7 @@ void S60DeployStep::showManualInstallationInfo() ...@@ -590,7 +590,7 @@ void S60DeployStep::showManualInstallationInfo()
QMessageBox *mb = new QMessageBox(QMessageBox::Information, title, text, QMessageBox *mb = new QMessageBox(QMessageBox::Information, title, text,
QMessageBox::Ok, Core::ICore::mainWindow()); QMessageBox::Ok, Core::ICore::mainWindow());
connect(this, SIGNAL(allFilesInstalled()), mb, SLOT(close())); 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())); connect(this, SIGNAL(finishNow()), mb, SLOT(close()));
mb->open(); mb->open();
} }
......
...@@ -128,7 +128,7 @@ private slots: ...@@ -128,7 +128,7 @@ private slots:
void updateProgress(int progress); void updateProgress(int progress);
signals: signals:
void finished(bool success = true); void s60DeploymentFinished(bool success = true);
void finishNow(bool success = true); void finishNow(bool success = true);
void allFilesSent(); void allFilesSent();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment