From 0ecaa79f08d7cf4caed3f274a728906de5e2115a Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 14 Jan 2017 13:17:38 +0100
Subject: GRAPHICS: Renamed Menu to MacMenu to avoid potential name collision

---
 graphics/macgui/macmenu.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'graphics/macgui/macmenu.h')

diff --git a/graphics/macgui/macmenu.h b/graphics/macgui/macmenu.h
index 39fc57509f..e7dde9a59a 100644
--- a/graphics/macgui/macmenu.h
+++ b/graphics/macgui/macmenu.h
@@ -27,10 +27,10 @@
 
 namespace Graphics {
 
-struct MenuItem;
-struct MenuSubItem;
+struct MacMenuItem;
+struct MacMenuSubItem;
 
-struct MenuData {
+struct MacMenuData {
 	int menunum;
 	const char *title;
 	int action;
@@ -38,16 +38,16 @@ struct MenuData {
 	bool enabled;
 };
 
-class Menu : public BaseMacWindow {
+class MacMenu : public BaseMacWindow {
 public:
-	Menu(int id, const Common::Rect &bounds, MacWindowManager *wm);
-	~Menu();
+	MacMenu(int id, const Common::Rect &bounds, MacWindowManager *wm);
+	~MacMenu();
 
 	static Common::StringArray *readMenuFromResource(Common::SeekableReadStream *res);
 
 	void setCommandsCallback(void (*callback)(int, Common::String &, void *), void *data) { _ccallback = callback; _cdata = data; }
 
-	void addStaticMenus(const MenuData *data);
+	void addStaticMenus(const MacMenuData *data);
 	void calcDimensions();
 
 	int addMenuItem(const char *name);
@@ -72,10 +72,10 @@ private:
 
 private:
 	const Font *getMenuFont();
-	const char *getAcceleratorString(MenuSubItem *item, const char *prefix);
-	int calculateMenuWidth(MenuItem *menu);
-	void calcMenuBounds(MenuItem *menu);
-	void renderSubmenu(MenuItem *menu);
+	const char *getAcceleratorString(MacMenuSubItem *item, const char *prefix);
+	int calculateMenuWidth(MacMenuItem *menu);
+	void calcMenuBounds(MacMenuItem *menu);
+	void renderSubmenu(MacMenuItem *menu);
 
 	bool keyEvent(Common::Event &event);
 	bool mouseClick(int x, int y);
@@ -84,7 +84,7 @@ private:
 
 	bool processMenuShortCut(byte flags, uint16 ascii);
 
-	Common::Array<MenuItem *> _items;
+	Common::Array<MacMenuItem *> _items;
 
 	const Font *_font;
 
-- 
cgit v1.2.3