Merge lp:~seb128/ubuntu-system-settings/str-match-vivid into lp:ubuntu-system-settings/15.04

[Sebastien Bacher]

Improve filtering in main page and timezone filters.

Improve filtering in main page and timezone filters.

[Jonas G. Drange (jonas-drange)]

Looking forward to this!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1418
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-15.04-vivid-i386-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2628
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3123
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21055

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-15.04-ci/6/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/time-date/timezonelocationmodel.cpp'
--- plugins/time-date/timezonelocationmodel.cpp	2014-08-28 07:22:28 +0000
+++ plugins/time-date/timezonelocationmodel.cpp	2015-06-09 14:08:49 +0000
@@ -174,9 +174,12 @@
                 list,
                 [pattern] (const TzLocation& tz) {
         QString display("%1, %2");
-        return display.arg(tz.city)
-                .arg(tz.full_country.isEmpty() ? tz.country : tz.full_country)
-                .contains(pattern, Qt::CaseInsensitive);
+        return g_str_match_string (pattern.toStdString().c_str(),
+                display.arg(tz.city)
+                    .arg(tz.full_country.isEmpty() ? tz.country
+                                                   : tz.full_country)
+                    .toStdString().c_str(),
+                TRUE);
     }));
 
     Q_EMIT (filterBegin());

=== modified file 'src/item-model.cpp'
--- src/item-model.cpp	2014-10-28 17:49:47 +0000
+++ src/item-model.cpp	2015-06-09 14:08:49 +0000
@@ -20,6 +20,7 @@
 
 #include "item-model.h"
 
+#include <glib.h>
 #include <libintl.h>
 
 #include "debug.h"
@@ -189,17 +190,27 @@
         int source_row, const QModelIndex &source_parent) const
 {
     QStringList keywords;
+    gchar * pattern = nullptr;
+    bool ret = false;
     QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
 
     QVariant data(sourceModel()->data(index, filterRole()));
+    pattern = g_strdup(filterRegExp().pattern().toStdString().c_str());
 
     switch (filterRole()) {
     case ItemModel::KeywordRole:
         keywords = data.value<QStringList>();
-        return keywords.filter(filterRegExp()).length() > 0;
+
+        foreach (const QString& s, keywords)
+            if (g_str_match_string (pattern, s.toStdString().c_str(), TRUE)) {
+                ret = true;
+                goto out;
+            }
     default:
-        return false;
+        ret = false;
     }
 
-    return true;
+out:
+    g_free (pattern);
+    return ret;
 }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-11-19 18:05:48 +0000
+++ tests/CMakeLists.txt	2015-06-09 14:08:49 +0000
@@ -32,7 +32,7 @@
 )
 
 qt5_use_modules(tst-plugins Core Qml Test)
-target_link_libraries(tst-plugins SystemSettings)
+target_link_libraries(tst-plugins SystemSettings ${GLIB_LDFLAGS})
 add_test(tst-plugins tst-plugins)
 set_tests_properties(tst-plugins PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")