fix typo that put too many include paths for most people

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index e6e1a1e01cc3e09102883513e88597883cd9237f..c56d5ea9a72b4b4d7c542801aa6d6b911033bd3b 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 /* This file is part of
-* ====================================================== 
-* 
+* ======================================================
+*
 *           LyX, The Document Processor
-*       
+*
 *           Copyright 1995 Matthias Ettrich
-*           Copyright 1995-2000 The LyX Team.
+*           Copyright 1995-2001 The LyX Team.
 *
 * ====================================================== */
 
@@ -22,6 +22,8 @@
 #include <csignal>
 
 #include "LString.h"
+
+#include <boost/smart_ptr.hpp>
 #include <boost/utility.hpp>
 
 class LyXGUI;
@@ -37,23 +39,27 @@ extern string user_lyxdir;
 ///
 extern string system_tempdir;
 ///
-extern LastFiles * lastfiles; /* we should hopefully be able to move this
-                             * inside the LyX class */
+extern boost::scoped_ptr<LastFiles> lastfiles;
+/* we should hopefully be able to move this
+ * inside the LyX class */
 
 
 /**
   This is the main LyX object it encapsulates most of the other objects.
 */
-class LyX : public boost::noncopyable {
+class LyX : boost::noncopyable {
 public:
        /// the only allowed constructor
        LyX(int * argc, char * argv[]); // constructor
        /// Always is useful a destructor
        ~LyX();
 
-       ///
-       LyXGUI * lyxGUI;  // should be only one of this
+       /// in the case of failure
+       static void emergencyCleanup();
+
 private:
+       /// Should be a maximum of 1 LyXGUI.
+       boost::scoped_ptr<LyXGUI> lyxGUI;
        /// does this user start lyx for the first time?
        bool first_start;
        ///
@@ -61,7 +67,7 @@ private:
        ///
        void runtime();
        ///
-       void init(int * argc, char * argv[], bool);
+       void init(bool);
        ///
        void defaultKeyBindings(kb_keymap * kbmap);
        ///
@@ -71,14 +77,14 @@ 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 ReadLangugesFile(string const & name);
+       void readLanguagesFile(string const & name);
        /// Read the encodings file `name'
-       void ReadEncodingsFile(string const & name);
-        ///
+       void readEncodingsFile(string const & name);
+       ///
        bool easyParse(int * argc, char * argv[]);
 };