X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcommand.C;h=cb40f395ea2c273ce5f86dce0795a15219caf33b;hb=b922cdd796f9e4b9a46a79808cdee596e04903eb;hp=0c893240880ad0a74a6b4fa045e6fa3de774e214;hpb=7521b5d20f42102cf444e3fd8718a088a60d0098;p=lyx.git

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 0c89324088..cb40f395ea 100644
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -66,8 +66,8 @@ void InsetCommandParams::setFromString( string const & b )
 
 bool InsetCommandParams::operator==(InsetCommandParams const & o) const
 {
-	if (cmdname == o.cmdname && contents == o.contents && options == o.options) return true;
-	return false;
+	return cmdname == o.cmdname && contents == o.contents
+		&& options == o.options;
 }
 
 
@@ -144,14 +144,16 @@ void InsetCommandParams::read(LyXLex & lex)
 {    
 	string token;
 
-	if (lex.EatLine()) {
-		token = lex.GetString();
+	if (lex.eatLine()) {
+		token = lex.getString();
 		scanCommand(token);
-	} else
+	} else {
 		lex.printError("InsetCommand: Parse error: `$$Token'");
-	while (lex.IsOK()) {
+	}
+	
+	while (lex.isOK()) {
 		lex.nextToken();
-		token = lex.GetString();
+		token = lex.getString();
 		if (token == "\\end_inset")
 			break;
 	}
@@ -180,8 +182,7 @@ string const InsetCommandParams::getCommand() const
 
 InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
 	: p_( p.getCmdName(), p.getContents(), p.getOptions() )
-{
-}
+{}
 
 
 void InsetCommand::setParams(InsetCommandParams const & p )
@@ -212,7 +213,7 @@ int InsetCommand::linuxdoc(Buffer const *, ostream &) const
 }
 
 
-int InsetCommand::docBook(Buffer const *, ostream &) const
+int InsetCommand::docbook(Buffer const *, ostream &) const
 {
 	return 0;
 }