ws changes only

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 21e7b7d6f692d1076b5a8e5fc47619c97fceeded..c9cdf781bf96875eccc1c651b02a82a508131a41 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -1,24 +1,26 @@
 // -*- C++ -*-
 /**
  * \file lyx_main.h
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYX_MAIN_H
 #define LYX_MAIN_H
 
-#include "LString.h"
-#include "errorlist.h"
-
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
 
-#include <csignal>
+#include <string>
 
 
+class ErrorItem;
 class LyXRC;
 class LastFiles;
 class Buffer;
@@ -47,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
@@ -62,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