[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:11:54 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=3fd20a9
The following commit has been merged in the master branch:
commit 3fd20a901d67d0300fb16df042b141fb3930064f
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Wed Nov 23 22:41:10 2011 +0100
Port to new KTelepathy internal library. Also, move KTelepathy to KTp for consistency
---
src/filetransfer-handler.cpp | 4 ++--
src/handle-incoming-file-transfer-channel-job.cpp | 16 ++++++++--------
src/handle-incoming-file-transfer-channel-job.h | 2 +-
src/handle-outgoing-file-transfer-channel-job.cpp | 18 +++++++++---------
src/handle-outgoing-file-transfer-channel-job.h | 2 +-
src/main.cpp | 2 +-
src/telepathy-base-job.cpp | 4 ++--
src/telepathy-base-job.h | 4 ++--
src/telepathy-base-job_p.h | 4 ++--
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index 86192f2..3aee1a8 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -65,7 +65,7 @@ void FileTransferHandler::handleChannels(const Tp::MethodInvocationContextPtr<>
Q_ASSERT(channels.size() == 1);
- if (KTelepathy::TelepathyHandlerApplication::newJob() >= 0) {
+ if (KTp::TelepathyHandlerApplication::newJob() >= 0) {
context->setFinished();
} else {
context->setFinishedWithError(QLatin1String("org.freedesktop.Telepathy.KDE.FileTransfer.Exiting"),
@@ -130,7 +130,7 @@ void FileTransferHandler::handleResult(KJob* job)
// TODO do something;
}
- KTelepathy::TelepathyHandlerApplication::jobFinished();
+ KTp::TelepathyHandlerApplication::jobFinished();
}
#include "filetransfer-handler.moc"
diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index d2efa44..028b30f 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -36,7 +36,7 @@
#include <TelepathyQt4/Contact>
-class HandleIncomingFileTransferChannelJobPrivate : public KTelepathy::TelepathyBaseJobPrivate
+class HandleIncomingFileTransferChannelJobPrivate : public KTp::TelepathyBaseJobPrivate
{
Q_DECLARE_PUBLIC(HandleIncomingFileTransferChannelJob)
@@ -92,7 +92,7 @@ void HandleIncomingFileTransferChannelJob::start()
bool HandleIncomingFileTransferChannelJob::doKill()
{
kWarning() << "Incoming file transfer was canceled.";
- setError(KTelepathy::FileTransferCancelled);
+ setError(KTp::FileTransferCancelled);
setErrorText(i18n("Incoming file transfer was canceled."));
QTimer::singleShot(0, this, SLOT(__k__kill()));
return true;
@@ -117,7 +117,7 @@ void HandleIncomingFileTransferChannelJobPrivate::init()
if (channel.isNull())
{
kError() << "Channel cannot be NULL";
- q->setError(KTelepathy::NullChannel);
+ q->setError(KTp::NullChannel);
q->setErrorText(i18n("Invalid channel"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
return;
@@ -127,7 +127,7 @@ void HandleIncomingFileTransferChannelJobPrivate::init()
if (!channel->isReady(Tp::Features() << Tp::FileTransferChannel::FeatureCore))
{
kError() << "Channel must be ready with Tp::FileTransferChannel::FeatureCore";
- q->setError(KTelepathy::FeatureNotReady);
+ q->setError(KTp::FeatureNotReady);
q->setErrorText(i18n("Channel is not ready"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
return;
@@ -212,7 +212,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__start()
break;
default:
kWarning() << "Unknown Error";
- q->setError(KTelepathy::KTelepathyError);
+ q->setError(KTp::KTelepathyError);
q->setErrorText(i18n("Unknown Error"));
renameDialog.data()->deleteLater();
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
@@ -276,7 +276,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
case Tp::FileTransferStateNone:
// This is bad
kWarning() << "An unknown error occurred.";
- q->setError(KTelepathy::TelepathyErrorError);
+ q->setError(KTp::TelepathyErrorError);
q->setErrorText(i18n("An unknown error occurred"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
break;
@@ -317,7 +317,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onAcceptFileFinished(Tp::
if (op->isError()) {
kWarning() << "Unable to accept file -" <<
op->errorName() << ":" << op->errorMessage();
- q->setError(KTelepathy::AcceptFileError);
+ q->setError(KTp::AcceptFileError);
q->setErrorText(i18n("Unable to accept file"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
}
@@ -331,7 +331,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onCancelOperationFinished
if (op->isError()) {
kWarning() << "Unable to cancel file transfer - " <<
op->errorName() << ":" << op->errorMessage();
- q->setError(KTelepathy::CancelFileTransferError);
+ q->setError(KTp::CancelFileTransferError);
q->setErrorText(i18n("Cannot cancel incoming file transfer"));
}
diff --git a/src/handle-incoming-file-transfer-channel-job.h b/src/handle-incoming-file-transfer-channel-job.h
index d2fa6f6..1807d2d 100644
--- a/src/handle-incoming-file-transfer-channel-job.h
+++ b/src/handle-incoming-file-transfer-channel-job.h
@@ -30,7 +30,7 @@ namespace Tp {
class HandleIncomingFileTransferChannelJobPrivate;
-class HandleIncomingFileTransferChannelJob : public KTelepathy::TelepathyBaseJob
+class HandleIncomingFileTransferChannelJob : public KTp::TelepathyBaseJob
{
Q_OBJECT
Q_DISABLE_COPY(HandleIncomingFileTransferChannelJob)
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index 41d32ab..2b01961 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -33,7 +33,7 @@
#include <TelepathyQt4/PendingOperation>
#include <TelepathyQt4/Contact>
-class HandleOutgoingFileTransferChannelJobPrivate : public KTelepathy::TelepathyBaseJobPrivate
+class HandleOutgoingFileTransferChannelJobPrivate : public KTp::TelepathyBaseJobPrivate
{
Q_DECLARE_PUBLIC(HandleOutgoingFileTransferChannelJob)
@@ -86,7 +86,7 @@ void HandleOutgoingFileTransferChannelJob::start()
bool HandleOutgoingFileTransferChannelJob::doKill()
{
kWarning() << "Outgoing file transfer was canceled.";
- setError(KTelepathy::FileTransferCancelled);
+ setError(KTp::FileTransferCancelled);
setErrorText(i18n("Outgoing file transfer was canceled."));
QTimer::singleShot(0, this, SLOT(__k__kill()));
return true;
@@ -111,7 +111,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::init()
if (channel.isNull())
{
kError() << "Channel cannot be NULL";
- q->setError(KTelepathy::NullChannel);
+ q->setError(KTp::NullChannel);
q->setErrorText(i18n("Invalid channel"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
return;
@@ -121,7 +121,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::init()
if (!channel->isReady(Tp::Features() << Tp::FileTransferChannel::FeatureCore))
{
kError() << "Channel must be ready with Tp::FileTransferChannel::FeatureCore";
- q->setError(KTelepathy::FeatureNotReady);
+ q->setError(KTp::FeatureNotReady);
q->setErrorText(i18n("Channel is not ready"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
return;
@@ -131,7 +131,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::init()
if (uri.isEmpty())
{
qWarning() << "URI property missing";
- q->setError(KTelepathy::UriPropertyMissing);
+ q->setError(KTp::UriPropertyMissing);
q->setErrorText(i18n("URI property is missing"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
return;
@@ -140,7 +140,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::init()
{
// TODO handle this!
qWarning() << "Not a local file";
- q->setError(KTelepathy::NotALocalFile);
+ q->setError(KTp::NotALocalFile);
q->setErrorText(i18n("This is not a local file"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
return;
@@ -207,7 +207,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
case Tp::FileTransferStateNone:
// This is bad
kWarning() << "An unknown error occurred.";
- q->setError(KTelepathy::TelepathyErrorError);
+ q->setError(KTp::TelepathyErrorError);
q->setErrorText(i18n("An unknown error occurred"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
break;
@@ -264,7 +264,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onProvideFileFinished(Tp:
if (op->isError()) {
kWarning() << "Unable to provide file - " <<
op->errorName() << ":" << op->errorMessage();
- q->setError(KTelepathy::ProvideFileError);
+ q->setError(KTp::ProvideFileError);
q->setErrorText(i18n("Cannot provide file"));
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
}
@@ -278,7 +278,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onCancelOperationFinished
if (op->isError()) {
kWarning() << "Unable to cancel file transfer - " <<
op->errorName() << ":" << op->errorMessage();
- q->setError(KTelepathy::CancelFileTransferError);
+ q->setError(KTp::CancelFileTransferError);
q->setErrorText(i18n("Cannot cancel outgoing file transfer"));
}
diff --git a/src/handle-outgoing-file-transfer-channel-job.h b/src/handle-outgoing-file-transfer-channel-job.h
index 5d576ad..2eb2445 100644
--- a/src/handle-outgoing-file-transfer-channel-job.h
+++ b/src/handle-outgoing-file-transfer-channel-job.h
@@ -30,7 +30,7 @@ namespace Tp {
class HandleOutgoingFileTransferChannelJobPrivate;
-class HandleOutgoingFileTransferChannelJob : public KTelepathy::TelepathyBaseJob
+class HandleOutgoingFileTransferChannelJob : public KTp::TelepathyBaseJob
{
Q_OBJECT
Q_DISABLE_COPY(HandleOutgoingFileTransferChannelJob)
diff --git a/src/main.cpp b/src/main.cpp
index 62e7a6e..ebd1961 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char* argv[])
aboutData.setProductName("telepathy/filetransfer");
KCmdLineArgs::init(argc, argv, &aboutData);
- KTelepathy::TelepathyHandlerApplication app;
+ KTp::TelepathyHandlerApplication app;
Tp::AccountFactoryPtr accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus());
diff --git a/src/telepathy-base-job.cpp b/src/telepathy-base-job.cpp
index 4eee8da..9dd44b4 100644
--- a/src/telepathy-base-job.cpp
+++ b/src/telepathy-base-job.cpp
@@ -25,7 +25,7 @@
#include <KLocalizedString>
#include <KDebug>
-using namespace KTelepathy;
+using namespace KTp;
TelepathyBaseJobPrivate::TelepathyBaseJobPrivate()
: q_ptr(0)
@@ -105,7 +105,7 @@ void TelepathyBaseJobPrivate::__k__doEmitResult()
}
// Ok, let's set the errors now
- q->setError(KTelepathy::TelepathyErrorError);
+ q->setError(KTp::TelepathyErrorError);
q->setErrorText(errorMessage);
}
diff --git a/src/telepathy-base-job.h b/src/telepathy-base-job.h
index b58e115..30e6544 100644
--- a/src/telepathy-base-job.h
+++ b/src/telepathy-base-job.h
@@ -24,7 +24,7 @@
#include <kdemacros.h>
#include <KJob>
-namespace KTelepathy {
+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