diff options
| author | Jon Ander Peñalba <jonan88@gmail.com> | 2010-09-02 18:10:46 +0200 |
|---|---|---|
| committer | Jon Ander Peñalba <jonan88@gmail.com> | 2010-09-03 08:27:20 +0200 |
| commit | d0ab264b8aa5f5c7fcb21dd172a1f3f5b777356b (patch) | |
| tree | f89adefce79c8bf0d5cde2e1bc015a443ccb39fe /src/urlbar | |
| parent | This commit hacks a merge request, to fast fixing a crash calling the bk toolbar (diff) | |
| download | rekonq-d0ab264b8aa5f5c7fcb21dd172a1f3f5b777356b.tar.xz | |
Include clean-up in the big src directory
Diffstat (limited to 'src/urlbar')
| -rw-r--r-- | src/urlbar/urlresolver.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp index 7f6a7f4f..59fa28c0 100644 --- a/src/urlbar/urlresolver.cpp +++ b/src/urlbar/urlresolver.cpp @@ -33,6 +33,7 @@ #include "historymanager.h" #include "bookmarkprovider.h" #include "searchengine.h" +#include "opensearchmanager.h" // KDE Includes #include <KBookmark> @@ -71,7 +72,7 @@ UrlResolver::UrlResolver(const QString &typedUrl) , _typedString(typedUrl.trimmed()) { if (!_searchEngine ) _searchEngine = SearchEngine::defaultEngine(); - + if ( _browseRegexp.isEmpty() ) { kDebug() << "browse regexp empty. Setting value.."; @@ -267,7 +268,7 @@ UrlSearchList UrlResolver::orderLists() historyCount = _history.count(); bookmarksCount = _bookmarks.count(); commonCount = common.count(); - + kDebug() << "HISTORY COUNT: " << historyCount; //now fill the list to MAX_ELEMENTS @@ -386,7 +387,7 @@ void UrlResolver::computeSuggestions() emit suggestionsReady(list, _typedString); return; } - + if (Application::opensearchManager()->isSuggestionAvailable()) { connect(Application::opensearchManager(), @@ -395,7 +396,7 @@ void UrlResolver::computeSuggestions() SLOT(suggestionsReceived(const QString &, const QStringList &))); Application::opensearchManager()->requestSuggestion(_typedString); - } + } } @@ -403,7 +404,7 @@ void UrlResolver::suggestionsReceived(const QString &text, const QStringList &su { if(text != _typedString) return; - + UrlSearchList sugList; Q_FOREACH(const QString &s, suggestions) |