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

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index b795f3140d..cb40f395ea 100644
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -17,6 +17,7 @@
 #include "insetcommand.h"
 #include "debug.h"
 #include "Painter.h"
+#include "lyxlex.h"
 
 using std::ostream;
 using std::endl;
@@ -65,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;
 }
 
 
@@ -139,18 +140,20 @@ void InsetCommandParams::scanCommand(string const & cmd)
 
 
 // This function will not be necessary when lyx3
-void InsetCommandParams::Read(LyXLex & lex)
+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;
 	}
@@ -161,7 +164,7 @@ void InsetCommandParams::Read(LyXLex & lex)
 }
 
 
-void InsetCommandParams::Write(ostream & os) const
+void InsetCommandParams::write(ostream & os) const
 {
 	os << "LatexCommand " << getCommand() << "\n";
 }
@@ -177,7 +180,7 @@ string const InsetCommandParams::getCommand() const
 }
 
 
-InsetCommand::InsetCommand( InsetCommandParams const & p )
+InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
 	: p_( p.getCmdName(), p.getContents(), p.getOptions() )
 {}
 
@@ -190,7 +193,7 @@ void InsetCommand::setParams(InsetCommandParams const & p )
 }
 
 
-int InsetCommand::Latex(Buffer const *, ostream & os,
+int InsetCommand::latex(Buffer const *, ostream & os,
 			bool /*fragile*/, bool/*fs*/) const
 {
 	os << getCommand();
@@ -198,19 +201,19 @@ int InsetCommand::Latex(Buffer const *, ostream & os,
 }
 
 
-int InsetCommand::Ascii(Buffer const *, ostream &, int) const
+int InsetCommand::ascii(Buffer const *, ostream &, int) const
 {
 	return 0;
 }
 
 
-int InsetCommand::Linuxdoc(Buffer const *, ostream &) const
+int InsetCommand::linuxdoc(Buffer const *, ostream &) const
 {
 	return 0;
 }
 
 
-int InsetCommand::DocBook(Buffer const *, ostream &) const
+int InsetCommand::docbook(Buffer const *, ostream &) const
 {
 	return 0;
 }