From 4d8cb3954a587bf3c5716c107115c2fd49ced7b7 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 15 Oct 2009 21:15:31 +0200 Subject: [PATCH] Trk: Cleaned up waiting for finishing. --- src/shared/trk/launcher.cpp | 10 ++-------- src/shared/trk/launcher.h | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/shared/trk/launcher.cpp b/src/shared/trk/launcher.cpp index cae6796aff..5bd9ff5da1 100644 --- a/src/shared/trk/launcher.cpp +++ b/src/shared/trk/launcher.cpp @@ -174,19 +174,13 @@ void Launcher::logMessage(const QString &msg) qDebug() << "LAUNCHER: " << qPrintable(msg); } -void Launcher::waitForTrkFinished(const TrkResult &result) -{ - Q_UNUSED(result) - d->m_device.sendTrkMessage(TrkPing, TrkCallback(this, &Launcher::handleWaitForFinished)); -} - void Launcher::terminate() { //TODO handle case where application has not been started QByteArray ba; appendShort(&ba, 0x0000, TargetByteOrder); appendInt(&ba, d->m_session.pid, TargetByteOrder); - d->m_device.sendTrkMessage(TrkDeleteItem, TrkCallback(this, &Launcher::waitForTrkFinished), ba); + d->m_device.sendTrkMessage(TrkDeleteItem, TrkCallback(this, &Launcher::handleWaitForFinished), ba); } void Launcher::handleResult(const TrkResult &result) @@ -273,7 +267,7 @@ void Launcher::handleResult(const TrkResult &result) if (itemType == 0 // process && result.data.size() >= 10 && d->m_session.pid == extractInt(result.data.data() + 6)) { - d->m_device.sendTrkMessage(TrkDisconnect, TrkCallback(this, &Launcher::waitForTrkFinished)); + d->m_device.sendTrkMessage(TrkDisconnect, TrkCallback(this, &Launcher::handleWaitForFinished)); } break; } diff --git a/src/shared/trk/launcher.h b/src/shared/trk/launcher.h index f8b597dbac..aafb6e4896 100644 --- a/src/shared/trk/launcher.h +++ b/src/shared/trk/launcher.h @@ -103,7 +103,6 @@ private: void handleStop(const TrkResult &result); void handleSupportMask(const TrkResult &result); void handleTrkVersion(const TrkResult &result); - void waitForTrkFinished(const TrkResult &data); void copyFileToRemote(); void installRemotePackageSilently(); -- 2.11.0