Squash gcc warn

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index b80b08b778e60a563e7a368b52d9592592cadb7f..af28ce0129a2cfe53c35786b69bfa2d5812790b5 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -22,6 +22,7 @@
 
 #include "support/strfwd.h"
 
+#include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ -154,6 +155,7 @@ public:
                RC_SERVERPIPE,
                RC_SET_COLOR,
                RC_SHOW_BANNER,
+               RC_SINGLE_CLOSE_TAB_BUTTON,
                RC_SORT_LAYOUTS,
                RC_SPELL_COMMAND,
                RC_SPELLCHECK_CONTINUOUSLY,
@@ -196,6 +198,11 @@ private:
        ///
        int read(Lexer &);
 public:
+       /// 
+       typedef std::set<std::string> CommandSet;
+       /// maps a format to a set of commands that can be used to 
+       /// edit or view it.
+       typedef std::map<std::string, CommandSet> Alternatives;
        ///
        void write(support::FileName const & filename,
                   bool ignore_system_lyxrc) const;
@@ -256,13 +263,13 @@ public:
        /// command to run chktex incl. options
        std::string chktex_command;
        /// all available commands to run bibtex incl. options
-       std::set<std::string> bibtex_alternatives;
+       CommandSet bibtex_alternatives;
        /// command to run bibtex incl. options
        std::string bibtex_command;
        /// command to run japanese bibtex incl. options
        std::string jbibtex_command;
        /// all available index commands incl. options
-       std::set<std::string> index_alternatives;
+       CommandSet index_alternatives;
        /// command to run makeindex incl. options or other index programs
        std::string index_command;
        /// command to run japanese index program incl. options
@@ -387,9 +394,9 @@ public:
        ///
        std::string default_view_format;
        /// all available viewers
-       std::vector<std::pair<std::string, std::string> > viewer_alternatives;
+       Alternatives viewer_alternatives;
        /// all available editors
-       std::vector<std::pair<std::string, std::string> > editor_alternatives;
+       Alternatives editor_alternatives;
        ///
        bool mac_like_word_movement;
        ///
@@ -478,6 +485,8 @@ public:
        bool completion_popup_after_complete;
        ///
        bool open_buffers_in_tabs;
+       ///
+       bool single_close_tab_button;
 };
 
 
@@ -492,6 +501,7 @@ public:
        operator LyXRC::PreviewStatus() const { return val_; }
 };
 
+void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new);
 
 ///
 extern LyXRC lyxrc;