[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=1e44c56

The following commit has been merged in the master branch:
commit 1e44c56e732b9b9c2908e935e92156bdc325e010
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 15:33:26 2011 +0100

    port-to-0.9: Rename relevant include paths and variables
---
 src/filetransfer-handler.cpp                      | 8 ++++----
 src/filetransfer-handler.h                        | 4 ++--
 src/handle-incoming-file-transfer-channel-job.cpp | 8 ++++----
 src/handle-incoming-file-transfer-channel-job.h   | 4 ++--
 src/handle-outgoing-file-transfer-channel-job.cpp | 8 ++++----
 src/handle-outgoing-file-transfer-channel-job.h   | 4 ++--
 src/main.cpp                                      | 4 ++--
 src/telepathy-base-job.cpp                        | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index 3aee1a8..45606b5 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -22,9 +22,9 @@
 
 #include <KTelepathy/telepathy-handler-application.h>
 
-#include <TelepathyQt4/ChannelClassSpecList>
-#include <TelepathyQt4/IncomingFileTransferChannel>
-#include <TelepathyQt4/OutgoingFileTransferChannel>
+#include <TelepathyQt/ChannelClassSpecList>
+#include <TelepathyQt/IncomingFileTransferChannel>
+#include <TelepathyQt/OutgoingFileTransferChannel>
 
 #include <KSharedConfig>
 #include <KConfigGroup>
@@ -97,7 +97,7 @@ void FileTransferHandler::handleChannels(const Tp::MethodInvocationContextPtr<>
         kDebug() << outgoingFileTransferChannel->immutableProperties();
 
         if (outgoingFileTransferChannel->uri().isEmpty()) {
-            context->setFinishedWithError(QLatin1String(TELEPATHY_QT4_ERROR_INCONSISTENT),
+            context->setFinishedWithError(TP_QT_ERROR_INCONSISTENT,
                                           i18n("Cannot handle outgoing file transfer without URI"));
         }
 
diff --git a/src/filetransfer-handler.h b/src/filetransfer-handler.h
index c11d954..b853d0f 100644
--- a/src/filetransfer-handler.h
+++ b/src/filetransfer-handler.h
@@ -18,8 +18,8 @@
 #ifndef TELEPATHY_KDE_FILETRANSFER_HANDLER_H
 #define TELEPATHY_KDE_FILETRANSFER_HANDLER_H
 
-#include <TelepathyQt4/AbstractClientHandler>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/AbstractClientHandler>
+#include <TelepathyQt/Types>
 
 class KJob;
 namespace Tp
diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index ace7889..0821081 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -30,10 +30,10 @@
 #include <kio/global.h>
 #include <kjobtrackerinterface.h>
 
-#include <TelepathyQt4/IncomingFileTransferChannel>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/IncomingFileTransferChannel>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/Contact>
 
 
 class HandleIncomingFileTransferChannelJobPrivate : public KTp::TelepathyBaseJobPrivate
diff --git a/src/handle-incoming-file-transfer-channel-job.h b/src/handle-incoming-file-transfer-channel-job.h
index 1807d2d..9cc7ad9 100644
--- a/src/handle-incoming-file-transfer-channel-job.h
+++ b/src/handle-incoming-file-transfer-channel-job.h
@@ -21,8 +21,8 @@
 
 #include <telepathy-base-job.h>
 
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
 
 namespace Tp {
     class PendingOperation;
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index 7ccf758..152c13e 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -28,10 +28,10 @@
 #include <kio/global.h>
 #include <kjobtrackerinterface.h>
 
-#include <TelepathyQt4/OutgoingFileTransferChannel>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/OutgoingFileTransferChannel>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/Contact>
 
 class HandleOutgoingFileTransferChannelJobPrivate : public KTp::TelepathyBaseJobPrivate
 {
diff --git a/src/handle-outgoing-file-transfer-channel-job.h b/src/handle-outgoing-file-transfer-channel-job.h
index 2eb2445..f51d53b 100644
--- a/src/handle-outgoing-file-transfer-channel-job.h
+++ b/src/handle-outgoing-file-transfer-channel-job.h
@@ -21,8 +21,8 @@
 
 #include <telepathy-base-job.h>
 
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
 
 namespace Tp {
     class PendingOperation;
diff --git a/src/main.cpp b/src/main.cpp
index ebd1961..b65037b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,8 +22,8 @@
 #include <KAboutData>
 #include <KCmdLineArgs>
 #include <KDebug>
-#include <TelepathyQt4/ClientRegistrar>
-#include <TelepathyQt4/FileTransferChannel>
+#include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/FileTransferChannel>
 
 
 int main(int argc, char* argv[])
diff --git a/src/telepathy-base-job.cpp b/src/telepathy-base-job.cpp
index 9dd44b4..bba1231 100644
--- a/src/telepathy-base-job.cpp
+++ b/src/telepathy-base-job.cpp
@@ -20,7 +20,7 @@
 
 #include "telepathy-base-job_p.h"
 
-#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt/PendingOperation>
 
 #include <KLocalizedString>
 #include <KDebug>

-- 
ktp-filetransfer-handler packaging