From f5132311b75102764b89b4fdb4dee62a292ad862 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 20 Jul 2017 02:37:52 +1000 Subject: reduce header clutter, thank you C++11 (nw) --- src/frontend/mame/ui/selmenu.cpp | 38 ++++++++++++++++++++++++++++++++++++++ src/frontend/mame/ui/selmenu.h | 39 ++------------------------------------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp index 5ff4fa98620..97539c8740e 100644 --- a/src/frontend/mame/ui/selmenu.cpp +++ b/src/frontend/mame/ui/selmenu.cpp @@ -71,6 +71,44 @@ char const *const hover_msg[] = { } // anonymous namespace +class menu_select_launch::software_parts : public menu +{ +public: + software_parts(mame_ui_manager &mui, render_container &container, s_parts &&parts, ui_software_info const &ui_info); + virtual ~software_parts() override; + +protected: + virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + +private: + virtual void populate(float &customtop, float &custombottom) override; + virtual void handle() override; + + ui_software_info const &m_uiinfo; + s_parts const m_parts; +}; + +class menu_select_launch::bios_selection : public menu +{ +public: + bios_selection(mame_ui_manager &mui, render_container &container, s_bios &&biosname, game_driver const &driver, bool inlist); + bios_selection(mame_ui_manager &mui, render_container &container, s_bios &&biosname, ui_software_info const &swinfo, bool inlist); + virtual ~bios_selection() override; + +protected: + virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + +private: + bios_selection(mame_ui_manager &mui, render_container &container, s_bios &&biosname, void const *driver, bool software, bool inlist); + + virtual void populate(float &customtop, float &custombottom) override; + virtual void handle() override; + + void const *m_driver; + bool m_software, m_inlist; + s_bios m_bios; +}; + std::string menu_select_launch::reselect_last::s_driver; std::string menu_select_launch::reselect_last::s_software; std::string menu_select_launch::reselect_last::s_swlist; diff --git a/src/frontend/mame/ui/selmenu.h b/src/frontend/mame/ui/selmenu.h index 6556f5afdc0..f101d8955e5 100644 --- a/src/frontend/mame/ui/selmenu.h +++ b/src/frontend/mame/ui/selmenu.h @@ -99,43 +99,8 @@ private: using s_parts = std::unordered_map; using s_bios = std::vector>; - class software_parts : public menu - { - public: - software_parts(mame_ui_manager &mui, render_container &container, s_parts &&parts, ui_software_info const &ui_info); - virtual ~software_parts() override; - - protected: - virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; - - private: - virtual void populate(float &customtop, float &custombottom) override; - virtual void handle() override; - - ui_software_info const &m_uiinfo; - s_parts const m_parts; - }; - - class bios_selection : public menu - { - public: - bios_selection(mame_ui_manager &mui, render_container &container, s_bios &&biosname, game_driver const &driver, bool inlist); - bios_selection(mame_ui_manager &mui, render_container &container, s_bios &&biosname, ui_software_info const &swinfo, bool inlist); - virtual ~bios_selection() override; - - protected: - virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; - - private: - bios_selection(mame_ui_manager &mui, render_container &container, s_bios &&biosname, void const *driver, bool software, bool inlist); - - virtual void populate(float &customtop, float &custombottom) override; - virtual void handle() override; - - void const *m_driver; - bool m_software, m_inlist; - s_bios m_bios; - }; + class software_parts; + class bios_selection; class cache { -- cgit v1.2.3