[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=839afce

The following commit has been merged in the master branch:
commit 839afce070618483cf470ad4d6087d6edcb0a8b9
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Feb 7 14:32:40 2013 +0100

    Add READ to accountManager property of KTp::ContactModel
    
    Q_PROPERTY without READ method is invalid (see Qt Doc)
---
 KTp/Models/contacts-model.cpp | 5 +++++
 KTp/Models/contacts-model.h   | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index dd633f5..8d6c3b8 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -61,6 +61,11 @@ void KTp::ContactsModel::setAccountManager(const Tp::AccountManagerPtr &accountM
     d->source->setAccountManager(accountManager);
 }
 
+Tp::AccountManagerPtr KTp::ContactsModel::accountManager() const
+{
+    return d->accountManager;
+}
+
 void KTp::ContactsModel::setGroupMode(KTp::ContactsModel::GroupMode mode)
 {
     if (mode == d->groupMode) {
diff --git a/KTp/Models/contacts-model.h b/KTp/Models/contacts-model.h
index ad3205c..7e91e15 100644
--- a/KTp/Models/contacts-model.h
+++ b/KTp/Models/contacts-model.h
@@ -36,7 +36,7 @@ class KTP_EXPORT ContactsModel : public KTp::ContactsFilterModel
 {
     Q_OBJECT
     Q_PROPERTY(GroupMode groupMode READ groupMode WRITE setGroupMode NOTIFY groupModeChanged)
-    Q_PROPERTY(Tp::AccountManagerPtr accountManager WRITE setAccountManager)
+    Q_PROPERTY(Tp::AccountManagerPtr accountManager READ accountManager WRITE setAccountManager)
 
     Q_ENUMS(GroupMode)
 
@@ -57,6 +57,9 @@ public:
     /** Sets the accounts manager to be used for the KTp::ContactListModel*/
     void setAccountManager(const Tp::AccountManagerPtr &accountManager);
 
+    /** Returns account manager currently used by the model */
+    Tp::AccountManagerPtr accountManager() const;
+
     /** Specify how the contacts should be grouped together*/
     void setGroupMode(GroupMode mode);
 

-- 
ktp-common-internals packaging