X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCmdDef.cpp;h=8a480bd4df01678756cc771e3a2bc7bda8b858ab;hb=25bcbe766601b7bbc5b9832858ab8e5874f5d2a2;hp=b0b03350c7fbf1307c4aa5818d4c03df35dc707f;hpb=45bc27809bae95259e251a2215b39f945d8835ca;p=lyx.git

diff --git a/src/CmdDef.cpp b/src/CmdDef.cpp
index b0b03350c7..8a480bd4df 100644
--- a/src/CmdDef.cpp
+++ b/src/CmdDef.cpp
@@ -99,8 +99,8 @@ bool CmdDef::read(string const & def_file)
 		}
 		case BN_DEFFILE:
 			if (lex.next()) {
-				string const tmp = lex.getString();
-				error |= !read(tmp);
+				string const stmp = lex.getString();
+				error |= !read(stmp);
 			} else {
 				lex.printError("BN_DEFFILE: Missing file name");
 				error = true;
@@ -151,20 +151,20 @@ void CmdDef::release(string const & name)
 }
 
 
-CmdDef::newCmdDefResult CmdDef::newCmdDef(string const & name, 
-										  string const & def)
+CmdDef::newCmdDefResult CmdDef::newCmdDef(string const & name,
+					  string const & def)
 {
 	string const name2 = trim(name);
 
-	if (name2.empty()) 
+	if (name2.empty())
 		return CmdDefNameEmpty;
 
 	if (cmdDefMap.find(name) != cmdDefMap.end())
 		return CmdDefExists;
 
 	FuncRequest	func = lyxaction.lookupFunc(def);
-	if (func.action == LFUN_NOACTION
-		|| func.action == LFUN_UNKNOWN_ACTION) {
+	if (func.action() == LFUN_NOACTION
+		|| func.action() == LFUN_UNKNOWN_ACTION) {
 			return CmdDefInvalid;
 	}