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

The following commit has been merged in the master branch:
commit 380467282b677c7da2745351a8ff2d7c9dbf87af
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Feb 9 17:06:46 2012 +0100

    Port to the updated AccountsFilterModel
---
 contact-list-widget.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 74eaea7..42d76e7 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -77,8 +77,6 @@ ContactListWidget::ContactListWidget(QWidget *parent)
     d->groupsModel = new GroupsModel(d->model, this);
     d->modelFilter = new AccountsFilterModel(this);
     d->modelFilter->setDynamicSortFilter(true);
-    d->modelFilter->clearFilterString();
-    d->modelFilter->setFilterCaseSensitivity(Qt::CaseInsensitive);
     d->modelFilter->setSortRole(Qt::DisplayRole);
 
     setModel(d->modelFilter);
@@ -341,14 +339,14 @@ void ContactListWidget::toggleOfflineContacts(bool show)
 {
     Q_D(ContactListWidget);
 
-    d->modelFilter->setShowOfflineUsers(show);
+    d->modelFilter->setPresenceTypeFilterFlags(show ? AccountsFilterModel::DoNotFilterByPresence : AccountsFilterModel::ShowOnlyConnected);
 }
 
 void ContactListWidget::toggleSortByPresence(bool sort)
 {
     Q_D(ContactListWidget);
 
-    d->modelFilter->setSortByPresence(sort);
+    d->modelFilter->setSortMode(sort ? AccountsFilterModel::SortByPresence : AccountsFilterModel::DoNotSort);
 }
 
 void ContactListWidget::startTextChannel(ContactModelItem *contactItem)
@@ -534,8 +532,8 @@ void ContactListWidget::setFilterString(const QString& string)
 {
     Q_D(ContactListWidget);
 
-    d->modelFilter->setShowOfflineUsers(!string.isEmpty());
-    d->modelFilter->setFilterString(string);
+    d->modelFilter->setPresenceTypeFilterFlags(string.isEmpty() ? AccountsFilterModel::ShowOnlyConnected : AccountsFilterModel::DoNotFilterByPresence);
+    d->modelFilter->setDisplayNameFilterString(string);
 }
 
 void ContactListWidget::setDropIndicatorRect(const QRect &rect)

-- 
ktp-contact-list packaging