* BufferView::updateMetrics(): split up the method in two for the SinglePar case.

[lyx.git] / src / ToolbarBackend.h

diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index ec9af8fea8f563bb6524e14f85631e4177f21d1a..95dc8900b726e9021a1ff9aabf19d1907c8ccb57 100644 (file)
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -13,7 +13,7 @@
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include <vector>
 
@@ -21,7 +21,7 @@
 namespace lyx {
 
 
-class LyXLex;
+class Lexer;
 
 class ToolbarItem {
 public:
@@ -36,7 +36,7 @@ public:
                LAYOUTS,
                /// a special widget to insert tabulars
                TABLEINSERT,
-               /// 
+               ///
                POPUPMENU,
                ///
                ICONPALETTE
@@ -97,7 +97,7 @@ public:
        Flags flags;
 
        /// read a toolbar from the file
-       ToolbarInfo & read(LyXLex &);
+       ToolbarInfo & read(Lexer &);
 
 private:
        /// add toolbar item
@@ -122,17 +122,18 @@ public:
        Toolbars::iterator end() { return usedtoolbars.end(); }
 
        /// read toolbars from the file
-       void readToolbars(LyXLex &);
+       void readToolbars(Lexer &);
 
        /// read ui toolbar settings
-       void readToolbarSettings(LyXLex &);
+       void readToolbarSettings(Lexer &);
+
        ///
-       ToolbarInfo const & getToolbar(std::string const & name) const;
+       ToolbarInfo const * getDefinedToolbarInfo(std::string const & name) const;
        ///
-       ToolbarInfo & getToolbar(std::string const & name);
+       ToolbarInfo * getUsedToolbarInfo(std::string const & name);
 
 private:
-       /// all the toolbars
+       /// all the defined toolbars
        Toolbars toolbars;
 
        /// toolbars listed