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

The following commit has been merged in the master branch:
commit 38e5490d75c3d2b364e87a303a88f36c1f563191
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Dec 22 18:42:41 2014 +0100

    Adapt to changes in libkpeople
---
 kpeople/actionsplugin/kpeople-actions-plugin.h      | 4 ++--
 kpeople/datasourceplugin/im-persons-data-source.cpp | 2 +-
 kpeople/datasourceplugin/im-persons-data-source.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kpeople/actionsplugin/kpeople-actions-plugin.h b/kpeople/actionsplugin/kpeople-actions-plugin.h
index c42ff93..bacd7b5 100644
--- a/kpeople/actionsplugin/kpeople-actions-plugin.h
+++ b/kpeople/actionsplugin/kpeople-actions-plugin.h
@@ -19,7 +19,7 @@
 #ifndef IM_PLUGIN_H
 #define IM_PLUGIN_H
 
-#include <KPeople/AbstractPersonAction>
+#include <KPeopleBackend/AbstractPersonAction>
 
 class KPeopleActionsPlugin : public KPeople::AbstractPersonAction
 {
@@ -27,7 +27,7 @@ class KPeopleActionsPlugin : public KPeople::AbstractPersonAction
 public:
     KPeopleActionsPlugin(QObject *parent, const QVariantList &args);
     virtual QList<QAction*> actionsForPerson(const KContacts::Addressee &person,
-                                             const KContacts::AddresseeList &contacts,
+                                             const KContacts::Addressee::List &contacts,
                                              QObject *parent) const;
 
 private Q_SLOTS:
diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index 20d2136..18598d0 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -33,7 +33,7 @@
 #include "KTp/types.h"
 #include "debug.h"
 
-#include <KPeople/AllContactsMonitor>
+#include <KPeopleBackend/AllContactsMonitor>
 #include <KContacts/Addressee>
 
 #include <KPluginFactory>
diff --git a/kpeople/datasourceplugin/im-persons-data-source.h b/kpeople/datasourceplugin/im-persons-data-source.h
index 1e5baa4..7015c3d 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.h
+++ b/kpeople/datasourceplugin/im-persons-data-source.h
@@ -20,7 +20,7 @@
 #ifndef IM_PERSONS_DATA_SOURCE_H
 #define IM_PERSONS_DATA_SOURCE_H
 
-#include <KPeople/BasePersonsDataSource>
+#include <KPeopleBackend/BasePersonsDataSource>
 
 #include <TelepathyQt/Types>
 

-- 
ktp-common-internals packaging