whitespace changes;

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index c68c87185db0a8f09006adfd826bfff6ca8f3351..fa48772a789357ed63daff3e82bb8db3c76e9993 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -5,7 +5,7 @@
 *           LyX, The Document Processor
 *       
 *           Copyright 1995 Matthias Ettrich
-*           Copyright 1995-2000 The LyX Team.
+*           Copyright 1995-2001 The LyX Team.
 *
 * ====================================================== */
 
@@ -22,7 +22,7 @@
 #include <csignal>
 
 #include "LString.h"
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
 
 class LyXGUI;
 class LyXRC;
@@ -30,10 +30,13 @@ class LastFiles;
 class Buffer;
 class kb_keymap;
 
+///
 extern string system_lyxdir;
+///
 extern string user_lyxdir;
+///
 extern string system_tempdir;
-
+///
 extern LastFiles * lastfiles; /* we should hopefully be able to move this
                              * inside the LyX class */
 
@@ -41,35 +44,27 @@ extern LastFiles * lastfiles; /* we should hopefully be able to move this
 /**
   This is the main LyX object it encapsulates most of the other objects.
 */
-class LyX : public noncopyable {
+class LyX : boost::noncopyable {
 public:
-       /**@name Constructors and Deconstructors */
-       //@{
        /// the only allowed constructor
        LyX(int * argc, char * argv[]); // constructor
-       // Always is useful a destructor
+       /// Always is useful a destructor
        ~LyX();
-       //@}
 
-       /**@name Pointers to... */
-       //@{
+       /// in the case of failure
+       static void emergencyCleanup();
+ 
        ///
        LyXGUI * lyxGUI;  // should be only one of this
-       //@}
 private:
-       /**@name Private variables */
-       //@{
        /// does this user start lyx for the first time?
        bool first_start;
        ///
        string batch_command;
-       //@}
-       /**@name Private Members */
-       //@{
        ///
        void runtime();
        ///
-       void init(int * argc, char * argv[], bool);
+       void init(bool);
        ///
        void defaultKeyBindings(kb_keymap * kbmap);
        ///
@@ -79,12 +74,15 @@ private:
        /** Search for and read the LyXRC file name, return
            true if successfull.
        */
-        bool ReadRcFile(string const & name);
+        bool readRcFile(string const & name);
        /// Read the ui file `name'
-       void ReadUIFile(string const & name);
+       void readUIFile(string const & name);
+       /// Read the languages file `name'
+       void readLanguagesFile(string const & name);
+       /// Read the encodings file `name'
+       void readEncodingsFile(string const & name);
         ///
        bool easyParse(int * argc, char * argv[]);
-       //@}
 };
 
 #endif