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

IFindSupport::clearResults --> ::clearHighlights



Since we also call it "highlightAll".

Change-Id: Ica19091151538d588c1e6658ef139df82183c6e3
Reviewed-by: default avatarDavid Schulz <david.schulz@digia.com>
parent e8f1c30c
......@@ -97,7 +97,7 @@ public:
m_widget->highlightSearchResults(txt.toLatin1(), textDocumentFlagsForFindFlags(findFlags));
}
void clearResults()
void clearHighlights()
{
m_widget->highlightSearchResults(QByteArray());
}
......
......@@ -133,7 +133,7 @@ void BaseTextFind::resetIncrementalSearch()
d->m_incrementalWrappedState = false;
}
void BaseTextFind::clearResults()
void BaseTextFind::clearHighlights()
{
emit highlightAll(QString(), 0);
}
......
......@@ -53,7 +53,7 @@ public:
bool supportsReplace() const;
FindFlags supportedFindFlags() const;
void resetIncrementalSearch();
void clearResults();
void clearHighlights();
QString currentFindString() const;
QString completedFindString() const;
......
......@@ -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()),
......
......@@ -45,7 +45,7 @@ public:
CurrentDocumentFind();
void resetIncrementalSearch();
void clearResults();
void clearHighlights();
bool supportsReplace() const;
FindFlags supportedFindFlags() const;
QString currentFindString() const;
......
......@@ -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();
}
}
......
......@@ -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;
......
......@@ -83,7 +83,7 @@ void TreeViewFind::resetIncrementalSearch()
d->m_incrementalWrappedState = false;
}
void TreeViewFind::clearResults()
void TreeViewFind::clearHighlights()
{
}
......
......@@ -56,7 +56,7 @@ public:
bool supportsReplace() const;
FindFlags supportedFindFlags() const;
void resetIncrementalSearch();
void clearResults();
void clearHighlights();
QString currentFindString() const;
QString completedFindString() const;
......
......@@ -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(); }
......
......@@ -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
......
......@@ -47,7 +47,7 @@ public:
bool supportsReplace() const;
Core::FindFlags supportedFindFlags() const;
void resetIncrementalSearch();
void clearResults();
void clearHighlights();
QString currentFindString() const;
QString completedFindString() const;
......
......@@ -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()
......
Markdown is supported
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