From 91c709932f8d49323f2834dcfb501fade27a8f6e Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 3 Aug 2012 01:26:03 +0200 Subject: Clean up url suggestions loading --- src/urlbar/completionwidget.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/urlbar/completionwidget.cpp') diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp index 5ef65fd9..12051f80 100644 --- a/src/urlbar/completionwidget.cpp +++ b/src/urlbar/completionwidget.cpp @@ -33,6 +33,7 @@ // Local Includes #include "searchengine.h" +#include "urlresolver.h" #include "listitem.h" #include "urlbar.h" @@ -299,7 +300,6 @@ bool CompletionWidget::eventFilter(QObject *obj, QEvent *ev) } } - kDebug() << "Suggestion INDEX chosen: " << _currentIndex; if (_currentIndex == -1) _currentIndex = 0; child = findChild(QString::number(_currentIndex)); @@ -311,16 +311,8 @@ bool CompletionWidget::eventFilter(QObject *obj, QEvent *ev) } else //the user type too fast (completionwidget not visible or suggestion not downloaded) { - UrlSuggester res(w->text()); - UrlSuggestionList list = res.orderedSearchItems(); - if (list.isEmpty()) - { - emit chosenUrl(KUrl(_typedString), Rekonq::CurrentTab); - } - else - { - emit chosenUrl(list.first().url, Rekonq::CurrentTab); - } + KUrl u = UrlResolver::urlFromTextTyped(w->text()); + emit chosenUrl(u, Rekonq::CurrentTab); } kev->accept(); hide(); @@ -387,11 +379,6 @@ void CompletionWidget::suggestUrls(const QString &text) return; } - if (!isVisible()) - { -// FIXME UrlResolver::setSearchEngine(SearchEngine::defaultEngine()); - } - UrlSuggester *res = new UrlSuggester(text); connect(res, SIGNAL(suggestionsReady(UrlSuggestionList, QString)), this, SLOT(updateSuggestionList(UrlSuggestionList, QString))); -- cgit v1.2.1