Assure correct spacing of colored items in mathed

[lyx.git] / src / CmdDef.cpp

diff --git a/src/CmdDef.cpp b/src/CmdDef.cpp
index a5ac6cf2d4e0838c8e8537599d2404e4aef59b60..8a480bd4df01678756cc771e3a2bc7bda8b858ab 100644 (file)
--- a/src/CmdDef.cpp
+++ b/src/CmdDef.cpp
@@ -20,7 +20,6 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
-#include <ostream>
 #include <string>
 
 using namespace std;
@@ -100,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;
@@ -152,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;
        }