Kornel's gcc compile fix.

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index afb0dfb2af27ee08d2bda8b2fa5b0a929542ab91..337fb71ada7fe629f704ef184bfe09b14b5dd22c 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -24,6 +24,7 @@
 
 #include <set>
 #include <string>
+#include <vector>
 
 
 namespace lyx {
@@ -71,6 +72,7 @@ public:
                RC_DIALOGS_ICONIFY_WITH_MAIN,
                RC_DISPLAY_GRAPHICS,
                RC_DOCUMENTPATH,
+               RC_EDITOR_ALTERNATIVES,
                RC_ESC_CHARS,
                RC_EXAMPLEPATH,
                RC_FONT_ENCODING,
@@ -177,6 +179,7 @@ public:
                RC_USE_SPELL_LIB,
                RC_VIEWDVI_PAPEROPTION,
                RC_VIEWER,
+               RC_VIEWER_ALTERNATIVES,
                RC_VISUAL_CURSOR,
                RC_LAST
        };
@@ -383,6 +386,10 @@ public:
        std::string gui_language;
        ///
        std::string default_view_format;
+       /// all available viewers
+       std::vector<std::pair<std::string, std::string> > viewer_alternatives;
+       /// all available editors
+       std::vector<std::pair<std::string, std::string> > editor_alternatives;
        ///
        bool mac_like_word_movement;
        ///
@@ -416,7 +423,7 @@ public:
        ///
        bool preview_hashed_labels;
        ///
-       std::string preview_scale_factor;
+       double preview_scale_factor;
        /// user name
        std::string user_name;
        /// user email
@@ -485,6 +492,7 @@ public:
        operator LyXRC::PreviewStatus() const { return val_; }
 };
 
+void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new);
 
 ///
 extern LyXRC lyxrc;