[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

Maximiliano Curia maxy at moszumanska.debian.org
Mon May 9 09:06:20 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=1c17338

The following commit has been merged in the master branch:
commit 1c173384da914a1f18e9859833cee22dd42de72f
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Feb 1 15:40:25 2013 +0100

    Fix build issues
---
 KTp/Models/contacts-filter-model.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/KTp/Models/contacts-filter-model.cpp b/KTp/Models/contacts-filter-model.cpp
index c4defdb..343f4fa 100644
--- a/KTp/Models/contacts-filter-model.cpp
+++ b/KTp/Models/contacts-filter-model.cpp
@@ -102,8 +102,8 @@ bool ContactsFilterModel::Private::filterAcceptsAccount(const QModelIndex &index
             return false;
         }
         if (capabilityFilterFlags & FilterByTubes) {
-            Q_FOREACH(const QString &tube, index.data(KTp::ContactTubesRole).toList()) {
-                if (d->tubesFilterStrings.contains(tube)) {
+            Q_FOREACH(const QString &tube, index.data(KTp::ContactTubesRole).toStringList()) {
+                if (tubesFilterStrings.contains(tube)) {
                     return true;
                 }
             }
@@ -200,10 +200,10 @@ bool ContactsFilterModel::Private::filterAcceptsContact(const QModelIndex &index
             return false;
         }
         if (capabilityFilterFlags & FilterByTubes) {
-            if (!d->tubesFilterStrings.isEmpty()) {
+            if (!tubesFilterStrings.isEmpty()) {
                 bool tubeFound = false;
-                Q_FOREACH(const QString &tube, index.data(KTp::ContactTubesRole).toList()) {
-                    if (d->tubesFilterStrings.contains(tube)) {
+                Q_FOREACH(const QString &tube, index.data(KTp::ContactTubesRole).toStringList()) {
+                    if (tubesFilterStrings.contains(tube)) {
                         tubeFound = true;
                     }
                 }

-- 
ktp-common-internals packaging



More information about the pkg-kde-commits mailing list