From: Tommaso Cucinotta <tommaso@lyx.org>
Date: Mon, 7 Feb 2011 23:55:02 +0000 (+0000)
Subject: Completing r37549.
X-Git-Tag: 2.0.0~830
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7500590c89fd0fb4e90844300fb1f5f6ce46339a;p=features.git

Completing r37549.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37556 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/lyxfind.h b/src/lyxfind.h
index 2401d073ce..da632bf1a3 100644
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -75,9 +75,6 @@ bool findPreviousChange(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 {
@@ -87,26 +84,25 @@ public:
 		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;
 };