Point fix, earlier forgotten

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index ef58c2bcf1ea1e7813871ae8f9e7783e56349700..0c1fc0b462cb11a813f471c10f415615ef25b358 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -1,99 +1,72 @@
 // -*- 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
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \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
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include "LString.h"
+#include "errorlist.h"
+
+#include <boost/scoped_ptr.hpp>
+#include <boost/utility.hpp>
 
 #include <csignal>
 
-#include "LString.h"
 
-class LyXGUI;
 class LyXRC;
 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 */
+/// last files loaded
+extern boost::scoped_ptr<LastFiles> lastfiles;
 
 
-/**
-  This is the main LyX object it encapsulates most of the other objects.
-*/
-class LyX {
+/// initial startup
+class LyX : boost::noncopyable {
 public:
-       /**@name Constructors and Deconstructors */
-       //@{
-       /// the only allowed constructor
-       LyX(int * argc, char * argv[]); // constructor
-       // Always is useful a destructor
-       ~LyX();
-       //@}
+       LyX(int & argc, char * argv[]);
 
-       /**@name Pointers to... */
-       //@{
-       ///
-       LyXGUI * lyxGUI;  // should be only one of this
-       //@}
-private:
-       /**@name Constructors and Deconstructors */
-       //@{
-       /// not allowed
-       LyX(const LyX &) {} // not allowed
-       /// not allowed
-       LyX() {} // not allowed
-       //@}
+       /// in the case of failure
+       static void emergencyCleanup();
 
-       /**@name Private variables */
-       //@{
-       /// does this user start lyx for the first time?
-       bool first_start;
-       ///
-       string batch_command;
-       /// 
-       // struct sigaction act_; // seems to be unused
-       //@}
-       /**@name Private Members */
-       //@{
-       ///
-       void runtime();
-       ///
-       void init(int * argc, char * argv[], bool);
-       ///
+private:
+       /// initial LyX set up
+       void init(bool);
+       /// set up the default key bindings
        void defaultKeyBindings(kb_keymap * kbmap);
-       ///
+       /// set up the default dead key bindings if requested
        void deadKeyBindings(kb_keymap * kbmap);
-       ///
+       /// check, set up and configure the user dir if necessary
        void queryUserLyXDir(bool explicit_userdir);
-       /** Search for and read the LyXRC file name, return
-           true if successfull.
-       */
-        bool ReadRcFile(string const & name);
-       /// Read the ui file `name'
-       void ReadUIFile(string const & name);
-        ///
-       bool easyParse(int * argc, char * argv[]);
-       //@}
+       /// read lyxrc/preferences
+       void readRcFile(string const & name);
+       /// read the given ui (menu/toolbar) file
+       void readUIFile(string const & name);
+       /// read the given languages file
+       void readLanguagesFile(string const & name);
+       /// read the given encodings file
+       void readEncodingsFile(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
+       void printError(ErrorItem const &);
+
+       /// has this user started lyx for the first time?
+       bool first_start;
+       /// the parsed command line batch command if any
+       string batch_command;
 };
 
-#endif
+#endif // LYX_MAIN_H