more changes, read the Changelog

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 668e5dd7e907e1e4f7165a7ffd63ff6925415ead..c992dfc80aa9276034194f401fe4968db0735370 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -4,8 +4,8 @@
 * 
 *           LyX, The Document Processor
 *       
-*          Copyright (C) 1995 1996 Matthias Ettrich
-*           and the LyX Team.
+*           Copyright 1995 Matthias Ettrich
+*           Copyright 1995-2000 The LyX Team.
 *
 * ====================================================== */
 
@@ -23,28 +23,25 @@ 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
+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.
 */
-class LyX
-{
+class LyX {
 public:
        /**@name Constructors and Deconstructors */
        //@{
        /// the only allowed constructor
-       LyX(int *argc, char *argv[]); // constructor
+       LyX(int * argc, char * argv[]); // constructor
        // Always is useful a destructor
        ~LyX();
        //@}
@@ -52,15 +49,15 @@ public:
        /**@name Pointers to... */
        //@{
        ///
-       LyXGUI *lyxGUI;  // should be only one of this
+       LyXGUI * lyxGUI;  // should be only one of this
        //@}
 private:
        /**@name Constructors and Deconstructors */
        //@{
        /// not allowed
-       LyX(const LyX &){;} // not allowed
+       LyX(const LyX &) {} // not allowed
        /// not allowed
-       LyX(){;} // not allowed
+       LyX() {} // not allowed
        //@}
 
        /**@name Private variables */
@@ -68,23 +65,27 @@ private:
        /// does this user start lyx for the first time?
        bool first_start;
        ///
-       struct sigaction act_;
+       string batch_command;
+       /// 
+       // 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 queryUserLyXDir();
+       void deadKeyBindings(kb_keymap * kbmap);
+       ///
+       void queryUserLyXDir(bool explicit_userdir);
        ///
         void ReadRcFile(string const & name);
         ///
-       bool easyParse(int *argc, char *argv[]);
+       bool easyParse(int * argc, char * argv[]);
        //@}
 };
 
 #endif
-
-