diff options
Diffstat (limited to 'src/frontend/mame')
73 files changed, 66 insertions, 133 deletions
diff --git a/src/frontend/mame/cheat.cpp b/src/frontend/mame/cheat.cpp index 3f23904c2da..71569aff8b4 100644 --- a/src/frontend/mame/cheat.cpp +++ b/src/frontend/mame/cheat.cpp @@ -401,7 +401,7 @@ void cheat_script::save(emu_file &cheatfile) const cheat_script::script_entry::script_entry(cheat_manager &manager, symbol_table &symbols, const char *filename, xml_data_node &entrynode, bool isaction) : m_condition(&symbols), - m_expression(&symbols) + m_expression(&symbols) { const char *expression = nullptr; try @@ -444,7 +444,7 @@ cheat_script::script_entry::script_entry(cheat_manager &manager, symbol_table &s int totalargs = 0; for (xml_data_node *argnode = xml_get_sibling(entrynode.child, "argument"); argnode != nullptr; argnode = xml_get_sibling(argnode->next, "argument")) { - auto curarg = std::make_unique<output_argument>(manager, symbols, filename, *argnode); + auto curarg = std::make_unique<output_argument>(manager, symbols, filename, *argnode); // verify we didn't overrun the argument count totalargs += curarg->count(); @@ -610,7 +610,7 @@ void cheat_script::script_entry::validate_format(const char *filename, int line) cheat_script::script_entry::output_argument::output_argument(cheat_manager &manager, symbol_table &symbols, const char *filename, xml_data_node &argnode) : m_expression(&symbols), - m_count(0) + m_count(0) { // first extract attributes m_count = xml_get_attribute_int(&argnode, "count", 1); diff --git a/src/frontend/mame/cheat.h b/src/frontend/mame/cheat.h index f69e3dfd94c..af68af56ef0 100644 --- a/src/frontend/mame/cheat.h +++ b/src/frontend/mame/cheat.h @@ -100,7 +100,7 @@ private: // construction/destruction item(const char *text, UINT64 value, int valformat) : m_text(text), - m_value(value, valformat) { } + m_value(value, valformat) { } // getters const number_and_format &value() const { return m_value; } @@ -175,12 +175,12 @@ private: void validate_format(const char *filename, int line); // internal state - parsed_expression m_condition; // condition under which this is executed - parsed_expression m_expression; // expression to execute - std::string m_format; // string format to print - std::vector<std::unique_ptr<output_argument>> m_arglist; // list of arguments - INT8 m_line; // which line to print on - ui::text_layout::text_justify m_justify; // justification when printing + parsed_expression m_condition; // condition under which this is executed + parsed_expression m_expression; // expression to execute + std::string m_format; // string format to print + std::vector<std::unique_ptr<output_argument>> m_arglist; // list of arguments + INT8 m_line; // which line to print on + ui::text_layout::text_justify m_justify; // justification when printing // constants static const int MAX_ARGUMENTS = 32; @@ -306,12 +306,12 @@ private: std::vector<std::unique_ptr<cheat_entry>> m_cheatlist; // cheat list UINT64 m_framecount; // frame count std::vector<std::string> m_output; // array of output strings - std::vector<ui::text_layout::text_justify> m_justify; // justification for each string + std::vector<ui::text_layout::text_justify> m_justify; // justification for each string UINT8 m_numlines; // number of lines available for output INT8 m_lastline; // last line used for output bool m_disabled; // true if the cheat engine is disabled symbol_table m_symtable; // global symbol table - std::unique_ptr<debugger_cpu> m_cpu; // debugger interface for cpus/memory + std::unique_ptr<debugger_cpu> m_cpu; // debugger interface for cpus/memory // constants static constexpr int CHEAT_VERSION = 1; diff --git a/src/frontend/mame/ui/auditmenu.cpp b/src/frontend/mame/ui/auditmenu.cpp index 5da65f597c9..84af69df8cc 100644 --- a/src/frontend/mame/ui/auditmenu.cpp +++ b/src/frontend/mame/ui/auditmenu.cpp @@ -18,7 +18,6 @@ extern const char UI_VERSION_TAG[]; namespace ui { - //------------------------------------------------- // sort //------------------------------------------------- diff --git a/src/frontend/mame/ui/auditmenu.h b/src/frontend/mame/ui/auditmenu.h index 957fc79ae00..a7427c2861e 100644 --- a/src/frontend/mame/ui/auditmenu.h +++ b/src/frontend/mame/ui/auditmenu.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - //------------------------------------------------- // class audit menu //------------------------------------------------- diff --git a/src/frontend/mame/ui/barcode.cpp b/src/frontend/mame/ui/barcode.cpp index 76bef2757ee..bde8324cb1c 100644 --- a/src/frontend/mame/ui/barcode.cpp +++ b/src/frontend/mame/ui/barcode.cpp @@ -14,7 +14,6 @@ #include "ui/ui.h" namespace ui { - // itemrefs for key menu items #define ITEMREF_NEW_BARCODE ((void *) 0x0001) #define ITEMREF_ENTER_BARCODE ((void *) 0x0002) @@ -157,4 +156,4 @@ void menu_barcode_reader::handle() } } -} // namespace ui
\ No newline at end of file +} // namespace ui diff --git a/src/frontend/mame/ui/barcode.h b/src/frontend/mame/ui/barcode.h index 5e42e64ce65..114e797a5f8 100644 --- a/src/frontend/mame/ui/barcode.h +++ b/src/frontend/mame/ui/barcode.h @@ -17,7 +17,6 @@ #include "ui/devctrl.h" namespace ui { - class menu_barcode_reader : public menu_device_control<barcode_reader_device> { public: menu_barcode_reader(mame_ui_manager &mui, render_container *container, barcode_reader_device *device); diff --git a/src/frontend/mame/ui/cheatopt.cpp b/src/frontend/mame/ui/cheatopt.cpp index f72eed5d20f..b54e5e7ee3a 100644 --- a/src/frontend/mame/ui/cheatopt.cpp +++ b/src/frontend/mame/ui/cheatopt.cpp @@ -18,7 +18,6 @@ namespace ui { - // itemrefs for key menu items #define ITEMREF_CHEATS_RESET_ALL ((void *) 0x0001) #define ITEMREF_CHEATS_RELOAD_ALL ((void *) 0x0002) diff --git a/src/frontend/mame/ui/cheatopt.h b/src/frontend/mame/ui/cheatopt.h index 1bad6fbab9c..349ed4bf29c 100644 --- a/src/frontend/mame/ui/cheatopt.h +++ b/src/frontend/mame/ui/cheatopt.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - class menu_cheat : public menu { public: diff --git a/src/frontend/mame/ui/custmenu.cpp b/src/frontend/mame/ui/custmenu.cpp index 67c056be682..d293bd1c495 100644 --- a/src/frontend/mame/ui/custmenu.cpp +++ b/src/frontend/mame/ui/custmenu.cpp @@ -18,7 +18,6 @@ namespace ui { - /************************************************** MENU CUSTOM FILTER **************************************************/ diff --git a/src/frontend/mame/ui/custmenu.h b/src/frontend/mame/ui/custmenu.h index 6394e7d245e..9bd4ba9b4ef 100644 --- a/src/frontend/mame/ui/custmenu.h +++ b/src/frontend/mame/ui/custmenu.h @@ -18,7 +18,6 @@ #include "ui/utils.h" namespace ui { - // Software region struct c_sw_region { diff --git a/src/frontend/mame/ui/custui.cpp b/src/frontend/mame/ui/custui.cpp index 4cb4450b9ce..6e9a8a0ca6f 100644 --- a/src/frontend/mame/ui/custui.cpp +++ b/src/frontend/mame/ui/custui.cpp @@ -20,7 +20,6 @@ #include "osdepend.h" namespace ui { - const char *const menu_custom_ui::hide_status[] = { __("Show All"), __("Hide Filters"), diff --git a/src/frontend/mame/ui/custui.h b/src/frontend/mame/ui/custui.h index 7cf10d44a45..4e861bf9618 100644 --- a/src/frontend/mame/ui/custui.h +++ b/src/frontend/mame/ui/custui.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - //------------------------------------------------- // Custom UI menu //------------------------------------------------- diff --git a/src/frontend/mame/ui/datfile.cpp b/src/frontend/mame/ui/datfile.cpp index ea391a9eadf..ee196d11668 100644 --- a/src/frontend/mame/ui/datfile.cpp +++ b/src/frontend/mame/ui/datfile.cpp @@ -60,7 +60,7 @@ bool datfile_manager::first_run = true; //------------------------------------------------- // ctor //------------------------------------------------- -datfile_manager::datfile_manager(running_machine &machine, ui_options &moptions) +datfile_manager::datfile_manager(running_machine &machine, ui_options &moptions) : m_machine(machine) , m_options(moptions) { diff --git a/src/frontend/mame/ui/datmenu.cpp b/src/frontend/mame/ui/datmenu.cpp index 5aa43f74a39..7396541962c 100644 --- a/src/frontend/mame/ui/datmenu.cpp +++ b/src/frontend/mame/ui/datmenu.cpp @@ -20,7 +20,6 @@ #include "softlist.h" namespace ui { - //------------------------------------------------- // ctor / dtor //------------------------------------------------- diff --git a/src/frontend/mame/ui/datmenu.h b/src/frontend/mame/ui/datmenu.h index 44797dd243c..fb896781ef9 100644 --- a/src/frontend/mame/ui/datmenu.h +++ b/src/frontend/mame/ui/datmenu.h @@ -23,7 +23,6 @@ struct ui_software_info; namespace ui { - //------------------------------------------------- // class dats menu //------------------------------------------------- diff --git a/src/frontend/mame/ui/devctrl.h b/src/frontend/mame/ui/devctrl.h index 23c8243ffce..21505e0a0e7 100644 --- a/src/frontend/mame/ui/devctrl.h +++ b/src/frontend/mame/ui/devctrl.h @@ -26,7 +26,6 @@ #include "ui/menu.h" namespace ui { - template<class DeviceType> class menu_device_control : public menu { diff --git a/src/frontend/mame/ui/devopt.cpp b/src/frontend/mame/ui/devopt.cpp index 52e0264b43f..5b3b97a8907 100644 --- a/src/frontend/mame/ui/devopt.cpp +++ b/src/frontend/mame/ui/devopt.cpp @@ -14,7 +14,6 @@ namespace ui { - /*------------------------------------------------- device_config - handle the game information menu diff --git a/src/frontend/mame/ui/devopt.h b/src/frontend/mame/ui/devopt.h index 7cc3f26516d..0079291323a 100644 --- a/src/frontend/mame/ui/devopt.h +++ b/src/frontend/mame/ui/devopt.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - class menu_device_config : public menu { public: diff --git a/src/frontend/mame/ui/dirmenu.cpp b/src/frontend/mame/ui/dirmenu.cpp index 1a500e14482..1d63fb1cdde 100644 --- a/src/frontend/mame/ui/dirmenu.cpp +++ b/src/frontend/mame/ui/dirmenu.cpp @@ -21,7 +21,6 @@ namespace ui { - static int ADDING = 1; static int CHANGE = 2; diff --git a/src/frontend/mame/ui/dirmenu.h b/src/frontend/mame/ui/dirmenu.h index 17cf28726aa..b9f07a33b3e 100644 --- a/src/frontend/mame/ui/dirmenu.h +++ b/src/frontend/mame/ui/dirmenu.h @@ -19,7 +19,6 @@ #include <vector> namespace ui { - //------------------------------------------------- // class directory menu //------------------------------------------------- diff --git a/src/frontend/mame/ui/filemngr.cpp b/src/frontend/mame/ui/filemngr.cpp index ee24c78aa33..403f7373e2c 100644 --- a/src/frontend/mame/ui/filemngr.cpp +++ b/src/frontend/mame/ui/filemngr.cpp @@ -23,7 +23,6 @@ namespace ui { - /*************************************************************************** FILE MANAGER ***************************************************************************/ @@ -215,4 +214,4 @@ void menu_file_manager::force_file_manager(mame_ui_manager &mui, render_containe mui.machine().pause(); } -} // namespace ui
\ No newline at end of file +} // namespace ui diff --git a/src/frontend/mame/ui/filemngr.h b/src/frontend/mame/ui/filemngr.h index 4fa88531290..25f364ea487 100644 --- a/src/frontend/mame/ui/filemngr.h +++ b/src/frontend/mame/ui/filemngr.h @@ -14,7 +14,6 @@ #define MAME_FRONTEND_UI_FILEMNGR_H namespace ui { - class menu_file_manager : public menu { public: diff --git a/src/frontend/mame/ui/filesel.cpp b/src/frontend/mame/ui/filesel.cpp index 1fe8c8e0bf4..2dd8efa34ec 100644 --- a/src/frontend/mame/ui/filesel.cpp +++ b/src/frontend/mame/ui/filesel.cpp @@ -25,7 +25,6 @@ namespace ui { - /*************************************************************************** CONSTANTS ***************************************************************************/ diff --git a/src/frontend/mame/ui/filesel.h b/src/frontend/mame/ui/filesel.h index 571c11e4413..a487db4e7b7 100644 --- a/src/frontend/mame/ui/filesel.h +++ b/src/frontend/mame/ui/filesel.h @@ -18,7 +18,6 @@ class floppy_image_format_t; namespace ui { - // ======================> menu_confirm_save_as class menu_confirm_save_as : public menu @@ -101,7 +100,7 @@ private: bool m_has_create; int * m_result; file_selector_entry * m_entrylist; - std::string m_hover_directory; + std::string m_hover_directory; char m_filename_buffer[1024]; // methods diff --git a/src/frontend/mame/ui/floppycntrl.cpp b/src/frontend/mame/ui/floppycntrl.cpp index e80f51babcb..55a496c13ff 100644 --- a/src/frontend/mame/ui/floppycntrl.cpp +++ b/src/frontend/mame/ui/floppycntrl.cpp @@ -15,7 +15,6 @@ namespace ui { - /*************************************************************************** IMPLEMENTATION ***************************************************************************/ diff --git a/src/frontend/mame/ui/floppycntrl.h b/src/frontend/mame/ui/floppycntrl.h index 2c9cc310c0d..2902b8bf13c 100644 --- a/src/frontend/mame/ui/floppycntrl.h +++ b/src/frontend/mame/ui/floppycntrl.h @@ -17,7 +17,6 @@ #include "formats/flopimg.h" namespace ui { - class menu_control_floppy_image : public menu_control_device_image { public: diff --git a/src/frontend/mame/ui/imgcntrl.cpp b/src/frontend/mame/ui/imgcntrl.cpp index 3468fa04b2d..06ad1e157b2 100644 --- a/src/frontend/mame/ui/imgcntrl.cpp +++ b/src/frontend/mame/ui/imgcntrl.cpp @@ -24,7 +24,6 @@ namespace ui { - /*************************************************************************** IMPLEMENTATION ***************************************************************************/ diff --git a/src/frontend/mame/ui/imgcntrl.h b/src/frontend/mame/ui/imgcntrl.h index aac63a65702..d32acf836b0 100644 --- a/src/frontend/mame/ui/imgcntrl.h +++ b/src/frontend/mame/ui/imgcntrl.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - // ======================> menu_control_device_image class menu_control_device_image : public menu diff --git a/src/frontend/mame/ui/info.cpp b/src/frontend/mame/ui/info.cpp index f76d14b89ce..575acc2eca8 100644 --- a/src/frontend/mame/ui/info.cpp +++ b/src/frontend/mame/ui/info.cpp @@ -16,7 +16,6 @@ #include "softlist.h" namespace ui { - /*------------------------------------------------- menu_game_info - handle the game information menu diff --git a/src/frontend/mame/ui/info.h b/src/frontend/mame/ui/info.h index 5e9e6719b2b..e76c33cd669 100644 --- a/src/frontend/mame/ui/info.h +++ b/src/frontend/mame/ui/info.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - class menu_game_info : public menu { public: diff --git a/src/frontend/mame/ui/info_pty.cpp b/src/frontend/mame/ui/info_pty.cpp index 30567a03453..8a8d22e41ce 100644 --- a/src/frontend/mame/ui/info_pty.cpp +++ b/src/frontend/mame/ui/info_pty.cpp @@ -14,7 +14,6 @@ namespace ui { - menu_pty_info::menu_pty_info(mame_ui_manager &mui, render_container *container) : menu(mui, container) { diff --git a/src/frontend/mame/ui/info_pty.h b/src/frontend/mame/ui/info_pty.h index acad9005906..46829bd3f0c 100644 --- a/src/frontend/mame/ui/info_pty.h +++ b/src/frontend/mame/ui/info_pty.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - class menu_pty_info : public menu { public: diff --git a/src/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp index 0762db03a9e..976dfc590ea 100644 --- a/src/frontend/mame/ui/inputmap.cpp +++ b/src/frontend/mame/ui/inputmap.cpp @@ -17,7 +17,6 @@ namespace ui { - /*************************************************************************** CONSTANTS ***************************************************************************/ diff --git a/src/frontend/mame/ui/inputmap.h b/src/frontend/mame/ui/inputmap.h index ef14ef9b064..290125c734f 100644 --- a/src/frontend/mame/ui/inputmap.h +++ b/src/frontend/mame/ui/inputmap.h @@ -17,7 +17,6 @@ namespace ui { - class menu_input_groups : public menu { public: diff --git a/src/frontend/mame/ui/mainmenu.cpp b/src/frontend/mame/ui/mainmenu.cpp index 70e766cd38b..827e98b90b6 100644 --- a/src/frontend/mame/ui/mainmenu.cpp +++ b/src/frontend/mame/ui/mainmenu.cpp @@ -36,7 +36,6 @@ namespace ui { - /*************************************************************************** MENU HANDLERS ***************************************************************************/ diff --git a/src/frontend/mame/ui/mainmenu.h b/src/frontend/mame/ui/mainmenu.h index 40063bab0d3..0a60d594f92 100644 --- a/src/frontend/mame/ui/mainmenu.h +++ b/src/frontend/mame/ui/mainmenu.h @@ -14,7 +14,6 @@ #define MAME_FRONTEND_UI_MAINMENU_H namespace ui { - class menu_main : public menu { public: diff --git a/src/frontend/mame/ui/menu.cpp b/src/frontend/mame/ui/menu.cpp index 817eb64097c..a3b9b13a255 100644 --- a/src/frontend/mame/ui/menu.cpp +++ b/src/frontend/mame/ui/menu.cpp @@ -29,7 +29,6 @@ namespace ui { - /*************************************************************************** CONSTANTS ***************************************************************************/ @@ -2446,7 +2445,7 @@ void menu::draw_common_arrow(float origx1, float origy1, float origx2, float ori float menu::draw_icon(int linenum, void *selectedref, float x0, float y0) { - if (!ui_globals::has_icons || (item[0].flags & FLAG_UI_SWLIST)) + if (!ui_globals::has_icons || (item[0].flags & FLAG_UI_SWLIST)) return 0.0f; float ud_arrow_width = ui().get_line_height() * container->manager().ui_aspect(container); @@ -2948,7 +2947,7 @@ void menu::extra_text_draw_box(float origx1, float origx2, float origy, float ys //------------------------------------------------- // extra_text_position - given extra text that has -// been put into a layout, position it +// been put into a layout, position it //------------------------------------------------- void menu::extra_text_position(float origx1, float origx2, float origy, float yspan, text_layout &layout, diff --git a/src/frontend/mame/ui/menu.h b/src/frontend/mame/ui/menu.h index d1e3b500898..3d7a60219aa 100644 --- a/src/frontend/mame/ui/menu.h +++ b/src/frontend/mame/ui/menu.h @@ -23,7 +23,6 @@ namespace ui { - /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ diff --git a/src/frontend/mame/ui/menuitem.h b/src/frontend/mame/ui/menuitem.h index 58a8b50d07b..1cfd8f1c1cf 100644 --- a/src/frontend/mame/ui/menuitem.h +++ b/src/frontend/mame/ui/menuitem.h @@ -17,7 +17,6 @@ #include "emu.h" namespace ui { - // special menu item for separators #define MENU_SEPARATOR_ITEM "---" diff --git a/src/frontend/mame/ui/miscmenu.cpp b/src/frontend/mame/ui/miscmenu.cpp index f48110dc6da..76b834cefa4 100644 --- a/src/frontend/mame/ui/miscmenu.cpp +++ b/src/frontend/mame/ui/miscmenu.cpp @@ -24,7 +24,6 @@ #include "ui/submenu.h" namespace ui { - /*************************************************************************** MENU HANDLERS ***************************************************************************/ diff --git a/src/frontend/mame/ui/miscmenu.h b/src/frontend/mame/ui/miscmenu.h index 01348d4be41..86d7477c1db 100644 --- a/src/frontend/mame/ui/miscmenu.h +++ b/src/frontend/mame/ui/miscmenu.h @@ -21,7 +21,6 @@ namespace ui { - class menu_keyboard_mode : public menu { public: diff --git a/src/frontend/mame/ui/optsmenu.cpp b/src/frontend/mame/ui/optsmenu.cpp index 6872c3498da..32200489888 100644 --- a/src/frontend/mame/ui/optsmenu.cpp +++ b/src/frontend/mame/ui/optsmenu.cpp @@ -27,7 +27,6 @@ #include "rendfont.h" namespace ui { - //------------------------------------------------- // ctor //------------------------------------------------- diff --git a/src/frontend/mame/ui/optsmenu.h b/src/frontend/mame/ui/optsmenu.h index b8ee8ebc628..6c388163d51 100644 --- a/src/frontend/mame/ui/optsmenu.h +++ b/src/frontend/mame/ui/optsmenu.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - class menu_game_options : public menu { public: diff --git a/src/frontend/mame/ui/pluginopt.cpp b/src/frontend/mame/ui/pluginopt.cpp index 71a0a0aceee..b9c0c238033 100644 --- a/src/frontend/mame/ui/pluginopt.cpp +++ b/src/frontend/mame/ui/pluginopt.cpp @@ -17,7 +17,6 @@ namespace ui { - void menu_plugin::handle() { const event *menu_event = process(0); diff --git a/src/frontend/mame/ui/pluginopt.h b/src/frontend/mame/ui/pluginopt.h index 9a4470d11f7..83f40b44fd8 100644 --- a/src/frontend/mame/ui/pluginopt.h +++ b/src/frontend/mame/ui/pluginopt.h @@ -21,7 +21,6 @@ namespace ui { - class menu_plugin : public menu { public: diff --git a/src/frontend/mame/ui/selector.cpp b/src/frontend/mame/ui/selector.cpp index e1f05e6e47d..ceeec87e199 100644 --- a/src/frontend/mame/ui/selector.cpp +++ b/src/frontend/mame/ui/selector.cpp @@ -17,7 +17,6 @@ #include "mame.h" namespace ui { - //------------------------------------------------- // ctor / dtor //------------------------------------------------- diff --git a/src/frontend/mame/ui/selector.h b/src/frontend/mame/ui/selector.h index 9c13b15c3b3..2b6747e2c80 100644 --- a/src/frontend/mame/ui/selector.h +++ b/src/frontend/mame/ui/selector.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - //------------------------------------------------- // class selector menu //------------------------------------------------- diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp index 87a8ebaec79..6300bec7d32 100644 --- a/src/frontend/mame/ui/selgame.cpp +++ b/src/frontend/mame/ui/selgame.cpp @@ -37,7 +37,6 @@ extern const char UI_VERSION_TAG[]; namespace ui { - static bool first_start = true; static const char *dats_info[] = { __("General Info"), @@ -1100,11 +1099,11 @@ void menu_select_game::inkey_select_favorite(const event *menu_event) // special case for configure machine else if ((FPTR)ui_swinfo == CONF_MACHINE) { - if (m_prev_selected != nullptr) - { - ui_software_info *swinfo = (ui_software_info *)m_prev_selected; + if (m_prev_selected != nullptr) + { + ui_software_info *swinfo = (ui_software_info *)m_prev_selected; menu::stack_push<menu_machine_configure>(ui(), container, (const game_driver *)swinfo->driver); - } + } return; } // special case for configure plugins diff --git a/src/frontend/mame/ui/selgame.h b/src/frontend/mame/ui/selgame.h index 074db944b4c..b826dfaf5fc 100644 --- a/src/frontend/mame/ui/selgame.h +++ b/src/frontend/mame/ui/selgame.h @@ -17,7 +17,6 @@ namespace ui { - class menu_select_game : public menu { public: diff --git a/src/frontend/mame/ui/selsoft.cpp b/src/frontend/mame/ui/selsoft.cpp index 81c0bc97afe..d88d7bfc904 100644 --- a/src/frontend/mame/ui/selsoft.cpp +++ b/src/frontend/mame/ui/selsoft.cpp @@ -29,7 +29,6 @@ namespace ui { - std::string reselect_last::driver; std::string reselect_last::software; std::string reselect_last::swlist; diff --git a/src/frontend/mame/ui/selsoft.h b/src/frontend/mame/ui/selsoft.h index 478f7add19d..faf178565f2 100644 --- a/src/frontend/mame/ui/selsoft.h +++ b/src/frontend/mame/ui/selsoft.h @@ -15,7 +15,6 @@ #include "ui/custmenu.h" namespace ui { - using s_bios = std::vector<std::pair<std::string, int>>; using s_parts = std::unordered_map<std::string, std::string>; diff --git a/src/frontend/mame/ui/simpleselgame.cpp b/src/frontend/mame/ui/simpleselgame.cpp index c947279a001..a061eae97f8 100644 --- a/src/frontend/mame/ui/simpleselgame.cpp +++ b/src/frontend/mame/ui/simpleselgame.cpp @@ -26,7 +26,6 @@ namespace ui { - //------------------------------------------------- // ctor //------------------------------------------------- diff --git a/src/frontend/mame/ui/simpleselgame.h b/src/frontend/mame/ui/simpleselgame.h index ee185d5b4a6..8df2a047f9a 100644 --- a/src/frontend/mame/ui/simpleselgame.h +++ b/src/frontend/mame/ui/simpleselgame.h @@ -18,7 +18,6 @@ class driver_enumerator; namespace ui { - class simple_menu_select_game : public menu { public: simple_menu_select_game(mame_ui_manager &mui, render_container *container, const char *gamename); diff --git a/src/frontend/mame/ui/slider.h b/src/frontend/mame/ui/slider.h index 7cd4b580831..431fa8fcb94 100644 --- a/src/frontend/mame/ui/slider.h +++ b/src/frontend/mame/ui/slider.h @@ -26,7 +26,7 @@ typedef std::function<INT32(running_machine&, void*, int, std::string*, INT32)> struct slider_state { slider_state * next; /* pointer to next slider */ - slider_update update; /* callback */ + slider_update update; /* callback */ void * arg; /* argument */ INT32 minval; /* minimum value */ INT32 defval; /* default value */ diff --git a/src/frontend/mame/ui/sliders.cpp b/src/frontend/mame/ui/sliders.cpp index 31904c73a02..f8854b0aaca 100644 --- a/src/frontend/mame/ui/sliders.cpp +++ b/src/frontend/mame/ui/sliders.cpp @@ -17,7 +17,6 @@ #include "ui/slider.h" namespace ui { - menu_sliders::menu_sliders(mame_ui_manager &mui, render_container *container, bool menuless_mode) : menu(mui, container) { m_menuless_mode = m_hidden = menuless_mode; @@ -28,7 +27,7 @@ menu_sliders::~menu_sliders() } //------------------------------------------------- -// menu_sliders - handle the sliders menu +// menu_sliders - handle the sliders menu //------------------------------------------------- void menu_sliders::handle() @@ -132,8 +131,8 @@ void menu_sliders::handle() //------------------------------------------------- -// menu_sliders_populate - populate the sliders -// menu +// menu_sliders_populate - populate the sliders +// menu //------------------------------------------------- void menu_sliders::populate() @@ -188,8 +187,8 @@ void menu_sliders::populate() } //------------------------------------------------- -// menu_sliders_custom_render - perform our special -// rendering +// menu_sliders_custom_render - perform our special +// rendering //------------------------------------------------- void menu_sliders::custom_render(void *selectedref, float top, float bottom, float x1, float y1, float x2, float y2) @@ -259,9 +258,9 @@ void menu_sliders::custom_render(void *selectedref, float top, float bottom, flo //------------------------------------------------- -// slider_ui_handler - pushes the slider -// menu on the stack and hands off to the -// standard menu handler +// slider_ui_handler - pushes the slider +// menu on the stack and hands off to the +// standard menu handler //------------------------------------------------- UINT32 menu_sliders::ui_handler(render_container *container, mame_ui_manager &mui) diff --git a/src/frontend/mame/ui/sliders.h b/src/frontend/mame/ui/sliders.h index bfb5bc26f4e..147674b7375 100644 --- a/src/frontend/mame/ui/sliders.h +++ b/src/frontend/mame/ui/sliders.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - class menu_sliders : public menu { public: diff --git a/src/frontend/mame/ui/slotopt.cpp b/src/frontend/mame/ui/slotopt.cpp index 5c97dc594a0..a5249739236 100644 --- a/src/frontend/mame/ui/slotopt.cpp +++ b/src/frontend/mame/ui/slotopt.cpp @@ -19,7 +19,6 @@ namespace ui { - /*------------------------------------------------- slot_get_current_option - returns -------------------------------------------------*/ diff --git a/src/frontend/mame/ui/slotopt.h b/src/frontend/mame/ui/slotopt.h index 923c6131d5e..e1883fe33d7 100644 --- a/src/frontend/mame/ui/slotopt.h +++ b/src/frontend/mame/ui/slotopt.h @@ -17,7 +17,6 @@ namespace ui { - class menu_slot_devices : public menu { public: diff --git a/src/frontend/mame/ui/sndmenu.cpp b/src/frontend/mame/ui/sndmenu.cpp index 72c5068c3ac..a4f32222aa6 100644 --- a/src/frontend/mame/ui/sndmenu.cpp +++ b/src/frontend/mame/ui/sndmenu.cpp @@ -15,7 +15,6 @@ #include "../osd/modules/lib/osdobj_common.h" // TODO: remove namespace ui { - const int menu_sound_options::m_sound_rate[] = { 11025, 22050, 44100, 48000 }; //------------------------------------------------- diff --git a/src/frontend/mame/ui/sndmenu.h b/src/frontend/mame/ui/sndmenu.h index bc7fbeb21b8..171e4016759 100644 --- a/src/frontend/mame/ui/sndmenu.h +++ b/src/frontend/mame/ui/sndmenu.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - //------------------------------------------------- // class sound options menu //------------------------------------------------- diff --git a/src/frontend/mame/ui/submenu.cpp b/src/frontend/mame/ui/submenu.cpp index 6cabf4e784a..4721ed87b1c 100644 --- a/src/frontend/mame/ui/submenu.cpp +++ b/src/frontend/mame/ui/submenu.cpp @@ -17,7 +17,6 @@ #include <limits> namespace ui { - std::vector<submenu::option> submenu::misc_options = { { submenu::option_type::HEAD, __("Miscellaneous Options") }, { submenu::option_type::UI, __("Re-select last machine played"), OPTION_REMEMBER_LAST }, diff --git a/src/frontend/mame/ui/submenu.h b/src/frontend/mame/ui/submenu.h index ccee31ab11e..8631b4b001f 100644 --- a/src/frontend/mame/ui/submenu.h +++ b/src/frontend/mame/ui/submenu.h @@ -26,7 +26,6 @@ namespace ui { - //------------------------------------------------- // class ui menu //------------------------------------------------- diff --git a/src/frontend/mame/ui/swlist.cpp b/src/frontend/mame/ui/swlist.cpp index 02def0f940b..05b95153a4a 100644 --- a/src/frontend/mame/ui/swlist.cpp +++ b/src/frontend/mame/ui/swlist.cpp @@ -17,7 +17,6 @@ namespace ui { - /*************************************************************************** CONSTANTS ***************************************************************************/ diff --git a/src/frontend/mame/ui/swlist.h b/src/frontend/mame/ui/swlist.h index 7ffccc50ec1..eef8e454139 100644 --- a/src/frontend/mame/ui/swlist.h +++ b/src/frontend/mame/ui/swlist.h @@ -15,7 +15,6 @@ namespace ui { - // ======================> menu_software_parts class menu_software_parts : public menu diff --git a/src/frontend/mame/ui/tapectrl.cpp b/src/frontend/mame/ui/tapectrl.cpp index 6628af89b03..973de43c1a9 100644 --- a/src/frontend/mame/ui/tapectrl.cpp +++ b/src/frontend/mame/ui/tapectrl.cpp @@ -13,7 +13,6 @@ #include "ui/tapectrl.h" namespace ui { - /*************************************************************************** CONSTANTS ***************************************************************************/ diff --git a/src/frontend/mame/ui/tapectrl.h b/src/frontend/mame/ui/tapectrl.h index 566aed7288a..09f50d844b0 100644 --- a/src/frontend/mame/ui/tapectrl.h +++ b/src/frontend/mame/ui/tapectrl.h @@ -17,7 +17,6 @@ #include "ui/devctrl.h" namespace ui { - class menu_tape_control : public menu_device_control<cassette_image_device> { public: diff --git a/src/frontend/mame/ui/text.cpp b/src/frontend/mame/ui/text.cpp index fbd9e8de5d2..02cc3c59030 100644 --- a/src/frontend/mame/ui/text.cpp +++ b/src/frontend/mame/ui/text.cpp @@ -2,9 +2,9 @@ // copyright-holders:Nicola Salmoria, Aaron Giles, Nathan Woods /********************************************************************* - text.cpp + text.cpp - Text functionality for MAME's crude user interface + Text functionality for MAME's crude user interface *********************************************************************/ @@ -13,7 +13,6 @@ #include "render.h" namespace ui { - /*************************************************************************** INLINE FUNCTIONS ***************************************************************************/ @@ -91,7 +90,7 @@ text_layout::text_layout(render_font &font, float xscale, float yscale, float wi text_layout::text_layout(text_layout &&that) : m_font(that.m_font), m_xscale(that.m_xscale), m_yscale(that.m_yscale), m_width(that.m_width), m_calculated_actual_width(that.m_calculated_actual_width), m_justify(that.m_justify), m_wrap(that.m_wrap), m_lines(std::move(that.m_lines)), - m_current_line(that.m_current_line), m_last_break(that.m_last_break), m_text_position(that.m_text_position), m_truncating(false) + m_current_line(that.m_current_line), m_last_break(that.m_last_break), m_text_position(that.m_text_position), m_truncating(false) { that.invalidate_calculated_actual_width(); } @@ -475,7 +474,7 @@ void text_layout::emit(render_container *container, float x, float y) for (auto i = 0; i < line->character_count(); i++) { auto &ch = line->character(i); - + // position this specific character correctly (TODO - this doesn't // handle differently sized text (yet) float char_x = x + line_xoffset + ch.xoffset; diff --git a/src/frontend/mame/ui/text.h b/src/frontend/mame/ui/text.h index edcaf35b3c7..5db5aef7216 100644 --- a/src/frontend/mame/ui/text.h +++ b/src/frontend/mame/ui/text.h @@ -2,9 +2,9 @@ // copyright-holders:Nicola Salmoria, Aaron Giles, Nathan Woods /*************************************************************************** - text.h + text.h - Text functionality for MAME's crude user interface + Text functionality for MAME's crude user interface ***************************************************************************/ @@ -20,7 +20,6 @@ class render_font; class render_container; namespace ui { - /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ diff --git a/src/frontend/mame/ui/ui.h b/src/frontend/mame/ui/ui.h index d02e9dd2037..77c33c4119b 100644 --- a/src/frontend/mame/ui/ui.h +++ b/src/frontend/mame/ui/ui.h @@ -24,7 +24,6 @@ #include "ui/text.h" namespace ui { - class menu_item; } // namespace ui @@ -70,57 +69,57 @@ class menu_item; /* cancel return value for a UI handler */ #define UI_HANDLER_CANCEL ((UINT32)~0) -#define SLIDER_DEVICE_SPACING 0x0ff -#define SLIDER_SCREEN_SPACING 0x0f -#define SLIDER_INPUT_SPACING 0x0f +#define SLIDER_DEVICE_SPACING 0x0ff +#define SLIDER_SCREEN_SPACING 0x0f +#define SLIDER_INPUT_SPACING 0x0f enum { - SLIDER_ID_VOLUME = 0, + SLIDER_ID_VOLUME = 0, SLIDER_ID_MIXERVOL, - SLIDER_ID_MIXERVOL_LAST = SLIDER_ID_MIXERVOL + SLIDER_DEVICE_SPACING, + SLIDER_ID_MIXERVOL_LAST = SLIDER_ID_MIXERVOL + SLIDER_DEVICE_SPACING, SLIDER_ID_ADJUSTER, - SLIDER_ID_ADJUSTER_LAST = SLIDER_ID_ADJUSTER + SLIDER_DEVICE_SPACING, + SLIDER_ID_ADJUSTER_LAST = SLIDER_ID_ADJUSTER + SLIDER_DEVICE_SPACING, SLIDER_ID_OVERCLOCK, - SLIDER_ID_OVERCLOCK_LAST = SLIDER_ID_OVERCLOCK + SLIDER_DEVICE_SPACING, + SLIDER_ID_OVERCLOCK_LAST = SLIDER_ID_OVERCLOCK + SLIDER_DEVICE_SPACING, SLIDER_ID_REFRESH, - SLIDER_ID_REFRESH_LAST = SLIDER_ID_REFRESH + SLIDER_SCREEN_SPACING, + SLIDER_ID_REFRESH_LAST = SLIDER_ID_REFRESH + SLIDER_SCREEN_SPACING, SLIDER_ID_BRIGHTNESS, - SLIDER_ID_BRIGHTNESS_LAST = SLIDER_ID_BRIGHTNESS + SLIDER_SCREEN_SPACING, + SLIDER_ID_BRIGHTNESS_LAST = SLIDER_ID_BRIGHTNESS + SLIDER_SCREEN_SPACING, SLIDER_ID_CONTRAST, - SLIDER_ID_CONTRAST_LAST = SLIDER_ID_CONTRAST + SLIDER_SCREEN_SPACING, + SLIDER_ID_CONTRAST_LAST = SLIDER_ID_CONTRAST + SLIDER_SCREEN_SPACING, SLIDER_ID_GAMMA, - SLIDER_ID_GAMMA_LAST = SLIDER_ID_GAMMA + SLIDER_SCREEN_SPACING, + SLIDER_ID_GAMMA_LAST = SLIDER_ID_GAMMA + SLIDER_SCREEN_SPACING, SLIDER_ID_XSCALE, - SLIDER_ID_XSCALE_LAST = SLIDER_ID_XSCALE + SLIDER_SCREEN_SPACING, + SLIDER_ID_XSCALE_LAST = SLIDER_ID_XSCALE + SLIDER_SCREEN_SPACING, SLIDER_ID_YSCALE, - SLIDER_ID_YSCALE_LAST = SLIDER_ID_YSCALE + SLIDER_SCREEN_SPACING, + SLIDER_ID_YSCALE_LAST = SLIDER_ID_YSCALE + SLIDER_SCREEN_SPACING, SLIDER_ID_XOFFSET, - SLIDER_ID_XOFFSET_LAST = SLIDER_ID_XOFFSET + SLIDER_SCREEN_SPACING, + SLIDER_ID_XOFFSET_LAST = SLIDER_ID_XOFFSET + SLIDER_SCREEN_SPACING, SLIDER_ID_YOFFSET, - SLIDER_ID_YOFFSET_LAST = SLIDER_ID_YOFFSET + SLIDER_SCREEN_SPACING, + SLIDER_ID_YOFFSET_LAST = SLIDER_ID_YOFFSET + SLIDER_SCREEN_SPACING, SLIDER_ID_OVERLAY_XSCALE, - SLIDER_ID_OVERLAY_XSCALE_LAST = SLIDER_ID_OVERLAY_XSCALE + SLIDER_SCREEN_SPACING, + SLIDER_ID_OVERLAY_XSCALE_LAST = SLIDER_ID_OVERLAY_XSCALE + SLIDER_SCREEN_SPACING, SLIDER_ID_OVERLAY_YSCALE, - SLIDER_ID_OVERLAY_YSCALE_LAST = SLIDER_ID_OVERLAY_YSCALE + SLIDER_SCREEN_SPACING, + SLIDER_ID_OVERLAY_YSCALE_LAST = SLIDER_ID_OVERLAY_YSCALE + SLIDER_SCREEN_SPACING, SLIDER_ID_OVERLAY_XOFFSET, - SLIDER_ID_OVERLAY_XOFFSET_LAST = SLIDER_ID_OVERLAY_XOFFSET + SLIDER_SCREEN_SPACING, + SLIDER_ID_OVERLAY_XOFFSET_LAST = SLIDER_ID_OVERLAY_XOFFSET + SLIDER_SCREEN_SPACING, SLIDER_ID_OVERLAY_YOFFSET, - SLIDER_ID_OVERLAY_YOFFSET_LAST = SLIDER_ID_OVERLAY_YOFFSET + SLIDER_SCREEN_SPACING, + SLIDER_ID_OVERLAY_YOFFSET_LAST = SLIDER_ID_OVERLAY_YOFFSET + SLIDER_SCREEN_SPACING, SLIDER_ID_FLICKER, - SLIDER_ID_FLICKER_LAST = SLIDER_ID_FLICKER + SLIDER_SCREEN_SPACING, + SLIDER_ID_FLICKER_LAST = SLIDER_ID_FLICKER + SLIDER_SCREEN_SPACING, SLIDER_ID_BEAM_WIDTH_MIN, - SLIDER_ID_BEAM_WIDTH_MIN_LAST = SLIDER_ID_BEAM_WIDTH_MIN + SLIDER_SCREEN_SPACING, + SLIDER_ID_BEAM_WIDTH_MIN_LAST = SLIDER_ID_BEAM_WIDTH_MIN + SLIDER_SCREEN_SPACING, SLIDER_ID_BEAM_WIDTH_MAX, - SLIDER_ID_BEAM_WIDTH_MAX_LAST = SLIDER_ID_BEAM_WIDTH_MAX + SLIDER_SCREEN_SPACING, + SLIDER_ID_BEAM_WIDTH_MAX_LAST = SLIDER_ID_BEAM_WIDTH_MAX + SLIDER_SCREEN_SPACING, SLIDER_ID_BEAM_INTENSITY, - SLIDER_ID_BEAM_INTENSITY_LAST = SLIDER_ID_BEAM_INTENSITY + SLIDER_SCREEN_SPACING, + SLIDER_ID_BEAM_INTENSITY_LAST = SLIDER_ID_BEAM_INTENSITY + SLIDER_SCREEN_SPACING, SLIDER_ID_CROSSHAIR_SCALE, - SLIDER_ID_CROSSHAIR_SCALE_LAST = SLIDER_ID_CROSSHAIR_SCALE + SLIDER_INPUT_SPACING, + SLIDER_ID_CROSSHAIR_SCALE_LAST = SLIDER_ID_CROSSHAIR_SCALE + SLIDER_INPUT_SPACING, SLIDER_ID_CROSSHAIR_OFFSET, - SLIDER_ID_CROSSHAIR_OFFSET_LAST = SLIDER_ID_CROSSHAIR_OFFSET + SLIDER_INPUT_SPACING, + SLIDER_ID_CROSSHAIR_OFFSET_LAST = SLIDER_ID_CROSSHAIR_OFFSET + SLIDER_INPUT_SPACING, - SLIDER_ID_CORE_LAST = SLIDER_ID_CROSSHAIR_OFFSET, + SLIDER_ID_CORE_LAST = SLIDER_ID_CROSSHAIR_OFFSET, SLIDER_ID_CORE_COUNT }; @@ -262,7 +261,7 @@ private: // instance variables render_font * m_font; std::function<UINT32 (render_container *)> m_handler_callback; - ui_callback_type m_handler_callback_type; + ui_callback_type m_handler_callback_type; UINT32 m_handler_param; bool m_single_step; bool m_showfps; diff --git a/src/frontend/mame/ui/utils.cpp b/src/frontend/mame/ui/utils.cpp index 5ad21c6839c..b706e14682a 100644 --- a/src/frontend/mame/ui/utils.cpp +++ b/src/frontend/mame/ui/utils.cpp @@ -98,7 +98,7 @@ std::vector<std::string> tokenize(const std::string &text, char sep) std::vector<std::string> tokens; tokens.reserve(64); std::size_t start = 0, end = 0; - while ((end = text.find(sep, start)) != std::string::npos) + while ((end = text.find(sep, start)) != std::string::npos) { std::string temp = text.substr(start, end - start); if (!temp.empty()) tokens.push_back(temp); diff --git a/src/frontend/mame/ui/videoopt.cpp b/src/frontend/mame/ui/videoopt.cpp index f6debc1c0b0..45c1c52e7fa 100644 --- a/src/frontend/mame/ui/videoopt.cpp +++ b/src/frontend/mame/ui/videoopt.cpp @@ -15,7 +15,6 @@ #include "rendutil.h" namespace ui { - /*------------------------------------------------- menu_video_targets - handle the video targets menu diff --git a/src/frontend/mame/ui/videoopt.h b/src/frontend/mame/ui/videoopt.h index 1f772009144..37148054c8d 100644 --- a/src/frontend/mame/ui/videoopt.h +++ b/src/frontend/mame/ui/videoopt.h @@ -16,7 +16,6 @@ #include "ui/menu.h" namespace ui { - class menu_video_targets : public menu { public: diff --git a/src/frontend/mame/ui/viewgfx.cpp b/src/frontend/mame/ui/viewgfx.cpp index 8e55b8ac86f..3d251becbe1 100644 --- a/src/frontend/mame/ui/viewgfx.cpp +++ b/src/frontend/mame/ui/viewgfx.cpp @@ -1104,7 +1104,7 @@ static void tilemap_handle_keys(running_machine &machine, ui_gfx_state &state, i state.tilemap.yoffs = 0; state.bitmap_dirty = true; } - + // handle navigation (up,down,left,right) step = 8; if (machine.input().code_pressed(KEYCODE_LSHIFT)) step = 1; |