Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 381a1674c3fd0379d02045e117312806b94c775d..c68c87185db0a8f09006adfd826bfff6ca8f3351 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -15,15 +15,20 @@
 #ifndef LYX_MAIN_H
 #define LYX_MAIN_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include <csignal>
 
 #include "LString.h"
+#include "support/utility.hpp"
 
 class LyXGUI;
 class LyXRC;
 class LastFiles;
 class Buffer;
-
+class kb_keymap;
 
 extern string system_lyxdir;
 extern string user_lyxdir;
@@ -36,7 +41,7 @@ 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 {
+class LyX : public noncopyable {
 public:
        /**@name Constructors and Deconstructors */
        //@{
@@ -52,22 +57,12 @@ public:
        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
-       //@}
-
        /**@name Private variables */
        //@{
        /// does this user start lyx for the first time?
        bool first_start;
        ///
        string batch_command;
-       ///
-       struct sigaction act_;
        //@}
        /**@name Private Members */
        //@{
@@ -76,9 +71,17 @@ private:
        ///
        void init(int * argc, char * argv[], bool);
        ///
-       void queryUserLyXDir();
+       void defaultKeyBindings(kb_keymap * kbmap);
+       ///
+       void deadKeyBindings(kb_keymap * kbmap);
        ///
-        void ReadRcFile(string const & name);
+       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[]);
        //@}