diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2011-01-09 11:40:43 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2011-01-09 11:42:23 +0100 |
commit | 527756748468ddd3d5e7fa1bafcb2e32bf02144b (patch) | |
tree | f1f9a34722932e30d8341ec8299cda07b18cfc15 /src/opensearch | |
parent | Should fix rekonq compilation against KDE SC 4.5... (diff) | |
download | rekonq-527756748468ddd3d5e7fa1bafcb2e32bf02144b.tar.xz |
Update the completion list when the user switches search engine on the fly.
Lionel Chauvin's work.
Reviewed by me :)
Diffstat (limited to 'src/opensearch')
-rw-r--r-- | src/opensearch/opensearchmanager.cpp | 4 | ||||
-rw-r--r-- | src/opensearch/opensearchmanager.h | 2 | ||||
-rw-r--r-- | src/opensearch/searchengine.cpp | 9 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp index 4ee1de33..9d2a52e4 100644 --- a/src/opensearch/opensearchmanager.cpp +++ b/src/opensearch/opensearchmanager.cpp @@ -171,7 +171,7 @@ void OpenSearchManager::jobFinished(KJob *job) { if (job->error()) { - emit suggestionReceived(_typedText, ResponseList()); + emit suggestionsReceived(_typedText, ResponseList()); m_state = IDLE; return; // just silently return } @@ -185,7 +185,7 @@ void OpenSearchManager::jobFinished(KJob *job) kDebug() << r.title; } - emit suggestionReceived(_typedText, suggestionsList); + emit suggestionsReceived(_typedText, suggestionsList); idleJob(); return; } diff --git a/src/opensearch/opensearchmanager.h b/src/opensearch/opensearchmanager.h index df8e5367..a0543c56 100644 --- a/src/opensearch/opensearchmanager.h +++ b/src/opensearch/opensearchmanager.h @@ -94,7 +94,7 @@ private Q_SLOTS: void jobFinished(KJob *job); Q_SIGNALS: - void suggestionReceived(const QString &text, const ResponseList &suggestion); + void suggestionsReceived(const QString &text, const ResponseList &suggestion); void openSearchEngineAdded(const QString &name, const QString &searchUrl, const QString &fileName); private: diff --git a/src/opensearch/searchengine.cpp b/src/opensearch/searchengine.cpp index 92b3293e..f407789b 100644 --- a/src/opensearch/searchengine.cpp +++ b/src/opensearch/searchengine.cpp @@ -135,15 +135,6 @@ KService::Ptr SearchEngine::fromString(const QString &text) } -QString SearchEngine::extractQuery(const QString &text) -{ - QString query = text; - KService::Ptr engine = SearchEngine::fromString(text); - - return query; -} - - QString SearchEngine::buildQuery(KService::Ptr engine, const QString &text) { if(!engine) |