Fix bug #10918.

[features.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 654468e957fd0cca0e556bed1e7ab6f97b17934e..f0f82622f70357d03745b597e8012bc055fe670f 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -59,7 +59,7 @@ namespace {
 
 // The format should also be updated in configure.py, and conversion code
 // should be added to prefs2prefs_prefs.py.
-static unsigned int const LYXRC_FILEFORMAT = 25; // spitz: rename collapsible
+static unsigned int const LYXRC_FILEFORMAT = 25; // lasgouttes: remove qimage
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {
@@ -430,7 +430,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                return ReadError;
 
        // format prior to 2.0 and introduction of format tag
-       unsigned int format = 0;
+       unsigned int rc_format = 0;
 
        while (lexrc.isOK()) {
                // By using two switches we take advantage of the compiler
@@ -453,7 +453,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                switch (static_cast<LyXRCTags>(le)) {
                case RC_LYXRCFORMAT:
                        if (lexrc.next())
-                               format = lexrc.getInteger();
+                               rc_format = lexrc.getInteger();
                        break;
                case RC_INPUT: // Include file
                        if (lexrc.next()) {
@@ -1232,7 +1232,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 
                // This is triggered the first time through the loop unless
                // we hit a format tag.
-               if (check_format && format != LYXRC_FILEFORMAT)
+               if (check_format && rc_format != LYXRC_FILEFORMAT)
                        return FormatMismatch;
        }