white-space changes, removed definitions.h several enum changes because of this,...

[lyx.git] / src / minibuffer.h

diff --git a/src/minibuffer.h b/src/minibuffer.h
index 495b0047e4825f5679d0d817a4ac826cf0444566..8ec74a6f7fc1e10adaeaf72295a95a760ad4c6b0 100644 (file)
--- a/src/minibuffer.h
+++ b/src/minibuffer.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
-#ifndef _MINIBUFFER_H
-#define _MINIBUFFER_H
+#ifndef MINIBUFFER_H
+#define MINIBUFFER_H
 
 #include FORMS_H_LOCATION
 #include "LString.h"
@@ -31,12 +31,12 @@ public:
                fl_set_timer(timer, a);
        }
        ///
-       void Set(LString const& = LString(),
-                LString const& = LString(),
-                LString const& = LString(),
-                int delay_secs=6);
+       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,27 +58,36 @@ 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) { 
-               if (history_cnt==0 || (history_cnt>0 && cmd!=history[(history_cnt-1) % MAX_HISTORY])) {
+        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++;
                }
                history_idx = history_cnt;
        }
         ///
-        LString getHistory() { return history[history_idx % MAX_HISTORY]; }
+        string getHistory() { return history[history_idx % MAX_HISTORY]; }
 };
 #endif