X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.h;h=c56d5ea9a72b4b4d7c542801aa6d6b911033bd3b;hb=98c966c64594611e469313314abd1e59524adb4a;hp=7279b087d3bca0426615b9e43f916bd7d7b2be1d;hpb=4b2a999762c83627476428e595d3c1e3704a3da0;p=lyx.git

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 7279b087d3..c56d5ea9a7 100644
--- 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.
 *
 * ====================================================== */
 
@@ -23,75 +23,69 @@
 
 #include "LString.h"
 
+#include <boost/smart_ptr.hpp>
+#include <boost/utility.hpp>
+
 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 */
+///
+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 {
+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... */
-	//@{
-	///
-	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 */
-	//@{
+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;
 	///
 	string batch_command;
-	/// 
-	// struct sigaction act_; // seems to be unused
-	//@}
-	/**@name Private Members */
-	//@{
 	///
 	void runtime();
 	///
-	void init(int * argc, char * argv[], bool);
+	void init(bool);
 	///
 	void defaultKeyBindings(kb_keymap * kbmap);
 	///
 	void deadKeyBindings(kb_keymap * kbmap);
 	///
 	void queryUserLyXDir(bool explicit_userdir);
-	///
-        void ReadRcFile(string const & name);
+	/** 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);
-        ///
+	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