X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.h;h=8a82caac878c06251190ea40caf07f6f871aa56f;hb=e2cd4d4c44f7c604a45dd9de9c9ade0d7c09eefc;hp=488804763862df2f9aa79b13c48ffae121079ae2;hpb=eb36b71ce3b9880a9b577f3db25d16e6a86cd338;p=lyx.git

diff --git a/src/lyxfind.h b/src/lyxfind.h
index 4888047638..8a82caac87 100644
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -7,6 +7,7 @@
  * \author Lars Gullik Bjønnes
  * \author John Levon
  * \author Jürgen Vigna
+ * \author Alfredo Braunstein
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -19,54 +20,46 @@
 #include <string>
 
 class BufferView;
+class FuncRequest;
 class LyXText;
 
 namespace lyx {
 namespace find {
 
-enum SearchResult {
-	//
-	SR_NOT_FOUND = 0,
-	//
-	SR_FOUND,
-	//
-	SR_FOUND_NOUPDATE
-};
-
-
-int replace(BufferView * bv,
-	       std::string const &, std::string const &,
-	       bool, bool = true, bool = false,
-	       bool = false, bool = false);
-
-/**
- * This function is called as a general interface to find some
- * text from the actual cursor position in whatever direction
- * we want to go. This does also update the screen.
+/** Encode the parameters needed to find \c search as a string
+ *  that can be dispatched to the LyX core in a FuncRequest wrapper.
  */
-bool find(BufferView *,
-	     std::string const & searchstr, bool forward,
-	     bool casesens = true, bool matchwrd = false);
-
-/**
- * This function does search from the cursor position inside the
- * passed LyXText parameter and regards this LyXText as the root
- * LyXText. It will NOT update any screen stuff. It will however
- * set the cursor to the new position inside LyXText, before
- * returning to the calling function.
+std::string const find2string(std::string const & search,
+			      bool casesensitive,
+			      bool matchword,
+			      bool forward);
+
+/** Encode the parameters needed to replace \c search with \c replace
+ *  as a string that can be dispatched to the LyX core in a FuncRequest
+ *  wrapper.
+ */
+std::string const replace2string(std::string const & search,
+				 std::string const & replace,
+				 bool casesensitive,
+				 bool matchword,
+				 bool all,
+				 bool forward);
+
+/** Parse the string encoding of the find request that is found in
+ *  \c ev.argument and act on it.
+ * The string is encoded by \c find2string.
  */
+void find(BufferView * bv, FuncRequest const & ev);
 
-SearchResult find(BufferView *, LyXText * text,
-		     std::string const & searchstr, bool forward,
-		     bool casesens = true, bool matchwrd = false);
+/** Parse the string encoding of the replace request that is found in
+ *  \c ev.argument and act on it.
+ * The string is encoded by \c replace2string.
+ */
+void replace(BufferView * bv, FuncRequest const &);
 
 /// find the next change in the buffer
 bool findNextChange(BufferView * bv);
 
-SearchResult findNextChange(BufferView * bv, LyXText * text, lyx::pos_type & length);
-
-SearchResult nextChange(BufferView * bv, LyXText * text, lyx::pos_type & length);
-
 } // namespace find
 } // namespace lyx