X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FToolbarBackend.h;h=8169ea910a9f60d4541cf84c06f1f8a14a025791;hb=b9963e1a57135c3e2ab128a9ec4300f0e4886992;hp=58a88765be4143b651e6638f7494f2ef4c8a97e1;hpb=2994fe551121614948dcb68d6f4953ee3bbb694d;p=lyx.git

diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index 58a88765be..8169ea910a 100644
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -17,7 +17,6 @@
 
 #include <vector>
 
-#include "support/std_string.h"
 
 class LyXLex;
 
@@ -36,7 +35,7 @@ public:
 	};
 
 	/// action, tooltip
-	typedef std::pair<FuncRequest, string> Item;
+	typedef std::pair<FuncRequest, std::string> Item;
 
 	/// the toolbar items
 	typedef std::vector<Item> Items;
@@ -55,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
@@ -85,12 +86,12 @@ public:
 	void readToolbars(LyXLex &);
 
 	/// return a full path of an XPM for the given action
-	static string const getIcon(FuncRequest const &);
+	static std::string const getIcon(FuncRequest const &);
 
 private:
 	/// add the given lfun with tooltip if relevant
 	void add(Toolbar & tb, FuncRequest const &,
-		 string const & tooltip = string());
+		 std::string const & tooltip = std::string());
 
 	/// all the toolbars
 	Toolbars toolbars;