X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCmdDef.cpp;h=08cd7dd6a928e01812904f2eb4e854bbfc97f2e0;hb=7067f48fa7afb89575abc58495d076078ce20137;hp=1a9f42f4800ae21053e61c3963b99612d9c80844;hpb=b79d8e5e2d20e8f294d47fe924c20de17dbd5c0b;p=lyx.git diff --git a/src/CmdDef.cpp b/src/CmdDef.cpp index 1a9f42f480..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,12 +152,12 @@ 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())