Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index 894becff85b1847141886026fe9a9b57ad058ece..4bdd2dc6bd5b96776943fd152fe4c6e997d2448b 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -105,6 +105,8 @@ void LyXAction::init()
                { 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 },
                { LFUN_BREAKPARAGRAPH, "break-paragraph", "", Noop },
                { LFUN_BREAKPARAGRAPHKEEPLAYOUT, "break-paragraph-keep-layout",
@@ -117,7 +119,7 @@ void LyXAction::init()
                  N_("Go to beginning of document"), ReadOnly },
                { LFUN_BEGINNINGBUFSEL, "buffer-begin-select",
                  N_("Select to beginning of document"), ReadOnly },
-               { LFUN_CHILDINSERT, "buffer-child-insert", "", Noop },
+               { LFUN_CHILD_INSERT, "buffer-child-insert", "", Noop },
                { LFUN_CHILDOPEN, "buffer-child-open", "", ReadOnly },
                { LFUN_RUNCHKTEX, "buffer-chktex", N_("Check TeX"), ReadOnly },
                { LFUN_CLOSEBUFFER, "buffer-close", N_("Close"), ReadOnly },
@@ -126,9 +128,6 @@ void LyXAction::init()
                { LFUN_ENDBUFSEL, "buffer-end-select",
                  N_("Select to end of document"), ReadOnly },
                { LFUN_EXPORT, "buffer-export", N_("Export to"), ReadOnly },
-#if 0
-               { LFUN_FAX, "buffer-fax", N_("Fax"), ReadOnly },
-#endif
 #ifndef NEW_INSETS
                { LFUN_INSERTFOOTNOTE, "buffer-float-insert", "", Noop },
 #endif
@@ -141,7 +140,6 @@ void LyXAction::init()
                { LFUN_MENUNEW, "buffer-new", N_("New document") , NoBuffer },
                { LFUN_MENUNEWTMPLT,"buffer-new-template",
                  N_("New document from template"), NoBuffer },
-               { LFUN_MENUOPEN, "buffer-open", N_("Open"), NoBuffer },
                { LFUN_MENUPRINT, "buffer-print", N_("Print"), ReadOnly },
                { LFUN_MENURELOAD, "buffer-reload",
                  N_("Revert to saved"), ReadOnly },
@@ -152,7 +150,7 @@ void LyXAction::init()
                { LFUN_UPDATE, "buffer-update", N_("Update"), ReadOnly },
                { LFUN_PREVIEW, "buffer-view", N_("View") , ReadOnly },
                { LFUN_MENUWRITE, "buffer-write", N_("Save"), ReadOnly },
-               { LFUN_MENUWRITEAS, "buffer-write-as", N_("Save As"),
+               { LFUN_WRITEAS, "buffer-write-as", N_("Save As"),
                  ReadOnly },
                { LFUN_CANCEL, "cancel", N_("Cancel"), NoBuffer },
                { LFUN_INSET_CAPTION, "caption-insert", "", Noop },
@@ -194,13 +192,14 @@ void LyXAction::init()
                  N_("Insert a new ERT Inset"), Noop },
                { LFUN_INSET_EXTERNAL, "external-insert",
                  N_("Insert a new external inset"), Noop },
-               { LFUN_FIGURE, "figure-insert", N_("Insert Figure"), Noop },
+               { LFUN_FIGURE, "figure-insert", N_("Insert Graphics"), Noop },
                { LFUN_INSET_GRAPHICS, "graphics-insert",
                  N_("Insert Graphics"), Noop },
                { LFUN_FILE_INSERT, "file-insert", "", Noop },
-               { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", "", Noop },
+               { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", _("Insert ASCII files as lines"), Noop },
+               { LFUN_FILE_INSERT_ASCII_PARA, "file-insert-ascii-para", _("Insert ASCII file as a paragraph"), Noop },
                { LFUN_FILE_NEW, "file-new", "", NoBuffer },
-               { LFUN_FILE_OPEN, "file-open", "", NoBuffer },
+               { LFUN_FILE_OPEN, "file-open", _("Open a file"), NoBuffer },
                { LFUN_MENUSEARCH, "find-replace", N_("Find & Replace"),
                  ReadOnly },
                { LFUN_INSET_FLOAT, "float-insert", "", Noop },
@@ -355,10 +354,10 @@ void LyXAction::init()
                { LFUN_RECONFIGURE, "reconfigure",
                  N_("Reconfigure"), NoBuffer },
                { LFUN_REDO, "redo", N_("Redo"), Noop },
-               { LFUN_REF_BACK, "reference-back", "", ReadOnly },
                { LFUN_REF_GOTO, "reference-goto", "", ReadOnly },
                { LFUN_REF_INSERT, "reference-insert",
                  N_("Insert cross reference"), ReadOnly },
+               { LFUN_REFERENCE_GOTO, "reference-next", "", ReadOnly },
                { LFUN_NEXT, "screen-down", "", ReadOnly },
                { LFUN_NEXTSEL, "screen-down-select", "", ReadOnly },
                { LFUN_SCREEN_FONT_UPDATE, "screen-font-update",
@@ -385,7 +384,7 @@ void LyXAction::init()
                { LFUN_TAB, "tab-forward", "", Noop },
                { LFUN_TABINSERT, "tab-insert", "", Noop },
                { LFUN_DIALOG_TABULAR_INSERT, "dialog-tabular-insert",
-                 N_("Open Insert Tabular Dialog"), Noop },
+                 N_("Insert Table"), Noop },
                { LFUN_TABULAR_FEATURE, "tabular-feature",
                  N_("Tabular Features"), Noop },
                { LFUN_INSET_TABULAR, "tabular-insert",
@@ -453,8 +452,7 @@ LyXAction::LyXAction()
 // if it doesn't exist.
 int LyXAction::searchActionArg(kb_action action, string const & arg) const
 {
-       // BUG we really want to use const_iterator (Lgb)
-       arg_map::iterator pit = lyx_arg_map.find(action);
+       arg_map::const_iterator pit = lyx_arg_map.find(action);
 
        if (pit == lyx_arg_map.end()) {
                // the action does not have any pseudoactions
@@ -464,8 +462,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const
                return LFUN_UNKNOWN_ACTION;
        }
 
-       // BUG we really want to use const_iterator (Lgb)
-       arg_item::iterator aci = (*pit).second.find(arg);
+       arg_item::const_iterator aci = (*pit).second.find(arg);
 
        if (aci == (*pit).second.end()) {
                // the action does not have any pseudoactions with this arg
@@ -521,8 +518,7 @@ kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const
 {
        arg.erase(); // clear it to be sure.
 
-       // BUG we really want to use const_iterator (Lgb)
-       pseudo_map::iterator pit = lyx_pseudo_map.find(pseudo);
+       pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo);
 
        if (pit != lyx_pseudo_map.end()) {
                lyxerr[Debug::ACTION] << "Found the pseudoaction: ["