redraw fix 1.

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 5445d944d8d8d7b5993b8ccccd8e47b744dec8e2..0b9f38adb8da7375c582af25972b91a9c7512765 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -1,16 +1,11 @@
 // -*- C++ -*-
-/* This file is part of
-* ====================================================== 
-* 
-*           LyX, The Document Processor
-*       
-*           Copyright 1995 Matthias Ettrich
-*           Copyright 1995-2000 The LyX Team.
-*
-* ====================================================== */
-
-/* This is the declaration of the LyX class, there should only
- * exist _one_ instance of this in the application. */
+/**
+ * \file lyx_main.h
+ * Copyright 2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author unknown
+ */
 
 #ifndef LYX_MAIN_H
 #define LYX_MAIN_H
@@ -19,40 +14,36 @@
 #pragma interface
 #endif
 
-#include <csignal>
-
 #include "LString.h"
+
+#include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
 
-class LyXGUI;
+#include <csignal>
+
 class LyXRC;
 class LastFiles;
 class Buffer;
 class kb_keymap;
 
-///
-extern string system_lyxdir;
+ 
 ///
 extern string user_lyxdir;
 ///
+extern string system_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;
+ 
 
-/**
-  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();
+       LyX(int & argc, char * argv[]);
+
+       /// in the case of failure
+       static void emergencyCleanup();
 
-       ///
-       LyXGUI * lyxGUI;  // should be only one of this
 private:
        /// does this user start lyx for the first time?
        bool first_start;
@@ -61,7 +52,7 @@ private:
        ///
        void runtime();
        ///
-       void init(int * argc, char * argv[], bool);
+       void init(bool);
        ///
        void defaultKeyBindings(kb_keymap * kbmap);
        ///
@@ -71,15 +62,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);
+       void readLanguagesFile(string const & name);
        /// Read the encodings file `name'
-       void ReadEncodingsFile(string const & name);
-        ///
-       bool easyParse(int * argc, char * argv[]);
+       void readEncodingsFile(string const & name);
+       ///
+       bool easyParse(int & argc, char * argv[]);
 };
 
 #endif