more changes, read the Changelog

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index fed78555dc6685617919023d4f38bad7b69e1204..7eec3c242fb2c7c75381b647410e836b67c298e1 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -16,14 +16,9 @@
 #pragma interface
 #endif
 
-#include <map>
-
 #include "ToolbarDefaults.h"
 #include "bufferparams.h"
 
-using std::ostream;
-using std::map;
-
 /// This contains the runtime configuration of LyX
 class LyXRC {
 public:
@@ -37,7 +32,7 @@ public:
        ///
         void print() const;
        ///
-       void output(ostream & os) const;
+       void output(std::ostream & os) const;
        /// Is a bind file already (or currently) read?
        bool hasBindFile;
        ///
@@ -45,6 +40,8 @@ public:
        ///
        ToolbarDefaults toolbardefaults;
        ///
+       string bind_file;
+       ///
        string printer;
        ///
        string print_command;
@@ -149,6 +146,8 @@ public:
        bool use_scalable_fonts;
        /// DPI of monitor
        float dpi;
+       /// Whether lyx should handle deadkeys by itself
+       bool override_x_deadkeys;
        ///
        string fontenc;
        ///
@@ -222,7 +221,9 @@ public:
        ///
        bool rtl_support;
        ///
-       string auto_mathmode;
+       bool auto_number;
+       ///
+       bool mark_foreign_language;
        ///
        bool show_banner;
        /// Do we have to use a GUI?
@@ -239,13 +240,6 @@ public:
        string docbook_to_html_command;
        ///
        string docbook_to_pdf_command;
-       ///
-       typedef map<string, int> Bindings;
-       ///
-       Bindings bindings;
-private:
-       ///
-       void defaultKeyBindings();
 };
 
 extern LyXRC lyxrc;