[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=76a7dfc

The following commit has been merged in the master branch:
commit 76a7dfc91419e3c8fb16557f2580bd572396ddac
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jun 16 12:31:58 2011 +0100

    Remove now obsolete method in account-filter-model
    Removed a weird hack in the contact list main app.
    
    REVIEW: 101641
---
 account-filter-model.cpp | 9 ---------
 account-filter-model.h   | 7 -------
 main-widget.cpp          | 7 -------
 3 files changed, 23 deletions(-)

diff --git a/account-filter-model.cpp b/account-filter-model.cpp
index 5b37ec8..9e511a4 100644
--- a/account-filter-model.cpp
+++ b/account-filter-model.cpp
@@ -174,14 +174,5 @@ bool AccountFilterModel::isSortedByPresence() const
     return sortRole() == AccountsModel::PresenceTypeRole;
 }
 
-bool AccountFilterModel::groupsActive() const
-{
-    return m_groupsActive;
-}
-
-void AccountFilterModel::setGroupsActive(bool active)
-{
-    m_groupsActive = active;
-}
 
 #include "account-filter-model.moc"
diff --git a/account-filter-model.h b/account-filter-model.h
index 4952e3e..e86485a 100644
--- a/account-filter-model.h
+++ b/account-filter-model.h
@@ -51,10 +51,6 @@ public:
      */
     bool isSortedByPresence() const;
 
-    bool groupsActive() const;
-    void setGroupsActive(bool active);
-
-
 public slots:
     void showOfflineUsers(bool showOfflineUsers);
     void setFilterString(const QString &str);
@@ -84,9 +80,6 @@ private:
 
     /// Holds the string which is searched in the model
     QString m_filterString;
-
-    /// True if the source is groups model
-    bool m_groupsActive;
 };
 
 #endif // ACCOUNTFILTERMODEL_H
diff --git a/main-widget.cpp b/main-widget.cpp
index 1f81b19..bdec5ab 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -288,10 +288,8 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     m_groupsModel = new GroupsModel(m_model, this);
     m_modelFilter = new AccountFilterModel(this);
     if (m_groupContactsAction->isChecked()) {
-        m_modelFilter->setGroupsActive(true);
         m_modelFilter->setSourceModel(m_groupsModel);
     } else {
-        m_modelFilter->setGroupsActive(false);
         m_modelFilter->setSourceModel(m_model);
     }
     m_modelFilter->setDynamicSortFilter(true);
@@ -1191,15 +1189,10 @@ void MainWidget::handleConnectionError(const Tp::AccountPtr& account)
 void MainWidget::onGroupContacts(bool enabled)
 {
     if (enabled) {
-        m_modelFilter->setSourceModel(0);   //this prevents some crashes
-        m_modelFilter->setGroupsActive(true);
         m_modelFilter->setSourceModel(m_groupsModel);
     } else {
-        m_modelFilter->setSourceModel(0);
-        m_modelFilter->setGroupsActive(false);
         m_modelFilter->setSourceModel(m_model);
     }
-
 }
 
 void MainWidget::onSwitchToFullView()

-- 
ktp-contact-list packaging