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

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:12:03 UTC 2016


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

The following commit has been merged in the master branch:
commit 9b2ea0c2f31072dddb8b8f84c507212acdbe8243
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Jan 15 17:39:27 2013 +0000

    Update to namespaced ContactsFilterModel
---
 contacts-model.cpp | 2 +-
 contacts-model.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contacts-model.cpp b/contacts-model.cpp
index 052c7a9..db4138b 100644
--- a/contacts-model.cpp
+++ b/contacts-model.cpp
@@ -4,7 +4,7 @@
 #include <KTp/Models/groups-tree-proxy-model.h>
 
 ContactsModel2::ContactsModel2(QObject *parent)
-    : ContactsFilterModel(parent),
+    : KTp::ContactsFilterModel(parent),
       m_groupMode(NoGrouping),
       m_source(new KTp::ContactsListModel(this))
 {
diff --git a/contacts-model.h b/contacts-model.h
index 1150227..be11bfb 100644
--- a/contacts-model.h
+++ b/contacts-model.h
@@ -27,7 +27,7 @@
 
 #include <TelepathyQt/Types>
 
-class ContactsModel2 : public ContactsFilterModel
+class ContactsModel2 : public KTp::ContactsFilterModel
 {
 public:
     enum GroupMode {NoGrouping, AccountGrouping, GroupGrouping};

-- 
ktp-contact-list packaging



More information about the pkg-kde-commits mailing list