cmake: remove 2.8 warning

[lyx.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 86a62919199e5068a0194b7a5ffaeec54299fa3a..20daf4ac2059d1647f9c0437da16bdb5fc00d1f7 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -113,6 +113,7 @@ LexerKeyword lyxrcTags[] = {
        { "\\group_layouts", LyXRC::RC_GROUP_LAYOUTS },
        { "\\gui_language", LyXRC::RC_GUI_LANGUAGE },
        { "\\hunspelldir_path", LyXRC::RC_HUNSPELLDIR_PATH },
+       { "\\icon_set", LyXRC::RC_ICON_SET },
        { "\\index_alternatives", LyXRC::RC_INDEX_ALTERNATIVES },
        { "\\index_command", LyXRC::RC_INDEX_COMMAND },
        { "\\input", LyXRC::RC_INPUT },
@@ -222,6 +223,7 @@ LyXRC::LyXRC()
 
 void LyXRC::setDefaults()
 {
+       icon_set = string();
        bind_file = "cua";
        def_file = "default";
        ui_file = "default";
@@ -829,6 +831,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                        lexrc >> check_lastfiles;
                        break;
 
+               case RC_ICON_SET:
+                       lexrc >> icon_set;
+                       break;
+
                case RC_SCREEN_FONT_ROMAN:
                        if (lexrc.next()) {
                                roman_font_name = lexrc.getString();
@@ -1133,7 +1139,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                }
                case RC_EDITOR_ALTERNATIVES:  {
                        string format, command;
-                       lexrc >> format >> command;
+                       if (lexrc.next())
+                               format = lexrc.getString();
+                       if (lexrc.eatLine())
+                               command = lexrc.getString();
                        editor_alternatives[format].insert(command);
                        break;
                }
@@ -1729,6 +1738,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                   << "# SCREEN & FONTS SECTION ############################\n"
                   << "#\n\n";
 
+       case RC_ICON_SET:
+               if (ignore_system_lyxrc ||
+                   icon_set != system_lyxrc.icon_set) {
+                       os << "\\icon_set \"" << icon_set
+                          << "\"\n";
+               }
+               if (tag != RC_LAST)
+                       break;
+
        case RC_SCREEN_DPI:
                if (ignore_system_lyxrc ||
                    dpi != system_lyxrc.dpi) {
@@ -2919,6 +2937,10 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_FILEFORMAT:
        case LyXRC::RC_GROUP_LAYOUTS:
        case LyXRC::RC_HUNSPELLDIR_PATH:
+       case LyXRC::RC_ICON_SET:
+               if (lyxrc_orig.icon_set != lyxrc_new.icon_set) {
+                       lyxrc.icon_set = lyxrc_new.icon_set;
+               }
        case LyXRC::RC_INDEX_ALTERNATIVES:
        case LyXRC::RC_INDEX_COMMAND:
        case LyXRC::RC_JBIBTEX_COMMAND: