#include "CmdDef.h"
+#include "FuncRequest.h"
#include "LyXAction.h"
#include "Lexer.h"
}
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;
}
-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;
}