Collapse all those LFUN_XYZ_APPLY to a single LFUN_INSET_APPLY.

[lyx.git] / src / ToolbarDefaults.C

diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index 9f4dddc0c2770ed9de6060dae719d567c38488f2..224457e2bed5f6af2ee60aaeb61c80301d3a6cd9 100644 (file)
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -1,6 +1,6 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
  *
  *           Copyright 1995 Matthias Ettrich
@@ -9,10 +9,6 @@
  *
  * ====================================================== */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <config.h>
 
 #include "ToolbarDefaults.h"
@@ -24,7 +20,6 @@
 
 using std::endl;
 
-extern LyXAction lyxaction;
 ToolbarDefaults toolbardefaults;
 
 namespace {
@@ -62,7 +57,7 @@ void ToolbarDefaults::add(int action)
 }
 
 
-void ToolbarDefaults::init() 
+void ToolbarDefaults::init()
 {
        add(LAYOUTS);
        add(LFUN_FILE_OPEN);
@@ -75,38 +70,38 @@ void ToolbarDefaults::init()
        add(LFUN_COPY);
        add(LFUN_PASTE);
        add(SEPARATOR);
-       
+
        add(LFUN_EMPH);
        add(LFUN_NOUN);
        add(LFUN_FREE);
        add(SEPARATOR);
-       
+
        add(LFUN_INSET_FOOTNOTE);
        add(LFUN_INSET_MARGINAL);
 
-       add(LFUN_DEPTH);
+       add(LFUN_DEPTH_PLUS);
        add(SEPARATOR);
 
-        add(LFUN_MATH_MODE);
+       add(LFUN_MATH_MODE);
        add(SEPARATOR);
 
-       add(LFUN_FIGURE);
-       add(LFUN_DIALOG_TABULAR_INSERT);
+       add(LFUN_INSET_GRAPHICS);
+       add(LFUN_TABULAR_INSERT);
 }
 
 
-void ToolbarDefaults::read(LyXLex & lex) 
+void ToolbarDefaults::read(LyXLex & lex)
 {
        //consistency check
-       if (compare_no_case(lex.getString(), "toolbar")) {
+       if (compare_ascii_no_case(lex.getString(), "toolbar")) {
                lyxerr << "Toolbar::read: ERROR wrong token:`"
                       << lex.getString() << '\'' << endl;
        }
 
        defaults.clear();
-       
+
        bool quit = false;
-       
+
        lex.pushTable(toolTags, TO_LAST - 1);
 
        if (lyxerr.debugging(Debug::PARSER))
@@ -119,23 +114,23 @@ void ToolbarDefaults::read(LyXLex & lex)
                                string const func = lex.getString();
                                lyxerr[Debug::PARSER]
                                        << "Toolbar::read TO_ADD func: `"
-                                       << func << "'" << endl;
+                                       << func << '\'' << endl;
                                add(func);
                        }
                        break;
-                  
+
                case TO_SEPARATOR:
                        add(SEPARATOR);
                        break;
-                  
+
                case TO_LAYOUTS:
                        add(LAYOUTS);
                        break;
-                  
+
                case TO_NEWLINE:
                        add(NEWLINE);
                        break;
-                       
+
                case TO_ENDTOOLBAR:
                        quit = true;
                        break;
@@ -155,7 +150,7 @@ void ToolbarDefaults::add(string const & func)
 
        if (tf == -1) {
                lyxerr << "Toolbar::add: no LyX command called `"
-                      << func << "' exists!" << endl; 
+                      << func << "' exists!" << endl;
        } else {
                add(tf);
        }