feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Merge Find and Locator into Core plugin

Browse Source 
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-01-13 16:17:34 +01:00
committed by Eike Ziller
parent 8b854270a6
commit 4d96fa7aba
239 changed files with 1625 additions and 1787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/help/helpfindsupport.cpp
View File

@@ -32,6 +32,7 @@
#include <utils/qtcassert.h>
using namespace Core;
using namespace Help::Internal;
HelpFindSupport::HelpFindSupport(CentralWidget *centralWidget)
@@ -43,9 +44,9 @@ HelpFindSupport::~HelpFindSupport()
{
}
Find::FindFlags HelpFindSupport::supportedFindFlags() const
Core::FindFlags HelpFindSupport::supportedFindFlags() const
{
return Find::FindBackward | Find::FindCaseSensitively;
return FindBackward | FindCaseSensitively;
}
QString HelpFindSupport::currentFindString() const
@@ -62,20 +63,20 @@ QString HelpFindSupport::completedFindString() const
return QString();
}
Find::IFindSupport::Result HelpFindSupport::findIncremental(const QString &txt,
Find::FindFlags findFlags)
Core::IFindSupport::Result HelpFindSupport::findIncremental(const QString &txt,
Core::FindFlags findFlags)
{
findFlags &= ~Find::FindBackward;
findFlags &= ~FindBackward;
return find(txt, findFlags, true) ? Found : NotFound;
}
Find::IFindSupport::Result HelpFindSupport::findStep(const QString &txt,
Find::FindFlags findFlags)
Core::IFindSupport::Result HelpFindSupport::findStep(const QString &txt,
Core::FindFlags findFlags)
{
return find(txt, findFlags, false) ? Found : NotFound;
}
bool HelpFindSupport::find(const QString &txt, Find::FindFlags findFlags, bool incremental)
bool HelpFindSupport::find(const QString &txt, Core::FindFlags findFlags, bool incremental)
{
QTC_ASSERT(m_centralWidget, return false);
bool wrapped = false;
@@ -92,9 +93,9 @@ HelpViewerFindSupport::HelpViewerFindSupport(HelpViewer *viewer)
{
}
Find::FindFlags HelpViewerFindSupport::supportedFindFlags() const
Core::FindFlags HelpViewerFindSupport::supportedFindFlags() const
{
return Find::FindBackward | Find::FindCaseSensitively;
return FindBackward | FindCaseSensitively;
}
QString HelpViewerFindSupport::currentFindString() const
@@ -103,23 +104,23 @@ QString HelpViewerFindSupport::currentFindString() const
return m_viewer->selectedText();
}
Find::IFindSupport::Result HelpViewerFindSupport::findIncremental(const QString &txt,
Find::FindFlags findFlags)
Core::IFindSupport::Result HelpViewerFindSupport::findIncremental(const QString &txt,
Core::FindFlags findFlags)
{
QTC_ASSERT(m_viewer, return NotFound);
findFlags &= ~Find::FindBackward;
findFlags &= ~FindBackward;
return find(txt, findFlags, true) ? Found : NotFound;
}
Find::IFindSupport::Result HelpViewerFindSupport::findStep(const QString &txt,
Find::FindFlags findFlags)
Core::IFindSupport::Result HelpViewerFindSupport::findStep(const QString &txt,
Core::FindFlags findFlags)
{
QTC_ASSERT(m_viewer, return NotFound);
return find(txt, findFlags, false) ? Found : NotFound;
}
bool HelpViewerFindSupport::find(const QString &txt,
Find::FindFlags findFlags, bool incremental)
Core::FindFlags findFlags, bool incremental)
{
QTC_ASSERT(m_viewer, return false);
bool wrapped = false;