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

The following commit has been merged in the master branch:
commit eaf53b9a1d69af5619c3fe51f9bac783abb82570
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Jun 10 20:29:41 2015 +0200

    Remove the accountManager tracking
    
    It's a singleton now
    
    Reviewed by Martin Klapetek
---
 KTp/Declarative/pinned-contacts-model.cpp | 25 -------------------------
 KTp/Declarative/pinned-contacts-model.h   |  5 -----
 2 files changed, 30 deletions(-)

diff --git a/KTp/Declarative/pinned-contacts-model.cpp b/KTp/Declarative/pinned-contacts-model.cpp
index 8ef21a1..19de777 100644
--- a/KTp/Declarative/pinned-contacts-model.cpp
+++ b/KTp/Declarative/pinned-contacts-model.cpp
@@ -24,7 +24,6 @@
 #include <TelepathyQt/AvatarData>
 #include <TelepathyQt/Presence>
 #include <TelepathyQt/Account>
-#include <TelepathyQt/AccountManager>
 #include <TelepathyQt/PendingReady>
 #include <TelepathyQt/ContactManager>
 #include <TelepathyQt/PendingContacts>
@@ -43,7 +42,6 @@ public:
     }
 
     QList<KTp::PersistentContactPtr> m_pins;
-    Tp::AccountManagerPtr accountManager;
     ConversationsModel *conversations;
 
     QStringList pinsToString() const {
@@ -208,10 +206,6 @@ void PinnedContactsModel::appendContactPin(const KTp::PersistentContactPtr &pin)
     d->m_pins += pin;
     endInsertRows();
 
-    if (d->accountManager && d->accountManager->isReady()) {
-        pin->setAccountManager(d->accountManager);
-    }
-
     if (pin->contact()) {
         contactChanged(pin->contact());
     }
@@ -282,22 +276,3 @@ ConversationsModel* PinnedContactsModel::conversationsModel() const
 {
     return d->conversations;
 }
-
-Tp::AccountManagerPtr PinnedContactsModel::accountManager() const
-{
-    return d->accountManager;
-}
-
-void PinnedContactsModel::setAccountManager(const Tp::AccountManagerPtr &accounts)
-{
-    d->accountManager = accounts;
-
-    connect(d->accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAccountManagerReady()));
-}
-
-void PinnedContactsModel::onAccountManagerReady()
-{
-    Q_FOREACH(const KTp::PersistentContactPtr &p, d->m_pins) {
-        p->setAccountManager(d->accountManager);
-    }
-}
diff --git a/KTp/Declarative/pinned-contacts-model.h b/KTp/Declarative/pinned-contacts-model.h
index f29c0d5..27835b1 100644
--- a/KTp/Declarative/pinned-contacts-model.h
+++ b/KTp/Declarative/pinned-contacts-model.h
@@ -33,7 +33,6 @@ class PinnedContactsModel : public QAbstractListModel
     Q_OBJECT
 
     Q_PROPERTY(ConversationsModel *conversations READ conversationsModel WRITE setConversationsModel)
-    Q_PROPERTY(Tp::AccountManagerPtr accountManager READ accountManager WRITE setAccountManager)
     Q_PROPERTY(QStringList state READ state WRITE setState NOTIFY stateChanged)
     Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
 
@@ -60,9 +59,6 @@ class PinnedContactsModel : public QAbstractListModel
     ConversationsModel* conversationsModel() const;
     void setConversationsModel(ConversationsModel *model);
 
-    Tp::AccountManagerPtr accountManager() const;
-    void setAccountManager(const Tp::AccountManagerPtr &accounts);
-
     QStringList state() const;
     void setState(const QStringList &s);
 
@@ -70,7 +66,6 @@ class PinnedContactsModel : public QAbstractListModel
     void contactDataChanged();
     void contactChanged(const KTp::ContactPtr &contact);
     void conversationsStateChanged(const QModelIndex &parent, int start, int end);
-    void onAccountManagerReady();
 
   Q_SIGNALS:
     void countChanged();

-- 
ktp-common-internals packaging