summaryrefslogtreecommitdiff
path: root/src/urlbar/urlresolver.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-14 12:06:22 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-14 12:06:22 +0200
commit14cbcb6f931a03edb9a2a6a70cb0cb0c9bd77c90 (patch)
tree733c846bfb0df337c7cb10a9652f45c033ba6792 /src/urlbar/urlresolver.cpp
parentImplement TZander suggestions on closing the last tab (diff)
downloadrekonq-14cbcb6f931a03edb9a2a6a70cb0cb0c9bd77c90.tar.xz
No wait for first results
Diffstat (limited to 'src/urlbar/urlresolver.cpp')
-rw-r--r--src/urlbar/urlresolver.cpp61
1 files changed, 29 insertions, 32 deletions
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index e86adc62..12e2f762 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -88,50 +88,47 @@ UrlSearchList UrlResolver::orderedSearchItems()
}
- if (_typedString.length() >= 2)
- {
- int firstResults = list.count();
- int checkPoint = 9 - firstResults;
+ int firstResults = list.count();
+ int checkPoint = 9 - firstResults;
- UrlSearchList historyList = historyResolution();
- int historyResults = historyList.count();
+ UrlSearchList historyList = historyResolution();
+ int historyResults = historyList.count();
- UrlSearchList bookmarksList = bookmarksResolution();
- int bookmarkResults = bookmarksList.count();
+ UrlSearchList bookmarksList = bookmarksResolution();
+ int bookmarkResults = bookmarksList.count();
- if (historyResults + bookmarkResults > checkPoint)
- {
- historyList = historyList.mid(0, 3);
- bookmarksList = bookmarksList.mid(0, 3);
- }
-
- QList<UrlSearchItem> common;
+ if (historyResults + bookmarkResults > checkPoint)
+ {
+ historyList = historyList.mid(0, 3);
+ bookmarksList = bookmarksList.mid(0, 3);
+ }
- foreach(UrlSearchItem i, historyList)
- {
- if (!bookmarksList.contains(i))
- {
- list << i;
- }
- else
- {
- i.type |= UrlSearchItem::Bookmark;
- common << i;
- }
- }
+ QList<UrlSearchItem> common;
- foreach(const UrlSearchItem &i, common)
+ foreach(UrlSearchItem i, historyList)
+ {
+ if (!bookmarksList.contains(i))
{
list << i;
}
-
- foreach(const UrlSearchItem &i, bookmarksList)
+ else
{
- if (!common.contains(i))
- list << i;
+ i.type |= UrlSearchItem::Bookmark;
+ common << i;
}
}
+ foreach(const UrlSearchItem &i, common)
+ {
+ list << i;
+ }
+
+ foreach(const UrlSearchItem &i, bookmarksList)
+ {
+ if (!common.contains(i))
+ list << i;
+ }
+
list = placeTypedDomaineNameOnTop(list);
return list;