diff options
author | 2017-12-13 21:01:10 -0700 | |
---|---|---|
committer | 2017-12-13 21:01:10 -0700 | |
commit | 54155441e9ba9941e85d80c4834a66376a11e791 (patch) | |
tree | aa44bdaf0035cbe188d64c447f225f10f7d76d8d /src/frontend/mame/ui/filesel.h | |
parent | f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4 (diff) |
Revert "Merge branch 'master' of https://github.com/mamedev/mame"
This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing
changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5.
Diffstat (limited to 'src/frontend/mame/ui/filesel.h')
-rw-r--r-- | src/frontend/mame/ui/filesel.h | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/src/frontend/mame/ui/filesel.h b/src/frontend/mame/ui/filesel.h index 2aec3a77da1..6e1759588dd 100644 --- a/src/frontend/mame/ui/filesel.h +++ b/src/frontend/mame/ui/filesel.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - // ======================> menu_file_selector class menu_file_selector : public menu @@ -31,16 +30,7 @@ public: FILE }; - menu_file_selector( - mame_ui_manager &mui, - render_container &container, - device_image_interface *image, - std::string ¤t_directory, - std::string ¤t_file, - bool has_empty, - bool has_softlist, - bool has_create, - result &result); + menu_file_selector(mame_ui_manager &mui, render_container &container, device_image_interface *image, std::string ¤t_directory, std::string ¤t_file, bool has_empty, bool has_softlist, bool has_create, result &result); virtual ~menu_file_selector() override; protected: @@ -60,7 +50,7 @@ private: struct file_selector_entry { - file_selector_entry() { } + file_selector_entry() {} file_selector_entry(file_selector_entry &&) = default; file_selector_entry &operator=(file_selector_entry &&) = default; file_selector_entry_type type; @@ -69,16 +59,16 @@ private: }; // internal state - device_image_interface *const m_image; - std::string & m_current_directory; - std::string & m_current_file; - bool const m_has_empty; - bool const m_has_softlist; - bool const m_has_create; - result & m_result; + device_image_interface * m_image; + std::string & m_current_directory; + std::string & m_current_file; + bool m_has_empty; + bool m_has_softlist; + bool m_has_create; + result & m_result; std::vector<file_selector_entry> m_entrylist; - std::string m_hover_directory; - std::string m_filename; + std::string m_hover_directory; + std::string m_filename; virtual void populate(float &customtop, float &custombottom) override; virtual void handle() override; @@ -105,20 +95,16 @@ public: WRITE_OTHER, WRITE_DIFF }; - menu_select_rw( - mame_ui_manager &mui, - render_container &container, - bool can_in_place, - result &result); + menu_select_rw(mame_ui_manager &mui, render_container &container, + bool can_in_place, result &result); virtual ~menu_select_rw() override; + virtual void populate(float &customtop, float &custombottom) override; + virtual void handle() override; static void *itemref_from_result(result result); static result result_from_itemref(void *itemref); private: - virtual void populate(float &customtop, float &custombottom) override; - virtual void handle() override; - // internal state bool m_can_in_place; result & m_result; |