]> git.lyx.org Git - features.git/commitdiff
Fix warning about 'requires' being a keyword.
authorRichard Kimberly Heck <rikiheck@lyx.org>
Mon, 16 Mar 2020 05:31:09 +0000 (01:31 -0400)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Thu, 18 Jun 2020 13:48:54 +0000 (15:48 +0200)
src/TextClass.cpp

index d992c5ccd2e7d30737d1614532816f34f425259d..4058815d599e25fb1f4f46e757094380726c012d 100644 (file)
@@ -1433,7 +1433,7 @@ bool TextClass::readFloat(Lexer & lexrc)
        string style;
        string type;
        string within;
-       string requires;
+       string required;
        bool usesfloat = true;
        bool ispredefined = false;
        bool allowswide = true;
@@ -1511,7 +1511,7 @@ bool TextClass::readFloat(Lexer & lexrc)
                        break;
                case FT_REQUIRES:
                        lexrc.next();
-                       requires = lexrc.getString();
+                       required = lexrc.getString();
                        break;
                case FT_PREDEFINED:
                        lexrc.next();
@@ -1563,9 +1563,9 @@ bool TextClass::readFloat(Lexer & lexrc)
                                  "not be able to produce a float list.");
                }
                Floating fl(type, placement, ext, within, style, name,
-                           listname, listcommand, refprefix, allowed_placement,
-                           htmltag, htmlattr, htmlstyle, requires, usesfloat,
-                           ispredefined, allowswide, allowssideways);
+                       listname, listcommand, refprefix, allowed_placement,
+                       htmltag, htmlattr, htmlstyle, required, usesfloat,
+                       ispredefined, allowswide, allowssideways);
                floatlist_.newFloat(fl);
                // each float has its own counter
                counters_.newCounter(from_ascii(type), from_ascii(within),