[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=67f7084

The following commit has been merged in the master branch:
commit 67f7084da6d2aaf085c33fdb3649300aff2e3a3f
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Feb 1 12:31:14 2013 +0100

    Remove remaining nickname and alias roles usage
---
 KTp/Models/contacts-filter-model.cpp | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/KTp/Models/contacts-filter-model.cpp b/KTp/Models/contacts-filter-model.cpp
index 43ceef8..c4defdb 100644
--- a/KTp/Models/contacts-filter-model.cpp
+++ b/KTp/Models/contacts-filter-model.cpp
@@ -272,7 +272,6 @@ bool ContactsFilterModel::Private::filterAcceptsContact(const QModelIndex &index
         }
     }
 
-
     if (!globalFilterString.isEmpty()) {
         // Check global filter (search on all the roles)
 
@@ -281,16 +280,6 @@ bool ContactsFilterModel::Private::filterAcceptsContact(const QModelIndex &index
             return true;
         }
 
-        // Check nickname
-        if (!q->match(index, ContactsModel::NicknameRole, globalFilterString, 1, globalFilterMatchFlags).isEmpty()) {
-            return true;
-        }
-
-        // check alias
-        if (!q->match(index, ContactsModel::AliasRole, globalFilterString, 1, globalFilterMatchFlags).isEmpty()) {
-            return true;
-        }
-
         // check groups
         // TODO Check if exact match on a single group works
         if (!q->match(index, KTp::ContactGroupsRole, globalFilterString, 1, globalFilterMatchFlags).isEmpty()) {
@@ -311,20 +300,6 @@ bool ContactsFilterModel::Private::filterAcceptsContact(const QModelIndex &index
                 return false;
             }
         }
-
-        // Check nickname
-        if (!nicknameFilterString.isEmpty()) {
-            if (q->match(index, ContactsModel::NicknameRole, nicknameFilterString, 1, nicknameFilterMatchFlags).isEmpty()) {
-                return false;
-            }
-        }
-
-        // check alias
-        if (!aliasFilterString.isEmpty()) {
-            if (q->match(index, ContactsModel::AliasRole, aliasFilterString, 1, aliasFilterMatchFlags).isEmpty()) {
-                return false;
-            }
-        }
         // check groups
         // TODO Check if exact match on a single group works
         if (!groupsFilterString.isEmpty()) {

-- 
ktp-common-internals packaging