[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=8af522b

The following commit has been merged in the master branch:
commit 8af522b904bb422e6360800a50252855286ec70e
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sun Dec 18 02:44:13 2011 +0100

    start() and kill() methods no longer need to be asynchronous
---
 src/handle-incoming-file-transfer-channel-job.cpp | 16 ++++++++--------
 src/handle-incoming-file-transfer-channel-job.h   |  5 +----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index ed241ef..7645b46 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -52,12 +52,11 @@ class HandleIncomingFileTransferChannelJobPrivate : public KTp::TelepathyBaseJob
         QWeakPointer<KIO::RenameDialog> renameDialog;
 
         void init();
+        void start();
+        bool kill();
         void checkPartFile();
         void receiveFile();
 
-        void __k__start();
-        bool __k__kill();
-
         void __k__onRenameDialogFinished(int result);
         void __k__onResumeDialogFinished(int result);
         void __k__onSetUriOperationFinished(Tp::PendingOperation* op);
@@ -92,14 +91,15 @@ HandleIncomingFileTransferChannelJob::~HandleIncomingFileTransferChannelJob()
 void HandleIncomingFileTransferChannelJob::start()
 {
     kDebug();
-    QTimer::singleShot(0, this, SLOT(__k__start()));
+    Q_D(HandleIncomingFileTransferChannelJob);
+    d->start();
 }
 
 bool HandleIncomingFileTransferChannelJob::doKill()
 {
     kDebug() << "Incoming file transfer killed.";
-    QTimer::singleShot(0, this, SLOT(__k__kill()));
-    return true;
+    Q_D(HandleIncomingFileTransferChannelJob);
+    return d->kill();
 }
 
 HandleIncomingFileTransferChannelJobPrivate::HandleIncomingFileTransferChannelJobPrivate()
@@ -156,7 +156,7 @@ void HandleIncomingFileTransferChannelJobPrivate::init()
                SLOT(__k__onFileTransferChannelTransferredBytesChanged(qulonglong)));
 }
 
-void HandleIncomingFileTransferChannelJobPrivate::__k__start()
+void HandleIncomingFileTransferChannelJobPrivate::start()
 {
     kDebug();
     Q_Q(HandleIncomingFileTransferChannelJob);
@@ -335,7 +335,7 @@ void HandleIncomingFileTransferChannelJobPrivate::receiveFile()
                SLOT(__k__onSetUriOperationFinished(Tp::PendingOperation*)));
 }
 
-bool HandleIncomingFileTransferChannelJobPrivate::__k__kill()
+bool HandleIncomingFileTransferChannelJobPrivate::kill()
 {
     kDebug();
     Q_Q(HandleIncomingFileTransferChannelJob);
diff --git a/src/handle-incoming-file-transfer-channel-job.h b/src/handle-incoming-file-transfer-channel-job.h
index f47ffa5..d5e53c4 100644
--- a/src/handle-incoming-file-transfer-channel-job.h
+++ b/src/handle-incoming-file-transfer-channel-job.h
@@ -36,10 +36,7 @@ class HandleIncomingFileTransferChannelJob : public KTp::TelepathyBaseJob
     Q_DISABLE_COPY(HandleIncomingFileTransferChannelJob)
     Q_DECLARE_PRIVATE(HandleIncomingFileTransferChannelJob)
 
-//     // Our Q_PRIVATE_SLOTS who perform the real job
-    Q_PRIVATE_SLOT(d_func(), void __k__start())
-    Q_PRIVATE_SLOT(d_func(), void __k__kill())
-
+    // Our Q_PRIVATE_SLOTS who perform the real job
     Q_PRIVATE_SLOT(d_func(), void __k__onRenameDialogFinished(int result))
     Q_PRIVATE_SLOT(d_func(), void __k__onResumeDialogFinished(int result))
     Q_PRIVATE_SLOT(d_func(), void __k__onSetUriOperationFinished(Tp::PendingOperation* op))

-- 
ktp-filetransfer-handler packaging