diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index bf1e030a347b4b479931ca8dad50c6de333fd1b7..c00edea42a7b43293ae988a53f15fb596297d35c 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 68ff48d6eec79cfb19e191bfc78f02ced02a8eb7..ead4866649474e2b18e0e1c3b97e8148ee9ccf90 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;