diff options
author | 2016-07-10 22:10:44 +1000 | |
---|---|---|
committer | 2016-07-10 22:10:59 +1000 | |
commit | 3258d3feef7ecba3067bde2ed527849811297020 (patch) | |
tree | 82295081a7c83835fe8d42a3ddd3d71a854059b1 /src/frontend/mame/ui/filemngr.cpp | |
parent | 9bbf1208e309370371d54b620077c5e2c993bbe3 (diff) |
UI refactoring: [Vas Crabb]
* std::bind - accept no substitutes
* pointer -> reference conversion
* make more menu members private or protected
* don't play so fast and loose with integer types
* reduce some vector copying
* make more static constants const
Diffstat (limited to 'src/frontend/mame/ui/filemngr.cpp')
-rw-r--r-- | src/frontend/mame/ui/filemngr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/frontend/mame/ui/filemngr.cpp b/src/frontend/mame/ui/filemngr.cpp index fe5cd6a2197..8883e4beb9f 100644 --- a/src/frontend/mame/ui/filemngr.cpp +++ b/src/frontend/mame/ui/filemngr.cpp @@ -31,7 +31,7 @@ namespace ui { // ctor //------------------------------------------------- -menu_file_manager::menu_file_manager(mame_ui_manager &mui, render_container *container, const char *warnings) : menu(mui, container), selected_device(nullptr) +menu_file_manager::menu_file_manager(mame_ui_manager &mui, render_container &container, const char *warnings) : menu(mui, container), selected_device(nullptr) { // This warning string is used when accessing from the force_file_manager call, i.e. // when the file manager is loaded top front in the case of mandatory image devices @@ -184,11 +184,11 @@ void menu_file_manager::handle() floppy_image_device *floppy_device = dynamic_cast<floppy_image_device *>(selected_device); if (floppy_device != nullptr) { - menu::stack_push<menu_control_floppy_image>(ui(), container, floppy_device); + menu::stack_push<menu_control_floppy_image>(ui(), container(), floppy_device); } else { - menu::stack_push<menu_control_device_image>(ui(), container, selected_device); + menu::stack_push<menu_control_device_image>(ui(), container(), selected_device); } // reset the existing menu reset(reset_options::REMEMBER_POSITION); @@ -198,7 +198,7 @@ void menu_file_manager::handle() } // force file manager menu -void menu_file_manager::force_file_manager(mame_ui_manager &mui, render_container *container, const char *warnings) +void menu_file_manager::force_file_manager(mame_ui_manager &mui, render_container &container, const char *warnings) { // reset the menu stack menu::stack_reset(mui.machine()); |