Fix small bug in reading \set_color in lyxrc

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 3730881715646e295f78e5c4a3f11abdd986f464..ef58c2bcf1ea1e7813871ae8f9e7783e56349700 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -1,48 +1,51 @@
 // -*- C++ -*-
 /* This file is part of
-* ======================================================
+* ====================================================== 
 * 
 *           LyX, The Document Processor
 *       
-*          Copyright (C) 1995 1996 Matthias Ettrich
-*           and the LyX Team.
+*           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. */
 
-#ifndef _LYX_MAIN_H_
-#define _LYX_MAIN_H_
+#ifndef LYX_MAIN_H
+#define LYX_MAIN_H
 
-#include <signal.h>
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include <csignal>
+
+#include "LString.h"
 
 class LyXGUI;
 class LyXRC;
 class LastFiles;
 class Buffer;
-class LString;
+class kb_keymap;
 
-extern LString system_lyxdir;
-extern LString user_lyxdir;
-extern LString system_tempdir;
+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();
        //@}
@@ -50,15 +53,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 */
@@ -66,23 +69,31 @@ 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 queryUserLyXDir();
+       void defaultKeyBindings(kb_keymap * kbmap);
        ///
-        void ReadRcFile(LString const & name);
+       void deadKeyBindings(kb_keymap * kbmap);
+       ///
+       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[]);
+       bool easyParse(int * argc, char * argv[]);
        //@}
 };
 
 #endif
-
-