[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=7900a35

The following commit has been merged in the master branch:
commit 7900a3599f06abfe4d59ee0ab6f35f62ce564bc4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 15 15:15:47 2013 +0000

    Remove uneeded model
---
 contacts-model.cpp | 53 -----------------------------------------------------
 contacts-model.h   |  0
 2 files changed, 53 deletions(-)

diff --git a/contacts-model.cpp b/contacts-model.cpp
deleted file mode 100644
index d44c9aa..0000000
--- a/contacts-model.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "contacts-model.h"
-
-#include <KTp/Models/accounts-tree-proxy-model.h>
-#include <KTp/Models/groups-tree-proxy-model.h>
-
-KTp::ContactsModel::KTp::ContactsModel(QObject *parent)
-    : KTp::ContactsFilterModel(parent),
-      m_groupMode(NoGrouping),
-      m_source(new KTp::ContactsListModel(this))
-{
-
-}
-
-void KTp::ContactsModel::setAccountManager(const Tp::AccountManagerPtr &accountManager)
-{
-    m_accountManager = accountManager;
-
-    setGroupMode(m_groupMode); //reload the groups, as AccountGrouping now needs a real accountManager
-    m_source->setAccountManager(accountManager);
-}
-
-void KTp::ContactsModel::setGroupMode(KTp::ContactsModel::GroupMode mode)
-{
-
-    m_groupMode = mode;
-
-    if (!m_accountManager) {
-        mode = NoGrouping; //don't waste time doing any grouping if account manager is not really ready.. as we will have nothing to group anyway
-    }
-
-    if (m_proxy) {
-        m_proxy.data()->deleteLater();
-    }
-
-    switch (mode) {
-    case NoGrouping:
-        setSourceModel(m_source);
-        break;
-    case AccountGrouping:
-        m_proxy = new KTp::AccountsTreeProxyModel(m_source, m_accountManager);
-        setSourceModel(m_proxy.data());
-        break;
-    case GroupGrouping:
-        m_proxy = new KTp::GroupsTreeProxyModel(m_source);
-        setSourceModel(m_proxy.data());
-        break;
-    }
-}
-
-KTp::ContactsModel::GroupMode KTp::ContactsModel::groupMode() const
-{
-    return m_groupMode;
-}
diff --git a/contacts-model.h b/contacts-model.h
deleted file mode 100644
index e69de29..0000000

-- 
ktp-contact-list packaging