Limit the nopassthurchars case in beamer to URL

[lyx.git] / src / CmdDef.cpp

diff --git a/src/CmdDef.cpp b/src/CmdDef.cpp
index b0b03350c7fbf1307c4aa5818d4c03df35dc707f..d813eba8e094c8c5fd651acd29894393e8117995 100644 (file)
--- a/src/CmdDef.cpp
+++ b/src/CmdDef.cpp
@@ -12,12 +12,13 @@
 
 #include "CmdDef.h"
 
+#include "FuncRequest.h"
 #include "LyXAction.h"
-#include "Lexer.h"
 
 #include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/Lexer.h"
 #include "support/lstrings.h"
 
 #include <string>
@@ -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;
        }