Collapse all those LFUN_XYZ_APPLY to a single LFUN_INSET_APPLY.

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index 6d5a7a011067b4ad4a624285bd940e37b7d68bd0..1470b05bfcb45391af2ad2d0740303fc554c40bb 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -6,10 +6,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "LyXAction.h"
 
 #include "debug.h"
@@ -99,17 +95,11 @@ void LyXAction::init()
                { LFUN_UMLAUT, "accent-umlaut", "", Noop },
                { LFUN_UNDERBAR, "accent-underbar", "", Noop },
                { LFUN_UNDERDOT, "accent-underdot", "", Noop },
-               { LFUN_VECTOR, "accent-vector", "", Noop },
                { LFUN_APPENDIX, "appendix", N_("Insert appendix"), Noop },
                { LFUN_APROPOS, "apropos", N_("Describe command"),
                  NoBuffer|ReadOnly },
                { LFUN_LEFTSEL, "backward-select",
                  N_("Select previous char"), ReadOnly },
-               { LFUN_BIBDB_ADD, "bibtex-database-add", "", Noop },
-               { LFUN_BIBDB_DEL, "bibtex-database-del", "", Noop },
-               { LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert bibtex"),
-                 Noop },
-               { LFUN_BIBTEX_STYLE, "bibtex-style", "", Noop },
                { LFUN_BOOKMARK_GOTO, "bookmark-goto", "", ReadOnly },
                { LFUN_BOOKMARK_SAVE, "bookmark-save", "", ReadOnly },
                { LFUN_BREAKLINE, "break-line", "", Noop },
@@ -156,9 +146,6 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_RIGHT, "char-forward", N_("Go one char forward"),
                  ReadOnly },
-               { LFUN_CITATION_CREATE, "citation-insert",
-                 N_("Insert citation"), Noop },
-               { LFUN_CITATION_INSERT, "", "internal only", Noop },
                { LFUN_EXEC_COMMAND, "command-execute", "", NoBuffer },
                { LFUN_PREFIX, "command-prefix",
                  N_("Execute command"), NoBuffer },
@@ -250,6 +237,8 @@ void LyXAction::init()
                  Noop },
                { LFUN_INSET_OPTARG, "optional-insert", N_("Insert Optional Argument"),
                  Noop },
+               { LFUN_INSERT_BIBITEM, "bibitem-insert",
+                 N_("Insert Bibliography Key"), Noop },
                { LFUN_LANGUAGE, "language", N_("Change language"), Noop },
                { LFUN_LATEX_LOG, "latex-view-log", N_("View LaTeX log"),
                  ReadOnly },
@@ -414,6 +403,24 @@ void LyXAction::init()
                { LFUN_FORKS_KILL, "kill-forks",
                  N_("Kill the forked process with this PID"), NoBuffer },
                { LFUN_TOOLTIPS_TOGGLE, "toggle-tooltips", "", NoBuffer },
+               { LFUN_TRACK_CHANGES, "track-changes", N_("Begin tracking changes"), Noop },
+               { LFUN_MERGE_CHANGES, "merge-changes", N_("Merge changes"), Noop },
+               { LFUN_ACCEPT_CHANGE, "accept-change", N_("Accept selected change"), Noop },
+               { LFUN_REJECT_CHANGE, "reject-change", N_("Reject selected change"), Noop },
+               { LFUN_ACCEPT_ALL_CHANGES, "accept-all-changes", N_("Accept all changes"), Noop },
+               { LFUN_REJECT_ALL_CHANGES, "reject-all-changes", N_("Reject all changes"), Noop },
+
+               { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset",
+                 N_("Show the inset's dialog"), Noop },
+               { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-next-inset",
+                 N_("Show the inset's dialog"), Noop },
+               { LFUN_DIALOG_UPDATE, "dialog-update",
+                 N_("Update the dialog"), Noop },
+               { LFUN_DIALOG_HIDE, "dialog-hide",
+                 N_("Hide the dialog"), Noop },
+               { LFUN_DIALOG_DISCONNECT_INSET, "dialog-disconnect-inset",
+                 N_("Disconnect the dialog from the current inset"), Noop },
+               { LFUN_INSET_APPLY, "inset-apply", "", Noop },
                { LFUN_NOACTION, "", "", Noop }
        };
 
@@ -534,7 +541,7 @@ string const LyXAction::getActionName(int action) const
 {
        FuncRequest ev = retrieveActionArg(action);
        if (!ev.argument.empty())
-               ev.argument.insert(0u, 1, ' ');
+               ev.argument.insert(string::size_type(0), 1, ' ');
 
        info_map::const_iterator const it = lyx_info_map.find(ev.action);