[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=f6a62b2

The following commit has been merged in the master branch:
commit f6a62b2cc47127ed7e2796be9328b14d05d4eede
Author: David Edmundson <david at davidedmundson.co.uk>
Date:   Sun Mar 24 00:07:23 2013 +0000

    Make setSourceModel in ContactsModel protected.
    
    This stops people using ContactsModel wrong.
    
    REVIEW: 109652
---
 KTp/Models/contacts-model.cpp | 4 ++++
 KTp/Models/contacts-model.h   | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index 1c68409..f472c9c 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -155,3 +155,7 @@ void KTp::ContactsModel::updateGroupProxyModels()
     }
 }
 
+void KTp::ContactsModel::setSourceModel(QAbstractItemModel *sourceModel)
+{
+    KTp::ContactsFilterModel::setSourceModel(sourceModel);
+}
diff --git a/KTp/Models/contacts-model.h b/KTp/Models/contacts-model.h
index 4d626d3..41c1cb3 100644
--- a/KTp/Models/contacts-model.h
+++ b/KTp/Models/contacts-model.h
@@ -74,6 +74,9 @@ public:
     void setTrackUnreadMessages(bool trackUnread);
     bool trackUnreadMessages() const;
 
+protected:
+    //prevent previously public setSourceModel being called externally
+    virtual void setSourceModel(QAbstractItemModel *sourceModel);
 
 Q_SIGNALS:
     void groupModeChanged();

-- 
ktp-common-internals packaging