[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=0ab6ec3

The following commit has been merged in the master branch:
commit 0ab6ec364e5dbe38a62f8eeef9a7832ba4cb562d
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Nov 13 01:03:12 2012 +0100

    Port to the new ContactsModel
---
 KTp/Declarative/contact-list.cpp | 8 ++++----
 KTp/Declarative/contact-list.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/KTp/Declarative/contact-list.cpp b/KTp/Declarative/contact-list.cpp
index 834b9b3..c81ebe9 100644
--- a/KTp/Declarative/contact-list.cpp
+++ b/KTp/Declarative/contact-list.cpp
@@ -33,11 +33,11 @@
 
 ContactList::ContactList(QObject *parent)
     : QObject(parent),
-      m_accountsModel(new AccountsModel(this)),
+      m_contactsModel(new ContactsModel(this)),
       m_filterModel(new AccountsFilterModel(this)),
       m_flatModel(0)
 {
-    m_filterModel->setSourceModel(m_accountsModel);
+    m_filterModel->setSourceModel(m_contactsModel);
     //flat model takes the source as a constructor parameter, the other's don't.
     //due to a bug somewhere creating the flat model proxy with the filter model as a source before the filter model has a source means the rolenames do not get propgated up
     m_flatModel = new FlatModelProxy(m_filterModel);
@@ -84,7 +84,7 @@ ContactList::ContactList(QObject *parent)
 void ContactList::onAccountManagerReady(Tp::PendingOperation *op)
 {
     Q_UNUSED(op);
-    m_accountsModel->setAccountManager(m_accountManager);
+    m_contactsModel->setAccountManager(m_accountManager);
 }
 
 FlatModelProxy * ContactList::flatModel() const
@@ -103,7 +103,7 @@ void ContactList::startChat(ContactModelItem *contactItem)
     Tp::ContactPtr contact = contactItem->contact();
 
     kDebug() << "Requesting chat for contact" << contact->alias();
-    Tp::AccountPtr account = m_accountsModel->accountForContactItem(contactItem);
+    Tp::AccountPtr account = m_contactsModel->accountForContactItem(contactItem);
 
     Tp::ChannelRequestHints hints;
     hints.setHint("org.freedesktop.Telepathy.ChannelRequest","DelegateToPreferredHandler", QVariant(true));
diff --git a/KTp/Declarative/contact-list.h b/KTp/Declarative/contact-list.h
index fdf4c88..40b4243 100644
--- a/KTp/Declarative/contact-list.h
+++ b/KTp/Declarative/contact-list.h
@@ -19,7 +19,7 @@
 #ifndef CONTACT_LIST_H
 #define CONTACT_LIST_H
 
-#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/contacts-model.h>
 #include <KTp/Models/flat-model-proxy.h>
 #include <KTp/Models/accounts-filter-model.h>
 
@@ -47,7 +47,7 @@ private slots:
     void onAccountManagerReady(Tp::PendingOperation *op);
     
 private:
-    AccountsModel* m_accountsModel;
+    ContactsModel* m_contactsModel;
     AccountsFilterModel* m_filterModel;
     FlatModelProxy* m_flatModel; 
     Tp::AccountManagerPtr m_accountManager;

-- 
ktp-common-internals packaging