From be4e2c1a776eed91fd2c6426235d08a67d3104a5 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Wed, 14 Dec 2011 13:26:33 +0100
Subject: [PATCH] Simplify code.
Change-Id: I4eef170f036a26c8ea8c3700c5524f7afedf67ac
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
---
src/plugins/texteditor/basefilefind.cpp | 15 +--------------
src/plugins/texteditor/basefilefind.h | 1 -
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index bf1e030a347..c00edea42a7 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -86,7 +86,7 @@ void BaseFileFind::cancel()
{
SearchResult *search = qobject_cast<SearchResult *>(sender());
QTC_ASSERT(search, return);
- QFutureWatcher<FileSearchResultList> *watcher = watcherForSearch(search);
+ QFutureWatcher<FileSearchResultList> *watcher = m_watchers.key(search);
QTC_ASSERT(watcher, return);
watcher->cancel();
}
@@ -164,19 +164,6 @@ void BaseFileFind::runSearch(Find::SearchResult *search)
connect(progress, SIGNAL(clicked()), Find::SearchResultWindow::instance(), SLOT(popup()));
}
-QFutureWatcher<FileSearchResultList> *BaseFileFind::watcherForSearch(SearchResult *search)
-{
- if (!search)
- return 0;
- QMapIterator<QFutureWatcher<Utils::FileSearchResultList> *, QPointer<Find::SearchResult> > it(m_watchers);
- while (it.hasNext()) {
- it.next();
- if (it.value() == search)
- return it.key();
- }
- return 0;
-}
-
void BaseFileFind::findAll(const QString &txt, Find::FindFlags findFlags)
{
runNewSearch(txt, findFlags, SearchResultWindow::SearchOnly);
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index 68ff48d6eec..ead48666494 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -105,7 +105,6 @@ private:
void runNewSearch(const QString &txt, Find::FindFlags findFlags,
Find::SearchResultWindow::SearchMode searchMode);
void runSearch(Find::SearchResult *search);
- QFutureWatcher<Utils::FileSearchResultList> *watcherForSearch(Find::SearchResult *search);
QMap<QFutureWatcher<Utils::FileSearchResultList> *, QPointer<Find::SearchResult> > m_watchers;
QPointer<Find::IFindSupport> m_currentFindSupport;
--
GitLab