bool casesensitive,
bool matchword,
bool all,
- bool forward);
+ bool forward,
+ bool findnext = true);
/** 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.
* \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);
/// \param next true to find the next change, otherwise the previous
bool findChange(BufferView * bv, bool next);
-// Hopefully, nobody will ever replace with something like this
-#define LYX_FR_NULL_STRING "__LYX__F&R__NULL__STRING__"
-
class FindAndReplaceOptions {
public:
typedef enum {
S_BUFFER,
S_DOCUMENT,
S_OPEN_BUFFERS,
- /*S_ALL_MANUALS*/
+ S_ALL_MANUALS
} SearchScope;
FindAndReplaceOptions(
- docstring const & search,
+ docstring const & find_buf_name,
bool casesensitive,
bool matchword,
bool forward,
bool expandmacros,
bool ignoreformat,
- bool regexp,
- docstring const & replace,
+ docstring const & repl_buf_name,
bool keep_case,
SearchScope scope = S_BUFFER
);
FindAndReplaceOptions() { }
- docstring search;
+ docstring find_buf_name;
bool casesensitive;
bool matchword;
bool forward;
bool expandmacros;
bool ignoreformat;
- bool regexp;
- docstring replace;
+ /// This is docstring() if no replace was requested
+ docstring repl_buf_name;
bool keep_case;
SearchScope scope;
};
/// 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);