From c6703af8f9d49908d1a5b84cfebf1c33ce32b40a Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Sat, 5 May 2012 14:47:08 +0400
Subject: [PATCH] Removed code duplication and unused methods in IFindSupport
derivatives.
Change-Id: I6c76665c88f2d4678858081765e29a08566798b1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
src/plugins/bineditor/bineditorplugin.cpp | 7 -------
src/plugins/find/ifindsupport.cpp | 14 ++++++++++++++
src/plugins/find/ifindsupport.h | 6 +++---
src/plugins/find/treeviewfind.cpp | 19 -------------------
src/plugins/find/treeviewfind.h | 6 ------
src/plugins/help/helpfindsupport.cpp | 5 -----
src/plugins/help/helpfindsupport.h | 14 --------------
7 files changed, 17 insertions(+), 54 deletions(-)
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 8c22297295a..e147686e877 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -170,13 +170,6 @@ public:
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:
BinEditor *m_editor;
int m_incrementalStartPos;
diff --git a/src/plugins/find/ifindsupport.cpp b/src/plugins/find/ifindsupport.cpp
index 8531edeb77b..558dc11e45b 100644
--- a/src/plugins/find/ifindsupport.cpp
+++ b/src/plugins/find/ifindsupport.cpp
@@ -93,6 +93,20 @@ private:
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)
{
(new Internal::WrapIndicator(parent))->run();
diff --git a/src/plugins/find/ifindsupport.h b/src/plugins/find/ifindsupport.h
index b5f4f2851df..f8add8fb01e 100644
--- a/src/plugins/find/ifindsupport.h
+++ b/src/plugins/find/ifindsupport.h
@@ -62,11 +62,11 @@ public:
virtual Result findIncremental(const QString &txt, FindFlags findFlags) = 0;
virtual Result findStep(const QString &txt, FindFlags findFlags) = 0;
virtual void replace(const QString &before, const QString &after,
- FindFlags findFlags) = 0;
+ FindFlags findFlags);
virtual bool replaceStep(const QString &before, const QString &after,
- FindFlags findFlags) = 0;
+ FindFlags findFlags);
virtual int replaceAll(const QString &before, const QString &after,
- FindFlags findFlags) = 0;
+ FindFlags findFlags);
virtual void defineFindScope(){}
virtual void clearFindScope(){}
diff --git a/src/plugins/find/treeviewfind.cpp b/src/plugins/find/treeviewfind.cpp
index 653bee04d18..6bea34e08df 100644
--- a/src/plugins/find/treeviewfind.cpp
+++ b/src/plugins/find/treeviewfind.cpp
@@ -131,25 +131,6 @@ IFindSupport::Result TreeViewFind::findStep(const QString &txt,
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,
Find::FindFlags findFlags,
bool startFromCurrentIndex,
diff --git a/src/plugins/find/treeviewfind.h b/src/plugins/find/treeviewfind.h
index 5c218512baa..5c6c77af8f3 100644
--- a/src/plugins/find/treeviewfind.h
+++ b/src/plugins/find/treeviewfind.h
@@ -61,12 +61,6 @@ public:
virtual void highlightAll(const QString &txt, FindFlags findFlags);
Result findIncremental(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:
Result find(const QString &txt, Find::FindFlags findFlags,
diff --git a/src/plugins/help/helpfindsupport.cpp b/src/plugins/help/helpfindsupport.cpp
index 7fa1a92790c..f2c1f191b07 100644
--- a/src/plugins/help/helpfindsupport.cpp
+++ b/src/plugins/help/helpfindsupport.cpp
@@ -46,11 +46,6 @@ HelpFindSupport::~HelpFindSupport()
{
}
-bool HelpFindSupport::isEnabled() const
-{
- return true;
-}
-
Find::FindFlags HelpFindSupport::supportedFindFlags() const
{
return Find::FindBackward | Find::FindCaseSensitively;
diff --git a/src/plugins/help/helpfindsupport.h b/src/plugins/help/helpfindsupport.h
index 9ed4cb9f2c9..01e9c3fd046 100644
--- a/src/plugins/help/helpfindsupport.h
+++ b/src/plugins/help/helpfindsupport.h
@@ -50,7 +50,6 @@ public:
HelpFindSupport(CentralWidget *centralWidget);
~HelpFindSupport();
- bool isEnabled() const;
bool supportsReplace() const { return false; }
Find::FindFlags supportedFindFlags() const;
@@ -61,12 +60,6 @@ public:
Result findIncremental(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:
bool find(const QString &ttf, Find::FindFlags findFlags, bool incremental);
@@ -80,7 +73,6 @@ class HelpViewerFindSupport : public Find::IFindSupport
public:
HelpViewerFindSupport(HelpViewer *viewer);
- bool isEnabled() const { return true; }
bool supportsReplace() const { return false; }
Find::FindFlags supportedFindFlags() const;
void resetIncrementalSearch() {}
@@ -90,12 +82,6 @@ public:
Result findIncremental(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:
bool find(const QString &ttf, Find::FindFlags findFlags, bool incremental);
--
GitLab