Remove todo

[lyx.git] / src / LyXAction.cpp

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 4fbfdebebfbe24ea7e22ee686e15c7d61d0a9bf9..243e2f9e9fa339d9673eb58a93c8a7b194e54861 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -15,24 +15,18 @@
 
 #include "LyXAction.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "FuncRequest.h"
 
 #include "support/lstrings.h"
 
 #include <boost/assert.hpp>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::split;
-using support::trim;
-
-using std::endl;
-using std::string;
-using std::ostream;
-
-
 /*
      NAMING RULES FOR USER-COMMANDS
      Here's the set of rules to apply when a new command name is introduced:
@@ -157,11 +151,9 @@ void LyXAction::init()
                { LFUN_DELETE_FORWARD_SKIP, "delete-forward-skip", Noop, Edit },
                { LFUN_DEPTH_DECREMENT, "depth-decrement", Noop, Edit },
                { LFUN_DEPTH_INCREMENT, "depth-increment", Noop, Edit },
-               { LFUN_DOTS_INSERT, "dots-insert", Noop, Edit },
                { LFUN_DOWN, "down", ReadOnly | NoUpdate, Edit },
                { LFUN_DOWN_SELECT, "down-select", ReadOnly | SingleParUpdate, Edit },
                { LFUN_DROP_LAYOUTS_CHOICE, "drop-layouts-choice", ReadOnly, Layout },
-               { LFUN_END_OF_SENTENCE_PERIOD_INSERT, "end-of-sentence-period-insert", Noop, Edit },
                { LFUN_ENVIRONMENT_INSERT, "environment-insert", Noop, Edit },
                { LFUN_ERROR_NEXT, "error-next", ReadOnly, Edit },
                { LFUN_ERT_INSERT, "ert-insert", Noop, Edit },
@@ -190,8 +182,6 @@ void LyXAction::init()
                { LFUN_FOOTNOTE_INSERT, "footnote-insert", Noop, Edit },
                { LFUN_HFILL_INSERT, "hfill-insert", Noop, Edit },
                { LFUN_HELP_OPEN, "help-open", NoBuffer | Argument, Buffer },
-               { LFUN_HYPHENATION_POINT_INSERT, "hyphenation-point-insert", Noop, Edit },
-               { LFUN_LIGATURE_BREAK_INSERT, "ligature-break-insert", Noop, Edit },
                { LFUN_INDEX_INSERT, "index-insert", Noop, Edit },
                { LFUN_INDEX_PRINT, "index-print", Noop, Edit },
                { LFUN_KEYMAP_OFF, "keymap-off", ReadOnly, Edit },
@@ -228,7 +218,7 @@ void LyXAction::init()
                { LFUN_MATH_DELIM, "math-delim", Noop, Math },
                { LFUN_MATH_BIGDELIM, "math-bigdelim", Noop, Math },
                { LFUN_MATH_DISPLAY, "math-display", Noop, Math },
-               { LFUN_MATH_INSERT, "math-insert", Noop, Edit },
+               { LFUN_MATH_INSERT, "math-insert", Noop, Math },
                { LFUN_MATH_SUBSCRIPT, "math-subscript", Noop, Math },
                { LFUN_MATH_SUPERSCRIPT, "math-superscript", Noop, Math },
                { LFUN_MATH_LIMITS, "math-limits", Noop, Math },
@@ -253,8 +243,8 @@ void LyXAction::init()
                { LFUN_MATH_MACRO_ADD_OPTIONAL_PARAM, "math-macro-add-optional-param", Noop, Math },
                { LFUN_MATH_MACRO_REMOVE_OPTIONAL_PARAM, "math-macro-remove-optional-param", Noop, Math },
                { LFUN_MATH_MACRO_ADD_GREEDY_OPTIONAL_PARAM, "math-macro-add-greedy-optional-param", Noop, Math },
+               { LFUN_IN_MATHMACROTEMPLATE, "in-mathmacrotemplate", Noop, Math },
                { LFUN_MENU_OPEN, "menu-open", NoBuffer, Buffer },
-               { LFUN_MENU_SEPARATOR_INSERT, "menu-separator-insert", Noop, Edit },
                { LFUN_META_PREFIX, "meta-prefix", NoBuffer, System },
                { LFUN_NEW_LINE, "new-line", Noop, Edit },
                { LFUN_NEXT_INSET_TOGGLE, "next-inset-toggle", ReadOnly, Edit },
@@ -286,11 +276,13 @@ void LyXAction::init()
                { LFUN_SCREEN_DOWN, "screen-down", ReadOnly, Edit },
                { LFUN_SCREEN_DOWN_SELECT, "screen-down-select", ReadOnly, Edit },
                { LFUN_SCREEN_FONT_UPDATE, "screen-font-update", NoBuffer, Layout },
+               { LFUN_SCROLL, "scroll", ReadOnly, Edit },
                { LFUN_SCREEN_RECENTER, "screen-recenter", ReadOnly, Edit },
                { LFUN_SCREEN_UP, "screen-up", ReadOnly, Edit },
                { LFUN_SCREEN_UP_SELECT, "screen-up-select", ReadOnly, Edit },
                { LFUN_SELF_INSERT, "self-insert", SingleParUpdate, Hidden },
                { LFUN_SPACE_INSERT, "space-insert", Noop, Edit },
+               { LFUN_SPECIALCHAR_INSERT, "specialchar-insert", Noop, Edit },
                { LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly, System },
                { LFUN_SERVER_GET_FONT, "server-get-font", ReadOnly, System },
                { LFUN_SERVER_GET_LAYOUT, "server-get-layout", ReadOnly, System },
@@ -377,7 +369,7 @@ void LyXAction::init()
                { LFUN_INSET_REFRESH, "", Noop, Hidden },
                { LFUN_BUFFER_NEXT, "buffer-next", ReadOnly, Buffer },
                { LFUN_BUFFER_PREVIOUS, "buffer-previous", ReadOnly, Buffer },
-               { LFUN_WORDS_COUNT, "words-count", ReadOnly, System },
+               { LFUN_STATISTICS, "statistics", ReadOnly, System },
                { LFUN_FINISHED_FORWARD, "", ReadOnly, Hidden },
                { LFUN_FINISHED_BACKWARD, "", ReadOnly, Hidden },
                { LFUN_FINISHED_RIGHT, "", ReadOnly, Hidden },
@@ -459,7 +451,7 @@ bool LyXAction::funcHasFlag(kb_action action,
        info_map::const_iterator ici = lyx_info_map.find(action);
 
        if (ici == lyx_info_map.end()) {
-               lyxerr << "action: " << action << " is not known." << endl;
+               LYXERR0("action: " << action << " is not known.");
                BOOST_ASSERT(false);
        }
 
@@ -479,10 +471,4 @@ LyXAction::const_func_iterator LyXAction::func_end() const
 }
 
 
-ostream & operator<<(ostream & o, kb_action action)
-{
-       return o << int(action);
-}
-
-
 } // namespace lyx