[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=6117363

The following commit has been merged in the master branch:
commit 611736366ff0086fafe2ecf9d8f0310ac55b4d2e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jan 3 11:52:52 2013 +0000

    Update to newly namespaced models
---
 contacts-model.cpp | 4 ++--
 contacts-model.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contacts-model.cpp b/contacts-model.cpp
index 6e2c667..32e0215 100644
--- a/contacts-model.cpp
+++ b/contacts-model.cpp
@@ -37,11 +37,11 @@ void ContactsModel2::setGroupMode(ContactsModel2::GroupMode mode)
         setSourceModel(m_source);
         break;
     case AccountGrouping:
-        m_proxy = new AccountsTreeProxyModel(m_source, m_accountManager);
+        m_proxy = new KTp::AccountsTreeProxyModel(m_source, m_accountManager);
         setSourceModel(m_proxy.data());
         break;
     case GroupGrouping:
-        m_proxy = new GroupsTreeProxyModel(m_source);
+        m_proxy = new KTp::GroupsTreeProxyModel(m_source);
         setSourceModel(m_proxy.data());
         break;
     }
diff --git a/contacts-model.h b/contacts-model.h
index bc845c0..1150227 100644
--- a/contacts-model.h
+++ b/contacts-model.h
@@ -40,7 +40,7 @@ public:
 
 private:
     GroupMode m_groupMode;
-    QWeakPointer<AbstractGroupingProxyModel> m_proxy;
+    QWeakPointer<KTp::AbstractGroupingProxyModel> m_proxy;
     KTp::ContactsListModel *m_source;
     Tp::AccountManagerPtr m_accountManager;
 };

-- 
ktp-contact-list packaging