Commit d52d4ccd authored by Eike Ziller's avatar Eike Ziller
Browse files

Delete the watcher to free the qfuture and its resources.

Change-Id: I4847c23e99aeabb99d3bb557b70a4985b3675b97
Reviewed-on: http://codereview.qt-project.org/5145


Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent 9b8b1ad3
......@@ -65,13 +65,11 @@ using namespace TextEditor;
BaseFileFind::BaseFileFind()
: m_currentSearch(0),
m_currentSearchCount(0),
m_watcher(0),
m_isSearching(false),
m_resultLabel(0),
m_filterCombo(0)
{
m_watcher.setPendingResultsLimit(1);
connect(&m_watcher, SIGNAL(resultReadyAt(int)), this, SLOT(displayResult(int)));
connect(&m_watcher, SIGNAL(finished()), this, SLOT(searchFinished()));
}
BaseFileFind::~BaseFileFind()
......@@ -85,7 +83,8 @@ bool BaseFileFind::isEnabled() const
void BaseFileFind::cancel()
{
m_watcher.cancel();
QTC_ASSERT(m_watcher, return);
m_watcher->cancel();
}
QStringList BaseFileFind::fileNameFilters() const
......@@ -111,7 +110,11 @@ void BaseFileFind::runNewSearch(const QString &txt, Find::FindFlags findFlags,
emit changed();
if (m_filterCombo)
updateComboEntries(m_filterCombo, true);
m_watcher.setFuture(QFuture<FileSearchResultList>());
delete m_watcher;
m_watcher = new QFutureWatcher<FileSearchResultList>();
m_watcher->setPendingResultsLimit(1);
connect(m_watcher, SIGNAL(resultReadyAt(int)), this, SLOT(displayResult(int)));
connect(m_watcher, SIGNAL(finished()), this, SLOT(searchFinished()));
m_currentSearchCount = 0;
m_currentSearch = Find::SearchResultWindow::instance()->startNewSearch(label(),
toolTip().arg(Find::IFindFilter::descriptionForFindFlags(findFlags)),
......@@ -128,15 +131,15 @@ void BaseFileFind::runNewSearch(const QString &txt, Find::FindFlags findFlags,
connect(m_currentSearch, SIGNAL(visibilityChanged(bool)), this, SLOT(hideHighlightAll(bool)));
Find::SearchResultWindow::instance()->popup(true);
if (findFlags & Find::FindRegularExpression) {
m_watcher.setFuture(Utils::findInFilesRegExp(txt, files(),
m_watcher->setFuture(Utils::findInFilesRegExp(txt, files(),
textDocumentFlagsForFindFlags(findFlags), ITextEditor::openedTextEditorsContents()));
} else {
m_watcher.setFuture(Utils::findInFiles(txt, files(),
m_watcher->setFuture(Utils::findInFiles(txt, files(),
textDocumentFlagsForFindFlags(findFlags), ITextEditor::openedTextEditorsContents()));
}
connect(m_currentSearch, SIGNAL(cancelled()), this, SLOT(cancel()));
Core::FutureProgress *progress =
Core::ICore::instance()->progressManager()->addTask(m_watcher.future(),
Core::ICore::instance()->progressManager()->addTask(m_watcher->future(),
tr("Search"),
Constants::TASK_SEARCH);
progress->setWidget(createProgressWidget());
......@@ -166,10 +169,10 @@ void BaseFileFind::doReplace(const QString &text,
void BaseFileFind::displayResult(int index) {
if (!m_currentSearch) {
m_watcher.cancel();
m_watcher->cancel();
return;
}
Utils::FileSearchResultList results = m_watcher.future().resultAt(index);
Utils::FileSearchResultList results = m_watcher->resultAt(index);
QList<Find::SearchResultItem> items;
foreach (const Utils::FileSearchResult &result, results) {
Find::SearchResultItem item;
......@@ -195,6 +198,8 @@ void BaseFileFind::searchFinished()
m_currentSearch = 0;
m_isSearching = false;
m_resultLabel = 0;
m_watcher->deleteLater();
m_watcher = 0;
emit changed();
}
......
......@@ -106,7 +106,7 @@ private:
QPointer<Find::SearchResult> m_currentSearch;
int m_currentSearchCount;
QFutureWatcher<Utils::FileSearchResultList> m_watcher;
QFutureWatcher<Utils::FileSearchResultList> *m_watcher;
bool m_isSearching;
QPointer<Find::IFindSupport> m_currentFindSupport;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment