more changes, read the Changelog

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index b495b41ced1271e7efa4a76a53eb2114939ee2bd..c992dfc80aa9276034194f401fe4968db0735370 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -23,7 +23,7 @@ class LyXGUI;
 class LyXRC;
 class LastFiles;
 class Buffer;
-
+class kb_keymap;
 
 extern string system_lyxdir;
 extern string user_lyxdir;
@@ -32,8 +32,6 @@ extern string system_tempdir;
 extern LastFiles * lastfiles; /* we should hopefully be able to move this
                              * inside the LyX class */
 
-extern LyXRC * lyxrc;
-
 
 /**
   This is the main LyX object it encapsulates most of the other objects.
@@ -68,17 +66,21 @@ private:
        bool first_start;
        ///
        string batch_command;
-       ///
-       struct sigaction act_;
+       /// 
+       // struct sigaction act_; // seems to be unused
        //@}
        /**@name Private Members */
        //@{
        ///
        void runtime();
        ///
-       void init(int * argc, char * argv[]);
+       void init(int * argc, char * argv[], bool);
+       ///
+       void defaultKeyBindings(kb_keymap * kbmap);
+       ///
+       void deadKeyBindings(kb_keymap * kbmap);
        ///
-       void queryUserLyXDir();
+       void queryUserLyXDir(bool explicit_userdir);
        ///
         void ReadRcFile(string const & name);
         ///