diff options
| author | Maarten De Meyer <de.meyer.maarten@gmail.com> | 2013-04-07 11:38:09 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-04-07 11:39:40 +0200 |
| commit | 5d1a223145be0eb1bb5eed76cda7d4b889d986ed (patch) | |
| tree | 1e81db324a50968f5484e073685a5bac61b2deeb /src/urlbar | |
| parent | Fix rekonq window title update (diff) | |
| download | rekonq-5d1a223145be0eb1bb5eed76cda7d4b889d986ed.tar.xz | |
Use kurifilter instead of custom rekonq code.
Now all web shortcuts work.
BUG: 258639
REVIEWED BY: adjam
Diffstat (limited to 'src/urlbar')
| -rw-r--r-- | src/urlbar/listitem.cpp | 7 | ||||
| -rw-r--r-- | src/urlbar/urlbar.cpp | 2 | ||||
| -rw-r--r-- | src/urlbar/urlsuggester.cpp | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp index 580eea53..cc0bf253 100644 --- a/src/urlbar/listitem.cpp +++ b/src/urlbar/listitem.cpp @@ -460,12 +460,7 @@ void SearchListItem::changeSearchEngine(KService::Ptr engine) // NOTE: This to let rekonq loading text typed in the requested engine on click. // There probably is a better way to do it. I just cannot see it now... - // remove the xx: part... - QString separator = SearchEngine::delimiter(); - - QString text = m_text.contains(separator) - ? m_text.section(separator, 1, 1) - : m_text; + QString text = m_text; // create a new item && load it... UrlSuggestionItem item = UrlSuggestionItem(UrlSuggestionItem::Search, SearchEngine::buildQuery(engine, text), text); diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 17be6fa0..60f8f63d 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -675,7 +675,7 @@ void UrlBar::pasteAndSearch() { KService::Ptr defaultEngine = SearchEngine::defaultEngine(); if (defaultEngine) - loadRequestedUrl(KUrl(SearchEngine::buildQuery(defaultEngine, QApplication::clipboard()->text().trimmed()))); + loadRequestedUrl(KUrl(SearchEngine::buildQuery(QApplication::clipboard()->text().trimmed()))); } diff --git a/src/urlbar/urlsuggester.cpp b/src/urlbar/urlsuggester.cpp index d6aaaf52..9ca4e8f8 100644 --- a/src/urlbar/urlsuggester.cpp +++ b/src/urlbar/urlsuggester.cpp @@ -321,7 +321,6 @@ void UrlSuggester::computeWebSearches() KService::Ptr engine = SearchEngine::fromString(_typedString); if (engine) { - query = query.remove(0, _typedString.indexOf(SearchEngine::delimiter()) + 1); _isKDEShortUrl = true; } else @@ -331,7 +330,7 @@ void UrlSuggester::computeWebSearches() if (engine) { - UrlSuggestionItem item = UrlSuggestionItem(UrlSuggestionItem::Search, SearchEngine::buildQuery(engine, query), query, engine->name()); + UrlSuggestionItem item = UrlSuggestionItem(UrlSuggestionItem::Search, SearchEngine::buildQuery(query), query, engine->name()); UrlSuggestionList list; list << item; _webSearches = list; |