[LyX/master] Fix warning about 'requires' being a keyword.

Richard Kimberly Heck rikiheck at lyx.org
Mon Mar 16 05:14:22 UTC 2020


commit ada09a2cdac01dec141c1fd680b0a8c4f77c2237
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Mon Mar 16 01:31:09 2020 -0400

    Fix warning about 'requires' being a keyword.
---
 src/TextClass.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index d992c5c..4058815 100644
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -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),


More information about the lyx-cvs mailing list