Fix breakage caused by bad commits.

[lyx.git] / src / ToolbarBackend.h

diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index f5651db88199188d62936c00d196ea4d8890c300..8169ea910a9f60d4541cf84c06f1f8a14a025791 100644 (file)
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -13,12 +13,14 @@
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 
+#include "funcrequest.h"
+
 #include <vector>
 
-#include "support/std_string.h"
 
 class LyXLex;
 
+
 ///
 class ToolbarBackend {
 public:
@@ -33,10 +35,10 @@ public:
        };
 
        /// action, tooltip
-       typedef std::pair<int, string> Item;
+       typedef std::pair<FuncRequest, std::string> Item;
 
        /// the toolbar items
-       typedef std::vector<std::pair<int, string> > Items;
+       typedef std::vector<Item> Items;
 
        /// toolbar flags
        enum Flags {
@@ -52,8 +54,10 @@ public:
 
        /// a toolbar
        struct Toolbar {
-               /// toolbar UI name
-               string name;
+               /// toolbar name
+               std::string name;
+               /// toolbar GUI name
+               std::string gui_name;
                /// toolbar contents
                Items items;
                /// flags
@@ -82,14 +86,12 @@ public:
        void readToolbars(LyXLex &);
 
        /// return a full path of an XPM for the given action
-       static string const getIcon(int action);
+       static std::string const getIcon(FuncRequest const &);
 
 private:
        /// add the given lfun with tooltip if relevant
-       void add(Toolbar & tb, int, string const & tooltip = string());
-
-       /// add the given lfun with tooltip if relevant
-       void add(Toolbar & tb, string const &, string const & tooltip);
+       void add(Toolbar & tb, FuncRequest const &,
+                std::string const & tooltip = std::string());
 
        /// all the toolbars
        Toolbars toolbars;