[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=e0337c5

The following commit has been merged in the master branch:
commit e0337c538a2841a46df0f2cd500106bf7cdfe412
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jan 1 15:04:53 2012 +0000

    Fix rebase and namespace
---
 KTp/Declarative/conversation-target.cpp     | 6 ++----
 KTp/Declarative/conversation.cpp            | 2 +-
 KTp/Declarative/messages-model.cpp          | 2 +-
 KTp/Declarative/telepathy-text-observer.cpp | 6 +++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index 9316243..94ca84b 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -16,11 +16,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "kdetelepathychat_export.h"
-
 #include "conversation-target.h"
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/Presence>
 #include <KDebug>
 #include <KIconLoader>
 
diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index 45284da..54373cf 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -20,7 +20,7 @@
 #include "conversation.h"
 #include "messages-model.h"
 
-#include <TelepathyQt4/TextChannel>
+#include <TelepathyQt/TextChannel>
 #include <KDebug>
 #include "conversation-target.h"
 
diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index b636f90..6bb515e 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -20,7 +20,7 @@
 #include "messages-model.h"
 
 #include <KDebug>
-#include <TelepathyQt4/ReceivedMessage>
+#include <TelepathyQt/ReceivedMessage>
 
 class MessageItem {
 public:
diff --git a/KTp/Declarative/telepathy-text-observer.cpp b/KTp/Declarative/telepathy-text-observer.cpp
index 3354905..7224dcf 100644
--- a/KTp/Declarative/telepathy-text-observer.cpp
+++ b/KTp/Declarative/telepathy-text-observer.cpp
@@ -22,9 +22,9 @@
 
 #include <KDebug>
 
-#include <TelepathyQt4/ChannelClassSpec>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/ClientRegistrar>
+#include <TelepathyQt/ChannelClassSpec>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/ClientRegistrar>
 
 
 static inline Tp::ChannelClassSpecList channelClassList()

-- 
ktp-common-internals packaging