diff options
author | Eike Ziller <eike.ziller@digia.com> | 2014-07-02 13:43:31 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-07-02 14:23:17 +0200 |
commit | df5e95f630a9c4a93e4725a84b01efb41ef53d3d (patch) | |
tree | 8a8eebc4dca34c877b75e657b4d122587483bd5e | |
parent | e8f1c30c2fdb295adc0a37d0b7b83a1d18b0ad22 (diff) |
IFindSupport::clearResults --> ::clearHighlights
Since we also call it "highlightAll".
Change-Id: Ica19091151538d588c1e6658ef139df82183c6e3
Reviewed-by: David Schulz <david.schulz@digia.com>
-rw-r--r-- | src/plugins/bineditor/bineditorplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/basetextfind.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/basetextfind.h | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/currentdocumentfind.cpp | 6 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/currentdocumentfind.h | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/findtoolbar.cpp | 4 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/ifindsupport.h | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/treeviewfind.cpp | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/find/treeviewfind.h | 2 | ||||
-rw-r--r-- | src/plugins/help/helpfindsupport.h | 2 | ||||
-rw-r--r-- | src/plugins/macros/macrotextfind.cpp | 4 | ||||
-rw-r--r-- | src/plugins/macros/macrotextfind.h | 2 | ||||
-rw-r--r-- | src/plugins/texteditor/basefilefind.cpp | 4 |
13 files changed, 18 insertions, 18 deletions
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index 2ff5f954e3..b5867192c3 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 70fdef51bd..03b758987b 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 1d1d54d9ef..4ebb0c9e5b 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 854a391003..d726643f0f 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 2b428e0583..06737fe2a0 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 2be75eef86..5c0ce69c97 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 041de57fdd..f9cfd81ad0 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 520c1da561..460f597622 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 267549cf46..8577b3c766 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 3809fe4314..13e15d518a 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 1aeef19113..e3ef0e952b 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 f703664dfd..6cc23d124d 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 07eaaef6f2..91983c9b10 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() |