[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=38eae98

The following commit has been merged in the master branch:
commit 38eae986b341ed0f02a2a4ff3406b74dbf678b0f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Mar 4 02:01:26 2013 +0000

    fix includes
---
 KTp/Declarative/pinned-contacts-model.cpp | 6 ++----
 KTp/Declarative/pinned-contacts-model.h   | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/KTp/Declarative/pinned-contacts-model.cpp b/KTp/Declarative/pinned-contacts-model.cpp
index 8563251..1701082 100644
--- a/KTp/Declarative/pinned-contacts-model.cpp
+++ b/KTp/Declarative/pinned-contacts-model.cpp
@@ -36,10 +36,8 @@
 #include <KStandardDirs>
 #include <KDebug>
 
-#include <KTp/presence.h>
-#include <KTp/contact.h>
-#include "KTp/global-contact-manager.h"
-
+#include "KTp/presence.h"
+#include "KTp/contact.h"
 #include "KTp/persistent-contact.h"
 
 class PinnedContactsModelPrivate {
diff --git a/KTp/Declarative/pinned-contacts-model.h b/KTp/Declarative/pinned-contacts-model.h
index 5d10760..01fabbb 100644
--- a/KTp/Declarative/pinned-contacts-model.h
+++ b/KTp/Declarative/pinned-contacts-model.h
@@ -22,8 +22,8 @@
 #include <QModelIndex>
 #include <QVector>
 
-#include "types.h"
-#include "persistent-contact.h"
+#include <KTp/types.h>
+#include <KTp/persistent-contact.h>
 
 class ConversationsModel;
 class PinnedContactsModelPrivate;

-- 
ktp-common-internals packaging