ws changes only

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index af5386d7ce665989519e1440e2b07a327852f3a3..c9cdf781bf96875eccc1c651b02a82a508131a41 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -14,12 +14,10 @@
 #ifndef LYX_MAIN_H
 #define LYX_MAIN_H
 
-#include "LString.h"
-
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
 
-#include <csignal>
+#include <string>
 
 
 class ErrorItem;
@@ -51,13 +49,13 @@ private:
        /// check, set up and configure the user dir if necessary
        void queryUserLyXDir(bool explicit_userdir);
        /// read lyxrc/preferences
-       void readRcFile(string const & name);
+       void readRcFile(std::string const & name);
        /// read the given ui (menu/toolbar) file
-       void readUIFile(string const & name);
+       void readUIFile(std::string const & name);
        /// read the given languages file
-       void readLanguagesFile(string const & name);
+       void readLanguagesFile(std::string const & name);
        /// read the given encodings file
-       void readEncodingsFile(string const & name);
+       void readEncodingsFile(std::string const & name);
        /// parsing of non-gui LyX options. Returns true if gui
        bool easyParse(int & argc, char * argv[]);
        /// shows up a parsing error on screen
@@ -66,7 +64,7 @@ private:
        /// has this user started lyx for the first time?
        bool first_start;
        /// the parsed command line batch command if any
-       string batch_command;
+       std::string batch_command;
 };
 
 #endif // LYX_MAIN_H