diff options
author | Eike Ziller <eike.ziller@nokia.com> | 2011-12-12 15:16:49 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@nokia.com> | 2011-12-13 15:25:02 +0100 |
commit | 3fc2ae7a498069742bbfc51f96c636f5bd4be411 (patch) | |
tree | 4b6a1699043f9052ddef24d4c3a0f4033801bb88 /src/plugins/texteditor/basefilefind.h | |
parent | 5f6349907ce01d10329a3c2a3da5d676ba37d8e6 (diff) |
Allow multiple file searches at the same time.
I.e. All Projects, Current Project, Files on File System, Current File.
Task-number: QTCREATORBUG-6101
Change-Id: Ib2ee95c5eca1ecc3ef3bf707705651471db6324a
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/texteditor/basefilefind.h')
-rw-r--r-- | src/plugins/texteditor/basefilefind.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h index 16b411efb8d..0f192b6887d 100644 --- a/src/plugins/texteditor/basefilefind.h +++ b/src/plugins/texteditor/basefilefind.h @@ -99,15 +99,11 @@ private slots: void hideHighlightAll(bool visible); private: - QWidget *createProgressWidget(); void runNewSearch(const QString &txt, Find::FindFlags findFlags, Find::SearchResultWindow::SearchMode searchMode); + QFutureWatcher<Utils::FileSearchResultList> *watcherForSearch(Find::SearchResult *search); - QPointer<Find::SearchResult> m_currentSearch; - int m_currentSearchCount; - - QFutureWatcher<Utils::FileSearchResultList> *m_watcher; - bool m_isSearching; + QMap<QFutureWatcher<Utils::FileSearchResultList> *, QPointer<Find::SearchResult> > m_watchers; QPointer<Find::IFindSupport> m_currentFindSupport; QLabel *m_resultLabel; |