diff options
author | Vas Crabb <vas@vastheman.com> | 2016-05-27 02:59:42 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2016-05-27 03:00:20 +1000 |
commit | 87429e74d90481317db41dfc45c7751039cd8b48 (patch) | |
tree | 662d3fd49661f4dc98611ebedcf8ffee62ed8b42 /src/frontend/mame/ui/dirmenu.h | |
parent | 4efb2fe8257a7ce35696f8942122358822079056 (diff) |
ui refactoring [Vas Crabb]
* move menu classes into ::ui namesapce
* reduce scope of many symbols
(first step in making UI code less rage-inducing so I can fix text input)
Diffstat (limited to 'src/frontend/mame/ui/dirmenu.h')
-rw-r--r-- | src/frontend/mame/ui/dirmenu.h | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/src/frontend/mame/ui/dirmenu.h b/src/frontend/mame/ui/dirmenu.h index 223776e44d1..17cf28726aa 100644 --- a/src/frontend/mame/ui/dirmenu.h +++ b/src/frontend/mame/ui/dirmenu.h @@ -10,18 +10,25 @@ #pragma once -#ifndef __UI_DIRMENU_H__ -#define __UI_DIRMENU_H__ +#ifndef MAME_FRONTEND_UI_DIRMENU_H +#define MAME_FRONTEND_UI_DIRMENU_H + +#include "ui/menu.h" + +#include <string> +#include <vector> + +namespace ui { //------------------------------------------------- // class directory menu //------------------------------------------------- -class ui_menu_directory : public ui_menu +class menu_directory : public menu { public: - ui_menu_directory(mame_ui_manager &mui, render_container *container); - virtual ~ui_menu_directory(); + menu_directory(mame_ui_manager &mui, render_container *container); + virtual ~menu_directory() override; virtual void populate() override; virtual void handle() override; virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; @@ -31,11 +38,11 @@ public: // class directory specific menu //------------------------------------------------- -class ui_menu_display_actual : public ui_menu +class menu_display_actual : public menu { public: - ui_menu_display_actual(mame_ui_manager &mui, render_container *container, int selectedref); - virtual ~ui_menu_display_actual(); + menu_display_actual(mame_ui_manager &mui, render_container *container, int selectedref); + virtual ~menu_display_actual() override; virtual void populate() override; virtual void handle() override; virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; @@ -56,11 +63,11 @@ private: // class remove folder menu //------------------------------------------------- -class ui_menu_remove_folder : public ui_menu +class menu_remove_folder : public menu { public: - ui_menu_remove_folder(mame_ui_manager &mui, render_container *container, int ref); - virtual ~ui_menu_remove_folder(); + menu_remove_folder(mame_ui_manager &mui, render_container *container, int ref); + virtual ~menu_remove_folder() override; virtual void populate() override; virtual void handle() override; virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; @@ -75,11 +82,11 @@ private: // class add / change folder menu //------------------------------------------------- -class ui_menu_add_change_folder : public ui_menu +class menu_add_change_folder : public menu { public: - ui_menu_add_change_folder(mame_ui_manager &mui, render_container *container, int ref); - virtual ~ui_menu_add_change_folder(); + menu_add_change_folder(mame_ui_manager &mui, render_container *container, int ref); + virtual ~menu_add_change_folder() override; virtual void populate() override; virtual void handle() override; virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; @@ -94,4 +101,6 @@ private: std::vector<std::string> m_folders; }; -#endif /* __UI_DIRMENU_H__ */ +} // namesapce ui + +#endif /* MAME_FRONTEND_UI_DIRMENU_H */ |