Removed code duplication and unused methods in IFindSupport derivatives.

Change-Id: I6c76665c88f2d4678858081765e29a08566798b1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Konstantin Tokarev
2012-05-05 14:47:08 +04:00
committed by Eike Ziller
parent 8c2972be05
commit c6703af8f9
7 changed files with 17 additions and 54 deletions

View File

@@ -170,13 +170,6 @@ public:
return result; return result;
} }
void replace(const QString &, const QString &,
Find::FindFlags) { }
bool replaceStep(const QString &, const QString &,
Find::FindFlags) { return false;}
int replaceAll(const QString &, const QString &,
Find::FindFlags) { return 0; }
private: private:
BinEditor *m_editor; BinEditor *m_editor;
int m_incrementalStartPos; int m_incrementalStartPos;

View File

@@ -93,6 +93,20 @@ private:
using namespace Find; using namespace Find;
void IFindSupport::replace(const QString &before, const QString &after, FindFlags findFlags)
{
}
bool IFindSupport::replaceStep(const QString &before, const QString &after, FindFlags findFlags)
{
return false;
}
int IFindSupport::replaceAll(const QString &before, const QString &after, FindFlags findFlags)
{
return 0;
}
void IFindSupport::showWrapIndicator(QWidget *parent) void IFindSupport::showWrapIndicator(QWidget *parent)
{ {
(new Internal::WrapIndicator(parent))->run(); (new Internal::WrapIndicator(parent))->run();

View File

@@ -62,11 +62,11 @@ public:
virtual Result findIncremental(const QString &txt, FindFlags findFlags) = 0; virtual Result findIncremental(const QString &txt, FindFlags findFlags) = 0;
virtual Result findStep(const QString &txt, FindFlags findFlags) = 0; virtual Result findStep(const QString &txt, FindFlags findFlags) = 0;
virtual void replace(const QString &before, const QString &after, virtual void replace(const QString &before, const QString &after,
FindFlags findFlags) = 0; FindFlags findFlags);
virtual bool replaceStep(const QString &before, const QString &after, virtual bool replaceStep(const QString &before, const QString &after,
FindFlags findFlags) = 0; FindFlags findFlags);
virtual int replaceAll(const QString &before, const QString &after, virtual int replaceAll(const QString &before, const QString &after,
FindFlags findFlags) = 0; FindFlags findFlags);
virtual void defineFindScope(){} virtual void defineFindScope(){}
virtual void clearFindScope(){} virtual void clearFindScope(){}

View File

@@ -131,25 +131,6 @@ IFindSupport::Result TreeViewFind::findStep(const QString &txt,
return result; return result;
} }
void TreeViewFind::replace(const QString &/*before*/, const QString &/*after*/,
Find::FindFlags /*findFlags*/)
{
}
bool TreeViewFind::replaceStep(const QString &/*before*/,
const QString &/*after*/,
Find::FindFlags /*findFlags*/)
{
return false;
}
int TreeViewFind::replaceAll(const QString &/*before*/,
const QString &/*after*/,
Find::FindFlags /*findFlags*/)
{
return 0;
}
IFindSupport::Result TreeViewFind::find(const QString &searchTxt, IFindSupport::Result TreeViewFind::find(const QString &searchTxt,
Find::FindFlags findFlags, Find::FindFlags findFlags,
bool startFromCurrentIndex, bool startFromCurrentIndex,

View File

@@ -61,12 +61,6 @@ public:
virtual void highlightAll(const QString &txt, FindFlags findFlags); virtual void highlightAll(const QString &txt, FindFlags findFlags);
Result findIncremental(const QString &txt, Find::FindFlags findFlags); Result findIncremental(const QString &txt, Find::FindFlags findFlags);
Result findStep(const QString &txt, Find::FindFlags findFlags); Result findStep(const QString &txt, Find::FindFlags findFlags);
void replace(const QString &before, const QString &after,
Find::FindFlags findFlags);
bool replaceStep(const QString &before, const QString &after,
Find::FindFlags findFlags);
int replaceAll(const QString &before, const QString &after,
Find::FindFlags findFlags);
private: private:
Result find(const QString &txt, Find::FindFlags findFlags, Result find(const QString &txt, Find::FindFlags findFlags,

View File

@@ -46,11 +46,6 @@ HelpFindSupport::~HelpFindSupport()
{ {
} }
bool HelpFindSupport::isEnabled() const
{
return true;
}
Find::FindFlags HelpFindSupport::supportedFindFlags() const Find::FindFlags HelpFindSupport::supportedFindFlags() const
{ {
return Find::FindBackward | Find::FindCaseSensitively; return Find::FindBackward | Find::FindCaseSensitively;

View File

@@ -50,7 +50,6 @@ public:
HelpFindSupport(CentralWidget *centralWidget); HelpFindSupport(CentralWidget *centralWidget);
~HelpFindSupport(); ~HelpFindSupport();
bool isEnabled() const;
bool supportsReplace() const { return false; } bool supportsReplace() const { return false; }
Find::FindFlags supportedFindFlags() const; Find::FindFlags supportedFindFlags() const;
@@ -61,12 +60,6 @@ public:
Result findIncremental(const QString &txt, Find::FindFlags findFlags); Result findIncremental(const QString &txt, Find::FindFlags findFlags);
Result findStep(const QString &txt, Find::FindFlags findFlags); Result findStep(const QString &txt, Find::FindFlags findFlags);
void replace(const QString &, const QString &,
Find::FindFlags ) { }
bool replaceStep(const QString &, const QString &,
Find::FindFlags ) { return false; }
int replaceAll(const QString &, const QString &,
Find::FindFlags ) { return 0; }
private: private:
bool find(const QString &ttf, Find::FindFlags findFlags, bool incremental); bool find(const QString &ttf, Find::FindFlags findFlags, bool incremental);
@@ -80,7 +73,6 @@ class HelpViewerFindSupport : public Find::IFindSupport
public: public:
HelpViewerFindSupport(HelpViewer *viewer); HelpViewerFindSupport(HelpViewer *viewer);
bool isEnabled() const { return true; }
bool supportsReplace() const { return false; } bool supportsReplace() const { return false; }
Find::FindFlags supportedFindFlags() const; Find::FindFlags supportedFindFlags() const;
void resetIncrementalSearch() {} void resetIncrementalSearch() {}
@@ -90,12 +82,6 @@ public:
Result findIncremental(const QString &txt, Find::FindFlags findFlags); Result findIncremental(const QString &txt, Find::FindFlags findFlags);
Result findStep(const QString &txt, Find::FindFlags findFlags); Result findStep(const QString &txt, Find::FindFlags findFlags);
void replace(const QString &, const QString &,
Find::FindFlags ) { }
bool replaceStep(const QString &, const QString &,
Find::FindFlags ) { return false; }
int replaceAll(const QString &, const QString &,
Find::FindFlags ) { return 0; }
private: private:
bool find(const QString &ttf, Find::FindFlags findFlags, bool incremental); bool find(const QString &ttf, Find::FindFlags findFlags, bool incremental);