X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fminibuffer.h;h=7c214d6f28f8b4cee5c35c68790d3d2e2ecead63;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=495b0047e4825f5679d0d817a4ac826cf0444566;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/minibuffer.h b/src/minibuffer.h
index 495b0047e4..7c214d6f28 100644
--- a/src/minibuffer.h
+++ b/src/minibuffer.h
@@ -31,12 +31,12 @@ public:
 		fl_set_timer(timer, a);
 	}
 	///
-	void Set(LString const& = LString(),
-		 LString const& = LString(),
-		 LString const& = LString(),
+	void Set(string const& = string(),
+		 string const& = string(),
+		 string const& = string(),
 		 int delay_secs=6);
 	/// 
-	LString GetText() const { return text; }
+	string GetText() const { return text; }
 	///
 	void Init();
 	///
@@ -51,15 +51,6 @@ public:
 	void Activate();
 	///
 	void Deactivate();
-private:
-	///
-	LyXView *owner;
-	///
-	LString text;
-	///
-	LString text_stored;
-	///
-	FL_OBJECT *add(int, FL_Coord, FL_Coord, FL_Coord, FL_Coord);
 	///
 	static void ExecutingCB(FL_OBJECT *ob, long);
 	///
@@ -67,20 +58,29 @@ private:
 	///
         static int  peek_event(FL_OBJECT *, int, FL_Coord, FL_Coord,
 			       int, void *);
+private:
+	///
+	LyXView *owner;
+	///
+	string text;
+	///
+	string text_stored;
+	///
+	FL_OBJECT *add(int, FL_Coord, FL_Coord, FL_Coord, FL_Coord);
         ///
 	FL_OBJECT *timer;
 	///
 	FL_OBJECT *the_buffer;
 	///
-	LString cur_cmd;
+	string cur_cmd;
         ///
         enum{ MAX_HISTORY = 10 };
         ///
-        LString history[MAX_HISTORY];
+        string history[MAX_HISTORY];
         ///
         int history_idx, history_cnt;
         ///
-        void addHistory(LString const &cmd) { 
+        void addHistory(string const &cmd) { 
 	        if (history_cnt==0 || (history_cnt>0 && cmd!=history[(history_cnt-1) % MAX_HISTORY])) {
 		    history[history_cnt % MAX_HISTORY] = cmd;
 		    history_cnt++;
@@ -88,6 +88,6 @@ private:
 	        history_idx = history_cnt;
 	}
         ///
-        LString getHistory() { return history[history_idx % MAX_HISTORY]; }
+        string getHistory() { return history[history_idx % MAX_HISTORY]; }
 };
 #endif