ws changes only

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index a6489053d62a78a797dccff7016a582e0ad38852..c1845026170ac883a18c36c2539a6c50e99e86fc 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -20,11 +20,13 @@
 
 #include "support/lstrings.h"
 
+#include <boost/assert.hpp>
+
 using lyx::support::split;
 using lyx::support::trim;
 
 using std::endl;
-
+using std::string;
 using std::ostream;
 
 
@@ -47,16 +49,6 @@ using std::ostream;
 
 LyXAction lyxaction;
 
-namespace {
-
-/// return true if the given action is a pseudo-action
-inline bool isPseudoAction(int a)
-{
-       return a > int(LFUN_LASTACTION);
-}
-
-}
-
 
 void LyXAction::newFunc(kb_action action, string const & name,
                        unsigned int attrib)
@@ -233,6 +225,7 @@ void LyXAction::init()
                { LFUN_INSET_MINIPAGE, "minipage-insert", Noop },
                { LFUN_INSERT_BRANCH, "branch-insert", Noop },
                { LFUN_INSERT_NOTE, "note-insert", Noop },
+               { LFUN_INSERT_BOX, "box-insert", Noop },
                { LFUN_GOTONOTE, "note-next", ReadOnly },
                { LFUN_INSET_TOGGLE, "inset-toggle", ReadOnly },
                { LFUN_DOWN_PARAGRAPH, "paragraph-down", ReadOnly },
@@ -345,29 +338,27 @@ LyXAction::LyXAction()
 
 
 // Returns an action tag from a string.
-kb_action LyXAction::LookupFunc(string const & func)
+FuncRequest LyXAction::lookupFunc(string const & func) const
 {
        string const func2 = trim(func);
-       if (func2.empty()) return LFUN_NOACTION;
 
-       // split action and arg
-       string actstr;
-       string const argstr = split(func2, actstr, ' ');
-       lyxerr[Debug::ACTION] << "Action: " << actstr << '\n'
-                             << "Arg   : " << argstr << endl;
+       if (func2.empty()) {
+               return FuncRequest(LFUN_NOACTION);
+       }
+
+       string cmd;
+       string const arg = split(func2, cmd, ' ');
 
-       func_map::const_iterator fit = lyx_func_map.find(actstr);
+       func_map::const_iterator fit = lyx_func_map.find(cmd);
 
-       return fit != lyx_func_map.end() ? fit->second : LFUN_UNKNOWN_ACTION;
+       return fit != lyx_func_map.end() ? FuncRequest(fit->second, arg) : FuncRequest(LFUN_UNKNOWN_ACTION);
 }
 
 
-string const LyXAction::getActionName(int action) const
+string const LyXAction::getActionName(kb_action action) const
 {
-       info_map::const_iterator const it = lyx_info_map.find(kb_action(action));
-       if (it != lyx_info_map.end())
-               return it->second.name;
-       return string();
+       info_map::const_iterator const it = lyx_info_map.find(action);
+       return it != lyx_info_map.end() ? it->second.name : string();
 }
 
 
@@ -376,14 +367,9 @@ bool LyXAction::funcHasFlag(kb_action action,
 {
        info_map::const_iterator ici = lyx_info_map.find(action);
 
-       if (ici != lyx_info_map.end()) {
-               return ici->second.attrib & flag;
-       } else {
-               // it really should exist, but...
-               lyxerr << "LyXAction::funcHasFlag: "
-                       "No info about kb_action: " << action << '\n';
-               return false;
-       }
+       BOOST_ASSERT(ici != lyx_info_map.end());
+
+       return ici->second.attrib & flag;
 }