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

22
src/plugins/help/helpfindsupport.h
View File

@@ -32,14 +32,14 @@
#include "centralwidget.h"
#include <find/ifindsupport.h>
#include <coreplugin/find/ifindsupport.h>
namespace Help {
namespace Internal {
class HelpViewer;
class HelpFindSupport : public Find::IFindSupport
class HelpFindSupport : public Core::IFindSupport
{
Q_OBJECT
@@ -48,40 +48,40 @@ public:
~HelpFindSupport();
bool supportsReplace() const { return false; }
Find::FindFlags supportedFindFlags() const;
Core::FindFlags supportedFindFlags() const;
void resetIncrementalSearch() {}
void clearResults() {}
QString currentFindString() const;
QString completedFindString() const;
Result findIncremental(const QString &txt, Find::FindFlags findFlags);
Result findStep(const QString &txt, Find::FindFlags findFlags);
Result findIncremental(const QString &txt, Core::FindFlags findFlags);
Result findStep(const QString &txt, Core::FindFlags findFlags);
private:
bool find(const QString &ttf, Find::FindFlags findFlags, bool incremental);
bool find(const QString &ttf, Core::FindFlags findFlags, bool incremental);
CentralWidget *m_centralWidget;
};
class HelpViewerFindSupport : public Find::IFindSupport
class HelpViewerFindSupport : public Core::IFindSupport
{
Q_OBJECT
public:
HelpViewerFindSupport(HelpViewer *viewer);
bool supportsReplace() const { return false; }
Find::FindFlags supportedFindFlags() const;
Core::FindFlags supportedFindFlags() const;
void resetIncrementalSearch() {}
void clearResults() {}
QString currentFindString() const;
QString completedFindString() const { return QString(); }
Result findIncremental(const QString &txt, Find::FindFlags findFlags);
Result findStep(const QString &txt, Find::FindFlags findFlags);
Result findIncremental(const QString &txt, Core::FindFlags findFlags);
Result findStep(const QString &txt, Core::FindFlags findFlags);
private:
bool find(const QString &ttf, Find::FindFlags findFlags, bool incremental);
bool find(const QString &ttf, Core::FindFlags findFlags, bool incremental);
HelpViewer *m_viewer;
};