Add support for compilers which do not have cname headers

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 1e4c37cdb2277d0bb2fb8a02dcbb23ebe79cf5ab..b381cab55799c71c7f7ffc5c9dd45b92e768c6ce 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
-#ifndef _LYXFUNC_H_
-#define _LYXFUNC_H_
+#ifndef LYXFUNC_H
+#define LYXFUNC_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -14,7 +14,6 @@
 #include "LString.h"
 class LyXView;
 
-
 /** This class encapsulates all the LyX command operations. 
     This is the class of the LyX's "high level event handler".
     Every user command is processed here, either invocated from
@@ -29,10 +28,10 @@ public:
        ~LyXFunc();
     
        /// LyX distpatcher, executes lyx actions.
-       LString Dispatch(int action, char const* arg = 0);
+       string Dispatch(int action, char const* arg = 0);
                         
        /// The same but uses the name of a lyx command.
-       LString Dispatch(LString const &cmd, LString const &arg = LString());
+       string Dispatch(string const &cmd, string const &arg = string());
 
        
        /// A keyboard event is processed to execute a lyx action. 
@@ -43,13 +42,13 @@ public:
 
        // These can't be global because are part of the internat state (ale970227)
        /// Get the current keyseq string
-       LString keyseqStr(int l=190);
+       string keyseqStr(int l=190);
 
        /// Is the key sequence uncomplete?
        bool keyseqUncomplete();
 
        /// get options for the current keyseq
-       LString keyseqOptions(int l=190);
+       string keyseqOptions(int l=190);
 
        /// Returns the name of a funcion given a keyseq
        char const* getFunc(char*) 
@@ -62,11 +61,11 @@ public:
         /// True if lyxfunc reports an error
         bool errorStat() const { return errorstat; }
         /// Buffer to store result messages
-        void setMessage(LString const &m);
+        void setMessage(string const &m);
         /// Buffer to store result messages
-        void setErrorMessage(LString const &); 
+        void setErrorMessage(string const &); 
         /// Buffer to store result messages
-        LString getMessage() const { return dispatch_buffer; }
+        string getMessage() const { return dispatch_buffer; }
         /// Get next inset of this class from current cursor position  
         Inset* getInsetByCode(Inset::Code);
        
@@ -75,7 +74,7 @@ public:
 
 private:
        ///
-       LString argAsString(char const *const argument);
+       string argAsString(char const *const argument);
        ///
        LyXView *owner;
        ///
@@ -104,9 +103,9 @@ private:
         /** Buffer to store messages and result data. Is there a
          good reason to have this one as static in Dispatch? (Ale)
          */
-        LString dispatch_buffer;
+        string dispatch_buffer;
        /// Command name and shortcut information
-       LString commandshortcut;
+       string commandshortcut;
 
        // I think the following should be moved to BufferView. (Asger)
 
@@ -123,7 +122,7 @@ private:
        void doImportASCII(bool);
 
        ///
-       void MenuInsertLyXFile(LString const &);
+       void MenuInsertLyXFile(string const &);
 
        ///
        void CloseBuffer();
@@ -144,21 +143,21 @@ bool LyXFunc::wasMetaKey()
      
 
 inline
-LString LyXFunc::keyseqStr(int l)
+string LyXFunc::keyseqStr(int l)
 {
        char text[200];
        keyseq.print(text, l, true);
-       LString tmp(text);
+       string tmp(text);
        return tmp;
 } 
 
 
 inline
-LString LyXFunc::keyseqOptions(int l)
+string LyXFunc::keyseqOptions(int l)
 {
        char text[200];
        keyseq.printOptions(text, l);
-       LString tmp(text);
+       string tmp(text);
        return tmp;
 }