[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=75b21c9

The following commit has been merged in the master branch:
commit 75b21c9ad555d75a334078cf104c7bcc2000e2e3
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 15:41:48 2011 +0100

    port-to-0.9: Rename relevant include paths and variables
---
 autoaway.cpp                   |  4 ++--
 autoaway.h                     |  4 ++--
 contact-request-handler.cpp    | 10 +++++-----
 contact-request-handler.h      |  4 ++--
 error-handler.h                |  2 +-
 telepathy-kded-module-plugin.h |  4 ++--
 telepathy-module.cpp           |  8 ++++----
 telepathy-module.h             |  2 +-
 telepathy-mpris.cpp            |  2 +-
 telepathy-mpris.h              |  4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/autoaway.cpp b/autoaway.cpp
index 49a79b1..9f12e60 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -19,8 +19,8 @@
 
 #include "autoaway.h"
 
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/AccountSet>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/AccountSet>
 
 #include <KDebug>
 #include <KIdleTime>
diff --git a/autoaway.h b/autoaway.h
index 519df42..f3b3b83 100644
--- a/autoaway.h
+++ b/autoaway.h
@@ -23,8 +23,8 @@
 
 #include "telepathy-kded-module-plugin.h"
 
-#include <TelepathyQt4/Presence>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/Presence>
+#include <TelepathyQt/AccountManager>
 
 namespace KTp {
 class GlobalPresence;
diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index aecc586..91b743f 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -20,11 +20,11 @@
 
 #include "contact-request-handler.h"
 
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingComposite>
-#include <TelepathyQt4/Account>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingComposite>
+#include <TelepathyQt/Account>
 
 #include <KTelepathy/error-dictionary.h>
 
diff --git a/contact-request-handler.h b/contact-request-handler.h
index 1ea1b35..a5ce342 100644
--- a/contact-request-handler.h
+++ b/contact-request-handler.h
@@ -21,8 +21,8 @@
 #ifndef CONTACT_REQUEST_HANDLER_H
 #define CONTACT_REQUEST_HANDLER_H
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/AccountManager>
 
 class KMenu;
 class KAction;
diff --git a/error-handler.h b/error-handler.h
index 95a4cc5..5a4acb8 100644
--- a/error-handler.h
+++ b/error-handler.h
@@ -22,7 +22,7 @@
 #define ERROR_HANDLER_H
 
 #include <QObject>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
 
 class ErrorHandler : public QObject
 {
diff --git a/telepathy-kded-module-plugin.h b/telepathy-kded-module-plugin.h
index ef3a56c..431a46b 100644
--- a/telepathy-kded-module-plugin.h
+++ b/telepathy-kded-module-plugin.h
@@ -22,8 +22,8 @@
 #define TELEPATHY_KDED_MODULE_PLUGIN_H
 
 #include <QObject>
-#include <TelepathyQt4/Presence>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/Presence>
+#include <TelepathyQt/AccountManager>
 
 namespace KTp {
 class GlobalPresence;
diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index f0a2c5a..8ffd2a6 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -22,10 +22,10 @@
 #include <KPluginFactory>
 #include <KDebug>
 
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/Debug>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/Debug>
 
 #include <KTelepathy/global-presence.h>
 
diff --git a/telepathy-module.h b/telepathy-module.h
index 8a7e14d..cf06596 100644
--- a/telepathy-module.h
+++ b/telepathy-module.h
@@ -23,7 +23,7 @@
 
 #include <KDEDModule>
 
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/AccountManager>
 
 class ContactRequestHandler;
 namespace Tp {
diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index a8d5bee..93fe531 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -28,7 +28,7 @@
 #include <KSharedConfig>
 #include <KConfigGroup>
 
-#include <TelepathyQt4/AccountSet>
+#include <TelepathyQt/AccountSet>
 
 #include <KTelepathy/global-presence.h>
 
diff --git a/telepathy-mpris.h b/telepathy-mpris.h
index 11daf6b..d909863 100644
--- a/telepathy-mpris.h
+++ b/telepathy-mpris.h
@@ -22,8 +22,8 @@
 #define TELEPATHY_MPRIS_H
 
 #include "telepathy-kded-module-plugin.h"
-#include <TelepathyQt4/Presence>
-#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt/Presence>
+#include <TelepathyQt/AccountManager>
 
 class TelepathyMPRIS : public TelepathyKDEDModulePlugin
 {

-- 
ktp-kded-integration-module packaging