Compil fix

[lyx.git] / src / lyxfind.h

diff --git a/src/lyxfind.h b/src/lyxfind.h
index f8a77494f05dc608ecd1ca769af763d5325b690c..2401d073ce64aeeb82c348521a733671911a4810 100644 (file)
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -55,13 +55,15 @@ docstring const replace2string(docstring const & replace,
  * The string is encoded by \c find2string.
  * \return true if the string was found.
  */
-bool find(BufferView * bv, FuncRequest const & ev);
+bool lyxfind(BufferView * bv, FuncRequest const & ev);
 
 /** 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.
+ * \return whether we did anything
  */
-void replace(BufferView * bv, FuncRequest const &, bool has_deleted = false);
+bool lyxreplace(BufferView * bv, 
+               FuncRequest const &, bool has_deleted = false);
 
 /// find the next change in the buffer
 bool findNextChange(BufferView * bv);
@@ -78,6 +80,12 @@ bool findChange(BufferView * bv, bool next);
 
 class FindAndReplaceOptions {
 public:
+       typedef enum {
+               S_BUFFER,
+               S_DOCUMENT,
+               S_OPEN_BUFFERS,
+               S_ALL_MANUALS
+       } SearchScope;
        FindAndReplaceOptions(
                docstring const & search,
                bool casesensitive,
@@ -87,7 +95,8 @@ public:
                bool ignoreformat,
                bool regexp,
                docstring const & replace,
-               bool keep_case
+               bool keep_case,
+               SearchScope scope = S_BUFFER
        );
        FindAndReplaceOptions() {  }
        docstring search;
@@ -99,6 +108,7 @@ public:
        bool regexp;
        docstring replace;
        bool keep_case;
+       SearchScope scope;
 };
 
 /// Write a FindAdvOptions instance to a stringstream
@@ -107,9 +117,6 @@ std::ostringstream & operator<<(std::ostringstream & os, lyx::FindAndReplaceOpti
 /// Read a FindAdvOptions instance from a stringstream
 std::istringstream & operator>>(std::istringstream & is, lyx::FindAndReplaceOptions & opt);
 
-/// Dispatch a LFUN_WORD_FINDADV command request
-void findAdv(BufferView * bv, FuncRequest const & ev);
-
 /// Perform a FindAdv operation.
 bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt);