Point fix, earlier forgotten

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 532f00a6c427b9f2c979e44aec5842e35f997790..26fcafeb21994ec7b8153ab3cc7d0279703e9bac 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -4,13 +4,21 @@
  * 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öntiz
+ * \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>
@@ -65,7 +73,6 @@ enum LyXRCTags {
        RC_LASTFILES,
        RC_AUTOREGIONDELETE,
        RC_AUTORESET_OPTIONS,
-       RC_BIND,
        RC_SERVERPIPE,
        RC_INPUT,
        RC_BINDFILE,
@@ -118,9 +125,7 @@ enum LyXRCTags {
        RC_PREVIEW,
        RC_PREVIEW_HASHED_LABELS,
        RC_PREVIEW_SCALE_FACTOR,
-#ifdef USE_PSPELL
-       RC_USE_PSPELL,
-#endif
+       RC_USE_SPELL_LIB,
        RC_USER_NAME,
        RC_USER_EMAIL,
        RC_LAST
@@ -134,8 +139,6 @@ enum LyXRCTags {
        ///
        int read(string const & filename);
        ///
-       void readBindFileIfNeeded();
-       ///
        void write(string const & filename) const;
        ///
        void print() const;
@@ -187,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;
        ///
@@ -280,10 +281,9 @@ enum LyXRCTags {
        string ascii_roff_command;
        ///
        unsigned int ascii_linelen;
+       /// use library instead of process
+       bool use_spell_lib;
        /// Ispell command
-#ifdef USE_PSPELL
-       bool use_pspell;
-#endif
        string isp_command;
        /// Accept compound words in spellchecker?
        bool isp_accept_compound;
@@ -333,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;
        ///
@@ -344,7 +342,7 @@ enum LyXRCTags {
        ///
        int label_init_length;
        ///
-       grfx::DisplayType display_graphics;
+       lyx::graphics::DisplayType display_graphics;
        ///
        bool show_banner;
        ///
@@ -357,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);
 };
 
 ///