From 8021b32b5288de901ec2c1defb3712211598925a Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@nokia.com>
Date: Tue, 24 Aug 2010 13:06:02 +0200
Subject: Awesome bar: support for multiple word search.

Also support searches starting by i (without messing with the <i> for urls)
and page titles with characters such as '<' or '>'.
---
 src/history/historymanager.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/history/historymanager.cpp')

diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index 5cd85cd7..4a3039f3 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -239,8 +239,18 @@ QList<HistoryItem> HistoryManager::find(const QString &text)
     {
         int index = m_historyFilterModel->historyLocation(url);
         HistoryItem item = m_history.at(index);
-        
-        if(url.contains(text) || item.title.contains(text))
+
+        QStringList words = text.split(" ");
+        bool matches = true;
+        foreach (const QString &word, words)
+        {
+            if (!url.contains(word, Qt::CaseInsensitive)
+                && !item.title.contains(word, Qt::CaseInsensitive)) {
+                matches = false;
+                break;
+            }
+        }
+        if (matches)
             list << item;
     }
     
-- 
cgit v1.2.1