Correct Andr�'s name

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 406a26d493e9928f97ecbe5f458093f13bcb68ff..4e6b8b2e82380c9491f99184949a223d71f9aede 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -4,16 +4,24 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * Full author contact details are available in file CREDITS
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Allan Rae
+ * \author Dekel Tsur
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYXRC_H
 #define LYXRC_H
 
-#include "bufferparams.h" // Just to get the enum BufferParams::PAPER_SIZE (sic)
+#include "paper.h"
 #include "graphics/GraphicsTypes.h"
 
-// #include <boost/utility.hpp>
+#include "support/std_string.h"
 
 /// This contains the runtime configuration of LyX
 class LyXRC //: public noncopyable {
@@ -65,7 +73,6 @@ enum LyXRCTags {
        RC_LASTFILES,
        RC_AUTOREGIONDELETE,
        RC_AUTORESET_OPTIONS,
-       RC_BIND,
        RC_SERVERPIPE,
        RC_INPUT,
        RC_BINDFILE,
@@ -132,8 +139,6 @@ enum LyXRCTags {
        ///
        int read(string const & filename);
        ///
-       void readBindFileIfNeeded();
-       ///
        void write(string const & filename) const;
        ///
        void print() const;
@@ -185,14 +190,12 @@ enum LyXRCTags {
        string custom_export_command;
        ///
        string custom_export_format;
-       ///
-       bool pdf_mode;
        /// postscript interpreter (in general "gs", if it is installed)
        string ps_command;
        /// option for telling the dvi viewer about the paper size
        string view_dvi_paper_option;
        /// default paper size for local xdvi/dvips/ghostview/whatever
-       BufferParams::PAPER_SIZE default_papersize;
+       PAPER_SIZE default_papersize;
        /// command to run chktex incl. options
        string chktex_command;
        ///
@@ -330,8 +333,6 @@ enum LyXRCTags {
        bool auto_number;
        ///
        bool mark_foreign_language;
-       /// Do we have to use a GUI?
-       bool use_gui;
        ///
        string default_language;
        ///
@@ -341,7 +342,7 @@ enum LyXRCTags {
        ///
        int label_init_length;
        ///
-       grfx::DisplayType display_graphics;
+       lyx::graphics::DisplayType display_graphics;
        ///
        bool show_banner;
        ///
@@ -354,12 +355,6 @@ enum LyXRCTags {
        string user_name;
        /// user email
        string user_email;
-
-private:
-       /// Is a bind file already (or currently) read?
-       bool hasBindFile;
-       ///
-       int ReadBindFile(string const & name);
 };
 
 ///