[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:12:14 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=6f973db
The following commit has been merged in the master branch:
commit 6f973db5d9dec7b03c9ec8d4098b1f350e2b3ca3
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Dec 29 17:35:19 2011 +0100
Fix style
---
src/filetransfer-handler.cpp | 4 +-
src/handle-incoming-file-transfer-channel-job.cpp | 208 +++++++++++-----------
src/handle-outgoing-file-transfer-channel-job.cpp | 96 +++++-----
src/main.cpp | 2 +-
src/telepathy-base-job.h | 107 +++++------
src/telepathy-base-job_p.h | 6 +-
6 files changed, 211 insertions(+), 212 deletions(-)
diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index ed0f00b..9b167b8 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -110,7 +110,7 @@ void FileTransferHandler::handleChannels(const Tp::MethodInvocationContextPtr<>
SLOT(onInfoMessage(KJob*, QString, QString)));
connect(job,
SIGNAL(result(KJob*)),
- SLOT (handleResult(KJob*)));
+ SLOT(handleResult(KJob*)));
job->start();
}
}
@@ -125,7 +125,7 @@ void FileTransferHandler::onInfoMessage(KJob* job, const QString &plain, const Q
void FileTransferHandler::handleResult(KJob* job)
{
kDebug();
- if ( job->error() ) {
+ if (job->error()) {
kWarning() << job->errorString();
// TODO do something;
}
diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 7bb5afb..899a77b 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -40,34 +40,34 @@ class HandleIncomingFileTransferChannelJobPrivate : public KTp::TelepathyBaseJob
{
Q_DECLARE_PUBLIC(HandleIncomingFileTransferChannelJob)
- public:
- HandleIncomingFileTransferChannelJobPrivate();
- virtual ~HandleIncomingFileTransferChannelJobPrivate();
-
- Tp::IncomingFileTransferChannelPtr channel;
- QString downloadDirectory;
- QFile* file;
- KUrl url, partUrl;
- qulonglong offset;
- bool isResuming;
- QWeakPointer<KIO::RenameDialog> renameDialog;
-
- void init();
- void start();
- bool kill();
- void checkPartFile();
- void receiveFile();
-
- void __k__onRenameDialogFinished(int result);
- void __k__onResumeDialogFinished(int result);
- void __k__onSetUriOperationFinished(Tp::PendingOperation* op);
- void __k__onInitialOffsetDefined(qulonglong offset);
- void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason);
- void __k__onFileTransferChannelTransferredBytesChanged(qulonglong count);
- void __k__acceptFile();
- void __k__onAcceptFileFinished(Tp::PendingOperation* op);
- void __k__onCancelOperationFinished(Tp::PendingOperation* op);
- void __k__onInvalidated();
+public:
+ HandleIncomingFileTransferChannelJobPrivate();
+ virtual ~HandleIncomingFileTransferChannelJobPrivate();
+
+ Tp::IncomingFileTransferChannelPtr channel;
+ QString downloadDirectory;
+ QFile* file;
+ KUrl url, partUrl;
+ qulonglong offset;
+ bool isResuming;
+ QWeakPointer<KIO::RenameDialog> renameDialog;
+
+ void init();
+ void start();
+ bool kill();
+ void checkPartFile();
+ void receiveFile();
+
+ void __k__onRenameDialogFinished(int result);
+ void __k__onResumeDialogFinished(int result);
+ void __k__onSetUriOperationFinished(Tp::PendingOperation* op);
+ void __k__onInitialOffsetDefined(qulonglong offset);
+ void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason);
+ void __k__onFileTransferChannelTransferredBytesChanged(qulonglong count);
+ void __k__acceptFile();
+ void __k__onAcceptFileFinished(Tp::PendingOperation* op);
+ void __k__onCancelOperationFinished(Tp::PendingOperation* op);
+ void __k__onInvalidated();
};
HandleIncomingFileTransferChannelJob::HandleIncomingFileTransferChannelJob(Tp::IncomingFileTransferChannelPtr channel,
@@ -143,7 +143,7 @@ void HandleIncomingFileTransferChannelJobPrivate::init()
q->setProcessedAmount(KJob::Bytes, 0);
q->connect(channel.data(),
- SIGNAL(invalidated(Tp::DBusProxy*,QString,QString)),
+ SIGNAL(invalidated(Tp::DBusProxy*, QString, QString)),
SLOT(__k__onInvalidated()));
q->connect(channel.data(),
SIGNAL(initialOffsetDefined(qulonglong)),
@@ -218,23 +218,23 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onRenameDialogFinished(in
Q_ASSERT(renameDialog.data()->result() == result);
switch (result) {
- case KIO::R_CANCEL:
- // TODO Cancel file transfer and close channel
- channel->cancel();
- QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
- return;
- case KIO::R_RENAME:
- url = renameDialog.data()->newDestUrl();
- break;
- case KIO::R_OVERWRITE:
- break;
- default:
- kWarning() << "Unknown Error";
- q->setError(KTp::KTpError);
- q->setErrorText(i18n("Unknown Error"));
- renameDialog.data()->deleteLater();
- QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
- return;
+ case KIO::R_CANCEL:
+ // TODO Cancel file transfer and close channel
+ channel->cancel();
+ QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
+ return;
+ case KIO::R_RENAME:
+ url = renameDialog.data()->newDestUrl();
+ break;
+ case KIO::R_OVERWRITE:
+ break;
+ default:
+ kWarning() << "Unknown Error";
+ q->setError(KTp::KTpError);
+ q->setErrorText(i18n("Unknown Error"));
+ renameDialog.data()->deleteLater();
+ QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
+ return;
}
renameDialog.data()->deleteLater();
renameDialog.clear();
@@ -289,21 +289,21 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onResumeDialogFinished(in
Q_ASSERT(renameDialog.data()->result() == result);
switch (result) {
- case KIO::R_RESUME:
- {
- QFileInfo fileInfo(partUrl.toLocalFile());
- offset = fileInfo.size();
- isResuming = true;
- break;
- }
- case KIO::R_RENAME:
- // If the user hits rename, we use the new name as the .part file
- partUrl = renameDialog.data()->newDestUrl();
- break;
- case KIO::R_CANCEL:
- // If user hits cancel .part file will be overwritten
- default:
- break;
+ case KIO::R_RESUME:
+ {
+ QFileInfo fileInfo(partUrl.toLocalFile());
+ offset = fileInfo.size();
+ isResuming = true;
+ break;
+ }
+ case KIO::R_RENAME:
+ // If the user hits rename, we use the new name as the .part file
+ partUrl = renameDialog.data()->newDestUrl();
+ break;
+ case KIO::R_CANCEL:
+ // If user hits cancel .part file will be overwritten
+ default:
+ break;
}
receiveFile();
@@ -398,7 +398,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onInitialOffsetDefined(qu
}
void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelStateChanged(Tp::FileTransferState state,
- Tp::FileTransferStateChangeReason stateReason)
+ Tp::FileTransferStateChangeReason stateReason)
{
kDebug();
Q_Q(HandleIncomingFileTransferChannelJob);
@@ -406,48 +406,48 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
kDebug() << "Incoming file transfer channel state changed to" << state << "with reason" << stateReason;
switch (state) {
- case Tp::FileTransferStateNone:
- // This is bad
- kWarning() << "An unknown error occurred.";
- q->setError(KTp::TelepathyErrorError);
- q->setErrorText(i18n("An unknown error occurred"));
- QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
+ case Tp::FileTransferStateNone:
+ // This is bad
+ kWarning() << "An unknown error occurred.";
+ q->setError(KTp::TelepathyErrorError);
+ q->setErrorText(i18n("An unknown error occurred"));
+ QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
+ break;
+ case Tp::FileTransferStateCompleted:
+ {
+ QFileInfo fileinfo(url.toLocalFile());
+ if (fileinfo.exists()) {
+ QFile::remove(url.toLocalFile());
+ }
+ file->rename(url.toLocalFile());
+ file->flush();
+ file->close();
+ kDebug() << "Incoming file transfer completed, saved at" << file->fileName();
+ Q_EMIT q->infoMessage(q, i18n("Incoming file transfer")); // [Finished] is added automatically to the notification
+ QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
break;
- case Tp::FileTransferStateCompleted:
- {
- QFileInfo fileinfo(url.toLocalFile());
- if (fileinfo.exists()) {
- QFile::remove(url.toLocalFile());
- }
- file->rename(url.toLocalFile());
- file->flush();
+ }
+ case Tp::FileTransferStateCancelled:
+ {
+ q->setError(KTp::FileTransferCancelled);
+ q->setErrorText(i18n("Incoming file transfer was canceled."));
+ // Close .part file if open
+ if (file->isOpen()) {
file->close();
- kDebug() << "Incoming file transfer completed, saved at" << file->fileName();
- Q_EMIT q->infoMessage(q, i18n("Incoming file transfer")); // [Finished] is added automatically to the notification
- QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
- break;
}
- case Tp::FileTransferStateCancelled:
- {
- q->setError(KTp::FileTransferCancelled);
- q->setErrorText(i18n("Incoming file transfer was canceled."));
- // Close .part file if open
- if (file->isOpen()) {
- file->close();
- }
- // Delete the old file if exists
- QFile oldFile(url.toLocalFile(), 0);
- if (oldFile.exists()) {
- oldFile.remove();
- }
- q->kill(KJob::Quietly);
- break;
+ // Delete the old file if exists
+ QFile oldFile(url.toLocalFile(), 0);
+ if (oldFile.exists()) {
+ oldFile.remove();
}
- case Tp::FileTransferStateAccepted:
- case Tp::FileTransferStatePending:
- case Tp::FileTransferStateOpen:
- default:
- break;
+ q->kill(KJob::Quietly);
+ break;
+ }
+ case Tp::FileTransferStateAccepted:
+ case Tp::FileTransferStatePending:
+ case Tp::FileTransferStateOpen:
+ default:
+ break;
}
}
@@ -458,7 +458,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelTran
kDebug().nospace() << "Receiving " << channel->fileName() << " - "
<< "transferred bytes" << " = " << offset + count << " ("
- << ((int) (((double) (offset + count) / channel->size()) * 100)) << "% done)";
+ << ((int)(((double)(offset + count) / channel->size()) * 100)) << "% done)";
q->setProcessedAmount(KJob::Bytes, offset + count);
}
@@ -470,8 +470,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onAcceptFileFinished(Tp::
Q_Q(HandleIncomingFileTransferChannelJob);
if (op->isError()) {
- kWarning() << "Unable to accept file -" <<
- op->errorName() << ":" << op->errorMessage();
+ kWarning() << "Unable to accept file -" << op->errorName() << ":" << op->errorMessage();
q->setError(KTp::AcceptFileError);
q->setErrorText(i18n("Unable to accept file"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
@@ -484,8 +483,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onCancelOperationFinished
Q_Q(HandleIncomingFileTransferChannelJob);
if (op->isError()) {
- kWarning() << "Unable to cancel file transfer - " <<
- op->errorName() << ":" << op->errorMessage();
+ kWarning() << "Unable to cancel file transfer - " << op->errorName() << ":" << op->errorMessage();
q->setError(KTp::CancelFileTransferError);
q->setErrorText(i18n("Cannot cancel incoming file transfer"));
}
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index 07afc04..0a3f571 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -37,26 +37,26 @@ class HandleOutgoingFileTransferChannelJobPrivate : public KTp::TelepathyBaseJob
{
Q_DECLARE_PUBLIC(HandleOutgoingFileTransferChannelJob)
- public:
- HandleOutgoingFileTransferChannelJobPrivate();
- virtual ~HandleOutgoingFileTransferChannelJobPrivate();
-
- Tp::OutgoingFileTransferChannelPtr channel;
- QFile* file;
- KUrl uri;
- qulonglong offset;
-
- void init();
- bool kill();
- void provideFile();
-
- void __k__start();
- void __k__onInitialOffsetDefined(qulonglong offset);
- void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason);
- void __k__onFileTransferChannelTransferredBytesChanged(qulonglong count);
- void __k__onProvideFileFinished(Tp::PendingOperation* op);
- void __k__onCancelOperationFinished(Tp::PendingOperation* op);
- void __k__onInvalidated();
+public:
+ HandleOutgoingFileTransferChannelJobPrivate();
+ virtual ~HandleOutgoingFileTransferChannelJobPrivate();
+
+ Tp::OutgoingFileTransferChannelPtr channel;
+ QFile* file;
+ KUrl uri;
+ qulonglong offset;
+
+ void init();
+ bool kill();
+ void provideFile();
+
+ void __k__start();
+ void __k__onInitialOffsetDefined(qulonglong offset);
+ void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason);
+ void __k__onFileTransferChannelTransferredBytesChanged(qulonglong count);
+ void __k__onProvideFileFinished(Tp::PendingOperation* op);
+ void __k__onCancelOperationFinished(Tp::PendingOperation* op);
+ void __k__onInvalidated();
};
HandleOutgoingFileTransferChannelJob::HandleOutgoingFileTransferChannelJob(Tp::OutgoingFileTransferChannelPtr channel,
@@ -217,30 +217,30 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
kDebug() << "Outgoing file transfer channel state changed to" << state << "with reason" << stateReason;
switch (state) {
- case Tp::FileTransferStateNone:
- // This is bad
- kWarning() << "An unknown error occurred.";
- q->setError(KTp::TelepathyErrorError);
- q->setErrorText(i18n("An unknown error occurred"));
- QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
- break;
- case Tp::FileTransferStateCompleted:
- kDebug() << "Outgoing file transfer completed";
- Q_EMIT q->infoMessage(q, i18n("Outgoing file transfer")); // [Finished] is added automatically to the notification
- QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
- break;
- case Tp::FileTransferStateCancelled:
- q->setError(KTp::FileTransferCancelled);
- q->setErrorText(i18n("Outgoing file transfer was canceled."));
- q->kill(KJob::Quietly);
- break;
- case Tp::FileTransferStateAccepted:
- provideFile();
- break;
- case Tp::FileTransferStatePending:
- case Tp::FileTransferStateOpen:
- default:
- break;
+ case Tp::FileTransferStateNone:
+ // This is bad
+ kWarning() << "An unknown error occurred.";
+ q->setError(KTp::TelepathyErrorError);
+ q->setErrorText(i18n("An unknown error occurred"));
+ QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
+ break;
+ case Tp::FileTransferStateCompleted:
+ kDebug() << "Outgoing file transfer completed";
+ Q_EMIT q->infoMessage(q, i18n("Outgoing file transfer")); // [Finished] is added automatically to the notification
+ QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
+ break;
+ case Tp::FileTransferStateCancelled:
+ q->setError(KTp::FileTransferCancelled);
+ q->setErrorText(i18n("Outgoing file transfer was canceled."));
+ q->kill(KJob::Quietly);
+ break;
+ case Tp::FileTransferStateAccepted:
+ provideFile();
+ break;
+ case Tp::FileTransferStatePending:
+ case Tp::FileTransferStateOpen:
+ default:
+ break;
}
}
@@ -265,7 +265,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelTran
kDebug().nospace() << "Sending " << channel->fileName() << " - "
<< "Transferred bytes = " << offset + count << " ("
- << ((int) (((double) (offset + count) / channel->size()) * 100)) << "% done)";
+ << ((int)(((double)(offset + count) / channel->size()) * 100)) << "% done)";
q->setProcessedAmount(KJob::Bytes, offset + count);
}
@@ -277,8 +277,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onProvideFileFinished(Tp:
Q_Q(HandleOutgoingFileTransferChannelJob);
if (op->isError()) {
- kWarning() << "Unable to provide file - " <<
- op->errorName() << ":" << op->errorMessage();
+ kWarning() << "Unable to provide file - " << op->errorName() << ":" << op->errorMessage();
q->setError(KTp::ProvideFileError);
q->setErrorText(i18n("Cannot provide file"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
@@ -291,8 +290,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onCancelOperationFinished
Q_Q(HandleOutgoingFileTransferChannelJob);
if (op->isError()) {
- kWarning() << "Unable to cancel file transfer - " <<
- op->errorName() << ":" << op->errorMessage();
+ kWarning() << "Unable to cancel file transfer - " << op->errorName() << ":" << op->errorMessage();
q->setError(KTp::CancelFileTransferError);
q->setErrorText(i18n("Cannot cancel outgoing file transfer"));
}
diff --git a/src/main.cpp b/src/main.cpp
index e34fe8c..4af2022 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,7 +56,7 @@ int main(int argc, char* argv[])
contactFactory);
Tp::SharedPtr<FileTransferHandler> fth = Tp::SharedPtr<FileTransferHandler>(new FileTransferHandler(&app));
- if(!registrar->registerClient(Tp::AbstractClientPtr(fth), QLatin1String("KTp.FileTransferHandler"))) {
+ if (!registrar->registerClient(Tp::AbstractClientPtr(fth), QLatin1String("KTp.FileTransferHandler"))) {
kDebug() << "File Transfer Handler already running. Exiting";
return 1;
}
diff --git a/src/telepathy-base-job.h b/src/telepathy-base-job.h
index 73e7df8..d4d3003 100644
--- a/src/telepathy-base-job.h
+++ b/src/telepathy-base-job.h
@@ -24,62 +24,63 @@
#include <kdemacros.h>
#include <KJob>
-namespace KTp {
+namespace KTp
+{
+/**
+ * This enum defines the error code for a job spawned by one of the functions inside
--
ktp-filetransfer-handler packaging
More information about the pkg-kde-commits
mailing list