[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=59429f1

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

    Prefer Addressee::List to AddreseeList
---
 KTp/Models/kpeopletranslationproxy.cpp               | 2 +-
 kpeople/actionsplugin/kpeople-actions-plugin.cpp     | 2 +-
 kpeople/uiplugins/chatplugin/kpeople_chat_plugin.cpp | 2 +-
 kpeople/uiplugins/chatplugin/kpeople_chat_plugin.h   | 2 +-
 kpeople/uiplugins/imdetailswidget.cpp                | 2 +-
 kpeople/uiplugins/imdetailswidget.h                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index c0b5273..d61b026 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -96,7 +96,7 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
             return mapToSource(proxyIndex).data(KPeople::PersonsModel::PersonVCardRole);
     }
 
-    const KContacts::AddresseeList &contacts = mapToSource(proxyIndex).data(PersonsModel::ContactsVCardRole).value<KContacts::AddresseeList>();
+    const KContacts::Addressee::List &contacts = mapToSource(proxyIndex).data(PersonsModel::ContactsVCardRole).value<KContacts::Addressee::List>();
 
     int mostOnlineIndex = 0;
 
diff --git a/kpeople/actionsplugin/kpeople-actions-plugin.cpp b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
index aa5d0ce..da10e36 100644
--- a/kpeople/actionsplugin/kpeople-actions-plugin.cpp
+++ b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
@@ -106,7 +106,7 @@ KPeopleActionsPlugin::KPeopleActionsPlugin(QObject *parent, const QVariantList &
 }
 
 QList<QAction*> KPeopleActionsPlugin::actionsForPerson(const KContacts::Addressee &person,
-                                                       const KContacts::AddresseeList &contacts,
+                                                       const KContacts::Addressee::List &contacts,
                                                        QObject *parent) const
 {
     QList<QAction*> actions;
diff --git a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.cpp b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.cpp
index 050bb38..8b91f0f 100644
--- a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.cpp
+++ b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.cpp
@@ -51,7 +51,7 @@ ChatWidgetFactory::ChatWidgetFactory(QObject *parent, const QVariantList &args):
     m_model = new QStandardItemModel();
 }
 
-QWidget *ChatWidgetFactory::createDetailsWidget(const KContacts::Addressee &person, const KContacts::AddresseeList &contacts, QWidget *parent) const
+QWidget *ChatWidgetFactory::createDetailsWidget(const KContacts::Addressee &person, const KContacts::Addressee::List &contacts, QWidget *parent) const
 {
     Q_UNUSED(contacts);
     QWidget *widget = new QWidget(parent);
diff --git a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.h b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.h
index 9a73610..d1d76e2 100644
--- a/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.h
+++ b/kpeople/uiplugins/chatplugin/kpeople_chat_plugin.h
@@ -34,7 +34,7 @@ public:
     explicit ChatWidgetFactory(QObject *parent, const QVariantList &args);
     virtual QString label() const;
     virtual int sortWeight() const;
-    virtual QWidget *createDetailsWidget(const KContacts::Addressee &person, const KContacts::AddresseeList &contacts, QWidget *parent) const;
+    virtual QWidget *createDetailsWidget(const KContacts::Addressee &person, const KContacts::Addressee::List &contacts, QWidget *parent) const;
 
 private Q_SLOTS:
     void onPendingDates(KTp::PendingLoggerOperation *);
diff --git a/kpeople/uiplugins/imdetailswidget.cpp b/kpeople/uiplugins/imdetailswidget.cpp
index e98bf14..d33e99a 100644
--- a/kpeople/uiplugins/imdetailswidget.cpp
+++ b/kpeople/uiplugins/imdetailswidget.cpp
@@ -48,7 +48,7 @@ QString ImDetailsWidget::label() const
     return i18n("IM");
 }
 
-QWidget* ImDetailsWidget::createDetailsWidget(const KContacts::Addressee& person, const KContacts::AddresseeList &contacts, QWidget* parent) const
+QWidget* ImDetailsWidget::createDetailsWidget(const KContacts::Addressee& person, const KContacts::Addressee::List &contacts, QWidget* parent) const
 {
     Q_UNUSED(person);
     QWidget *root = new QWidget(parent);
diff --git a/kpeople/uiplugins/imdetailswidget.h b/kpeople/uiplugins/imdetailswidget.h
index 0020eb9..f8d4304 100644
--- a/kpeople/uiplugins/imdetailswidget.h
+++ b/kpeople/uiplugins/imdetailswidget.h
@@ -31,7 +31,7 @@ class ImDetailsWidget : public KPeople::AbstractFieldWidgetFactory
 public:
     explicit ImDetailsWidget(QObject *parent, const QVariantList &args);
     QString label() const;
-    virtual QWidget* createDetailsWidget(const KContacts::Addressee& person, const KContacts::AddresseeList &contacts, QWidget* parent) const;
+    virtual QWidget* createDetailsWidget(const KContacts::Addressee& person, const KContacts::Addressee::List &contacts, QWidget* parent) const;
 };
 
 #endif // IM_DETAILS_WIDGET_H

-- 
ktp-common-internals packaging