X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiSearch.h;h=b56555307456b50c33b821213939d26b62c40721;hb=72f91cb394e180419cd3ab85f710b8ad538208f9;hp=d36b33b62a183e7f4d4ea05284a4e71f2c0a6713;hpb=212386be8a1573fb52b5da718961835816a3c8e2;p=lyx.git

diff --git a/src/frontends/qt4/GuiSearch.h b/src/frontends/qt4/GuiSearch.h
index d36b33b62a..b565553074 100644
--- a/src/frontends/qt4/GuiSearch.h
+++ b/src/frontends/qt4/GuiSearch.h
@@ -5,6 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
+ * \author Angus Leeming
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,65 +13,41 @@
 #ifndef GUISEARCH_H
 #define GUISEARCH_H
 
-#include "GuiDialogView.h"
-#include "ControlSearch.h"
+#include "GuiDialog.h"
 #include "ui_SearchUi.h"
 
-#include <string>
-
-#include <QDialog>
-
 namespace lyx {
 namespace frontend {
 
-class GuiSearch;
-
-class GuiSearchDialog : public QDialog, public Ui::SearchUi {
+class GuiSearch : public GuiDialog, public Ui::SearchUi
+{
 	Q_OBJECT
+
 public:
-	GuiSearchDialog(GuiSearch * form);
+	GuiSearch(GuiView & lv);
 
-	virtual void show();
-protected Q_SLOTS:
+private Q_SLOTS:
 	void findChanged();
 	void findClicked();
 	void replaceClicked();
 	void replaceallClicked();
-protected:
-	virtual void closeEvent(QCloseEvent * e);
 
 private:
-	GuiSearch * form_;
-};
-
-
-class GuiSearch : public GuiView<GuiSearchDialog>
-{
-public:
-	///
-	friend class GuiSearchDialog;
+	void showEvent(QShowEvent * e);
 	///
-	GuiSearch(GuiDialog &);
-	/// parent controller
-	ControlSearch & controller()
-	{ return static_cast<ControlSearch &>(this->getController()); }
-	/// parent controller
-	ControlSearch const & controller() const
-	{ return static_cast<ControlSearch const &>(this->getController()); }
-private:
-	/// Apply changes
-	virtual void apply() {}
-	/// update
-	virtual void update_contents() {}
-	/// build the dialog
-	virtual void build_dialog();
-
-	void find(docstring const & str, bool casesens,
-		  bool words, bool backwards);
-
-	void replace(docstring const & findstr,
-		     docstring const & replacestr,
-		     bool casesens, bool words, bool backwards, bool all);
+	bool initialiseParams(std::string const &) { return true; }
+	void clearParams() {}
+	void dispatchParams() {}
+	bool isBufferDependent() const { return true; }
+
+	/// Searches occurence of string
+	void find(docstring const & search,
+		  bool casesensitive, bool matchword, bool forward);
+
+	/// Replaces occurence of string
+	void replace(docstring const & search, docstring const & replace,
+		     bool casesensitive, bool matchword,
+		     bool forward, bool all);
 };
 
 } // namespace frontend