diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index 2ff5f954e357eb6564a8ba9e5d148b0bb207ed9b..b5867192c3d6758df043923408536a5963cfcc8b 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -97,7 +97,7 @@ public: m_widget->highlightSearchResults(txt.toLatin1(), textDocumentFlagsForFindFlags(findFlags)); } - void clearResults() + void clearHighlights() { m_widget->highlightSearchResults(QByteArray()); } diff --git a/src/plugins/coreplugin/find/basetextfind.cpp b/src/plugins/coreplugin/find/basetextfind.cpp index 70fdef51bd5e83ce592fe2287b15218cba5b6f4a..03b758987b2717c0d799773b4f9802635e029713 100644 --- a/src/plugins/coreplugin/find/basetextfind.cpp +++ b/src/plugins/coreplugin/find/basetextfind.cpp @@ -133,7 +133,7 @@ void BaseTextFind::resetIncrementalSearch() d->m_incrementalWrappedState = false; } -void BaseTextFind::clearResults() +void BaseTextFind::clearHighlights() { emit highlightAll(QString(), 0); } diff --git a/src/plugins/coreplugin/find/basetextfind.h b/src/plugins/coreplugin/find/basetextfind.h index 1d1d54d9ef1388ca670989404fadf7486dff97c6..4ebb0c9e5be034e57afd2f2b3478cf78aa648c5f 100644 --- a/src/plugins/coreplugin/find/basetextfind.h +++ b/src/plugins/coreplugin/find/basetextfind.h @@ -53,7 +53,7 @@ public: bool supportsReplace() const; FindFlags supportedFindFlags() const; void resetIncrementalSearch(); - void clearResults(); + void clearHighlights(); QString currentFindString() const; QString completedFindString() const; diff --git a/src/plugins/coreplugin/find/currentdocumentfind.cpp b/src/plugins/coreplugin/find/currentdocumentfind.cpp index 854a391003bfc15624adbf482790517d1676954b..d726643f0fac536888cbeedbf8757521692abea9 100644 --- a/src/plugins/coreplugin/find/currentdocumentfind.cpp +++ b/src/plugins/coreplugin/find/currentdocumentfind.cpp @@ -60,10 +60,10 @@ void CurrentDocumentFind::resetIncrementalSearch() m_currentFind->resetIncrementalSearch(); } -void CurrentDocumentFind::clearResults() +void CurrentDocumentFind::clearHighlights() { QTC_ASSERT(m_currentFind, return); - m_currentFind->clearResults(); + m_currentFind->clearHighlights(); } bool CurrentDocumentFind::isEnabled() const @@ -175,7 +175,7 @@ void CurrentDocumentFind::acceptCandidate() return; removeFindSupportConnections(); if (m_currentFind) - m_currentFind->clearResults(); + m_currentFind->clearHighlights(); if (m_currentWidget) disconnect(Aggregation::Aggregate::parentAggregate(m_currentWidget), SIGNAL(changed()), diff --git a/src/plugins/coreplugin/find/currentdocumentfind.h b/src/plugins/coreplugin/find/currentdocumentfind.h index 2b428e05839084f775dc619d3e74d4340882796e..06737fe2a053137613fcc7c8f29e33e892fdd080 100644 --- a/src/plugins/coreplugin/find/currentdocumentfind.h +++ b/src/plugins/coreplugin/find/currentdocumentfind.h @@ -45,7 +45,7 @@ public: CurrentDocumentFind(); void resetIncrementalSearch(); - void clearResults(); + void clearHighlights(); bool supportsReplace() const; FindFlags supportedFindFlags() const; QString currentFindString() const; diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index 2be75eef865a609eca5bbf3d197dca2e833d0200..5c0ce69c97dda1e937b61a470b9ada38c741fe93 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -406,7 +406,7 @@ void FindToolBar::invokeReplaceEnter() void FindToolBar::invokeClearResults() { if (m_currentDocumentFind->isEnabled()) - m_currentDocumentFind->clearResults(); + m_currentDocumentFind->clearHighlights(); } @@ -471,7 +471,7 @@ void FindToolBar::invokeFindIncremental() if (result == IFindSupport::NotYetFound) m_findIncrementalTimer.start(50); if (text.isEmpty()) - m_currentDocumentFind->clearResults(); + m_currentDocumentFind->clearHighlights(); } } diff --git a/src/plugins/coreplugin/find/ifindsupport.h b/src/plugins/coreplugin/find/ifindsupport.h index 041de57fddd9ab6a611f5ee8a12add3d7c0def03..f9cfd81ad0a141a0aee3b92bffb4c6d72e2971ac 100644 --- a/src/plugins/coreplugin/find/ifindsupport.h +++ b/src/plugins/coreplugin/find/ifindsupport.h @@ -50,7 +50,7 @@ public: virtual bool supportsReplace() const = 0; virtual FindFlags supportedFindFlags() const = 0; virtual void resetIncrementalSearch() = 0; - virtual void clearResults() = 0; + virtual void clearHighlights() = 0; virtual QString currentFindString() const = 0; virtual QString completedFindString() const = 0; diff --git a/src/plugins/coreplugin/find/treeviewfind.cpp b/src/plugins/coreplugin/find/treeviewfind.cpp index 520c1da56144738c77beea1f713bcbe953b97b80..460f5976223748f918a7be50b376dd9d419aebf7 100644 --- a/src/plugins/coreplugin/find/treeviewfind.cpp +++ b/src/plugins/coreplugin/find/treeviewfind.cpp @@ -83,7 +83,7 @@ void TreeViewFind::resetIncrementalSearch() d->m_incrementalWrappedState = false; } -void TreeViewFind::clearResults() +void TreeViewFind::clearHighlights() { } diff --git a/src/plugins/coreplugin/find/treeviewfind.h b/src/plugins/coreplugin/find/treeviewfind.h index 267549cf46c2bf1c28871c2893357b72fa6e212f..8577b3c7668fe965ec8a2167c8b8417ac52bb6c1 100644 --- a/src/plugins/coreplugin/find/treeviewfind.h +++ b/src/plugins/coreplugin/find/treeviewfind.h @@ -56,7 +56,7 @@ public: bool supportsReplace() const; FindFlags supportedFindFlags() const; void resetIncrementalSearch(); - void clearResults(); + void clearHighlights(); QString currentFindString() const; QString completedFindString() const; diff --git a/src/plugins/help/helpfindsupport.h b/src/plugins/help/helpfindsupport.h index 3809fe43147d6450dd4ff6b96dae7b8ff2dbaaff..13e15d518ad1d6c83ba1a968b2eafcee4c466503 100644 --- a/src/plugins/help/helpfindsupport.h +++ b/src/plugins/help/helpfindsupport.h @@ -48,7 +48,7 @@ public: bool supportsReplace() const { return false; } Core::FindFlags supportedFindFlags() const; void resetIncrementalSearch() {} - void clearResults() {} + void clearHighlights() {} QString currentFindString() const; QString completedFindString() const { return QString(); } diff --git a/src/plugins/macros/macrotextfind.cpp b/src/plugins/macros/macrotextfind.cpp index 1aeef19113cbc9d5ac7c6d12b773e99b91b07c53..e3ef0e952b1627ae5321cead3b7320060fd563fd 100644 --- a/src/plugins/macros/macrotextfind.cpp +++ b/src/plugins/macros/macrotextfind.cpp @@ -59,10 +59,10 @@ void MacroTextFind::resetIncrementalSearch() emit incrementalSearchReseted(); } -void MacroTextFind::clearResults() +void MacroTextFind::clearHighlights() { QTC_ASSERT(m_currentFind, return); - m_currentFind->clearResults(); + m_currentFind->clearHighlights(); } QString MacroTextFind::currentFindString() const diff --git a/src/plugins/macros/macrotextfind.h b/src/plugins/macros/macrotextfind.h index f703664dfdd8fab35f4facf743a326b66be491c4..6cc23d124d66d339bb78484887557f9c8de8ec61 100644 --- a/src/plugins/macros/macrotextfind.h +++ b/src/plugins/macros/macrotextfind.h @@ -47,7 +47,7 @@ public: bool supportsReplace() const; Core::FindFlags supportedFindFlags() const; void resetIncrementalSearch(); - void clearResults(); + void clearHighlights(); QString currentFindString() const; QString completedFindString() const; diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 07eaaef6f2e87732712b410cba6e452cc472cde0..91983c9b107bfca2b57aa206b6846c0f3e213d16 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -316,7 +316,7 @@ void BaseFileFind::openEditor(const Core::SearchResultItem &item) openedEditor = EditorManager::openEditor(QDir::fromNativeSeparators(item.text)); } if (d->m_currentFindSupport) - d->m_currentFindSupport->clearResults(); + d->m_currentFindSupport->clearHighlights(); d->m_currentFindSupport = 0; if (!openedEditor) return; @@ -333,7 +333,7 @@ void BaseFileFind::openEditor(const Core::SearchResultItem &item) void BaseFileFind::hideHighlightAll(bool visible) { if (!visible && d->m_currentFindSupport) - d->m_currentFindSupport->clearResults(); + d->m_currentFindSupport->clearHighlights(); } void BaseFileFind::searchAgain()