X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCmdDef.cpp;h=08cd7dd6a928e01812904f2eb4e854bbfc97f2e0;hb=a11780b59fcb6cdd16b15f9fa4de45d7ddfd1b2a;hp=17c6fc52f4ef459102a3cca62ed1f371caeac4e5;hpb=4c7a5d00245799695ea81aa0192151eed8f9c5fb;p=features.git

diff --git a/src/CmdDef.cpp b/src/CmdDef.cpp
index 17c6fc52f4..08cd7dd6a9 100644
--- a/src/CmdDef.cpp
+++ b/src/CmdDef.cpp
@@ -12,6 +12,7 @@
 
 #include "CmdDef.h"
 
+#include "FuncRequest.h"
 #include "LyXAction.h"
 #include "Lexer.h"
 
@@ -99,8 +100,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 +152,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;
 	}