diff options
author | Vas Crabb <vas@vastheman.com> | 2021-11-25 01:55:53 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2021-11-25 01:55:53 +1100 |
commit | c378ea087097d75cd7f4fb69da062048eaaae5e6 (patch) | |
tree | 0711e315d3d2a7fc74cae27f6faea01a6af37f34 /src/frontend/mame/ui | |
parent | 4e74563abb4c8b385baa72d0c2d5f3987fa88652 (diff) |
A little more refactoring, and Coverity fixes:
* emu/ioport.h: Marked PORT_RESET deprecated.
* emu/rendlay.cpp: Removed old dot matrix components.
* emu/rendlay.cpp: Added warning message for reel components.
* Changed a few more fruit machines to eliminate reel components; also
made the reel lamps simpler and more efficient in these layouts.
* emu, frontend: Fixed various errors reported by Coverity, one of which
actaully breaks stuff.
Diffstat (limited to 'src/frontend/mame/ui')
-rw-r--r-- | src/frontend/mame/ui/custui.cpp | 44 | ||||
-rw-r--r-- | src/frontend/mame/ui/custui.h | 10 | ||||
-rw-r--r-- | src/frontend/mame/ui/filesel.h | 5 | ||||
-rw-r--r-- | src/frontend/mame/ui/sndmenu.cpp | 18 | ||||
-rw-r--r-- | src/frontend/mame/ui/sndmenu.h | 2 | ||||
-rw-r--r-- | src/frontend/mame/ui/textbox.cpp | 1 |
6 files changed, 30 insertions, 50 deletions
diff --git a/src/frontend/mame/ui/custui.cpp b/src/frontend/mame/ui/custui.cpp index 62396d7840b..02da9310207 100644 --- a/src/frontend/mame/ui/custui.cpp +++ b/src/frontend/mame/ui/custui.cpp @@ -83,10 +83,10 @@ menu_custom_ui::menu_custom_ui(mame_ui_manager &mui, render_container &container } //------------------------------------------------- -// dtor +// menu dismissed //------------------------------------------------- -menu_custom_ui::~menu_custom_ui() +void menu_custom_ui::menu_dismissed() { ui().options().set_value(OPTION_HIDE_PANELS, ui_globals::panels_status, OPTION_PRIORITY_CMDLINE); @@ -375,10 +375,10 @@ void menu_font_ui::list() } //------------------------------------------------- -// dtor +// menu dismissed //------------------------------------------------- -menu_font_ui::~menu_font_ui() +void menu_font_ui::menu_dismissed() { if (m_changed) { @@ -580,10 +580,10 @@ menu_colors_ui::menu_colors_ui(mame_ui_manager &mui, render_container &container } //------------------------------------------------- -// dtor +// menu dismissed //------------------------------------------------- -menu_colors_ui::~menu_colors_ui() +void menu_colors_ui::menu_dismissed() { std::string dec_color; for (int index = 1; index < MUI_RESTORE; index++) @@ -607,7 +607,7 @@ void menu_colors_ui::handle(event const *ev) { if ((uintptr_t)ev->itemref != MUI_RESTORE) { - menu::stack_push<menu_rgb_ui>(ui(), container(), &m_color_table[(uintptr_t)ev->itemref].color, selected_item().text()); + menu::stack_push<menu_rgb_ui>(ui(), container(), &m_color_table[(uintptr_t)ev->itemref].color, std::string(selected_item().text())); } else { @@ -803,26 +803,18 @@ void menu_colors_ui::restore_colors() // ctor //------------------------------------------------- -menu_rgb_ui::menu_rgb_ui(mame_ui_manager &mui, render_container &container, rgb_t *_color, std::string _title) - : menu(mui, container), - m_color(_color), - m_search(), - m_key_active(false), - m_lock_ref(0), - m_title(_title) +menu_rgb_ui::menu_rgb_ui(mame_ui_manager &mui, render_container &container, rgb_t *color, std::string &&title) + : menu(mui, container) + , m_color(color) + , m_search() + , m_key_active(false) + , m_lock_ref(0) + , m_title(std::move(title)) { set_process_flags(PROCESS_LR_REPEAT); } //------------------------------------------------- -// dtor -//------------------------------------------------- - -menu_rgb_ui::~menu_rgb_ui() -{ -} - -//------------------------------------------------- // handle //------------------------------------------------- @@ -1112,14 +1104,6 @@ menu_palette_sel::menu_palette_sel(mame_ui_manager &mui, render_container &conta } //------------------------------------------------- -// dtor -//------------------------------------------------- - -menu_palette_sel::~menu_palette_sel() -{ -} - -//------------------------------------------------- // handle //------------------------------------------------- diff --git a/src/frontend/mame/ui/custui.h b/src/frontend/mame/ui/custui.h index 34d417c8774..168934b5356 100644 --- a/src/frontend/mame/ui/custui.h +++ b/src/frontend/mame/ui/custui.h @@ -28,10 +28,10 @@ class menu_custom_ui : public menu { public: menu_custom_ui(mame_ui_manager &mui, render_container &container, std::function<void ()> &&handler); - virtual ~menu_custom_ui() override; protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + virtual void menu_dismissed() override; private: virtual void populate(float &customtop, float &custombottom) override; @@ -55,10 +55,10 @@ class menu_font_ui : public menu { public: menu_font_ui(mame_ui_manager &mui, render_container &container, std::function<void (bool)> &&handler); - virtual ~menu_font_ui() override; protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + virtual void menu_dismissed() override; private: virtual void populate(float &customtop, float &custombottom) override; @@ -89,10 +89,10 @@ class menu_colors_ui : public menu { public: menu_colors_ui(mame_ui_manager &mui, render_container &container); - virtual ~menu_colors_ui() override; protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + virtual void menu_dismissed() override; private: enum @@ -136,8 +136,7 @@ private: class menu_rgb_ui : public menu { public: - menu_rgb_ui(mame_ui_manager &mui, render_container &container, rgb_t *_color, std::string _title); - virtual ~menu_rgb_ui() override; + menu_rgb_ui(mame_ui_manager &mui, render_container &container, rgb_t *color, std::string &&title); protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; @@ -172,7 +171,6 @@ class menu_palette_sel : public menu { public: menu_palette_sel(mame_ui_manager &mui, render_container &container, rgb_t &_color); - virtual ~menu_palette_sel() override; private: virtual void populate(float &customtop, float &custombottom) override; diff --git a/src/frontend/mame/ui/filesel.h b/src/frontend/mame/ui/filesel.h index 9f7eea7dbea..11e5643c2de 100644 --- a/src/frontend/mame/ui/filesel.h +++ b/src/frontend/mame/ui/filesel.h @@ -61,10 +61,11 @@ private: struct file_selector_entry { - file_selector_entry() { } + file_selector_entry() = default; file_selector_entry(file_selector_entry &&) = default; file_selector_entry &operator=(file_selector_entry &&) = default; - file_selector_entry_type type; + + file_selector_entry_type type = SELECTOR_ENTRY_TYPE_EMPTY; std::string basename; std::string fullpath; }; diff --git a/src/frontend/mame/ui/sndmenu.cpp b/src/frontend/mame/ui/sndmenu.cpp index b1842969f8f..1ee1e82e25c 100644 --- a/src/frontend/mame/ui/sndmenu.cpp +++ b/src/frontend/mame/ui/sndmenu.cpp @@ -45,29 +45,25 @@ menu_sound_options::menu_sound_options(mame_ui_manager &mui, render_container &c } //------------------------------------------------- -// dtor +// menu_dismissed //------------------------------------------------- -menu_sound_options::~menu_sound_options() +void menu_sound_options::menu_dismissed() { emu_options &moptions = machine().options(); - if (strcmp(moptions.value(OSDOPTION_SOUND), m_sound ? OSDOPTVAL_AUTO : OSDOPTVAL_NONE) != 0) - { + if (strcmp(moptions.value(OSDOPTION_SOUND), m_sound ? OSDOPTVAL_AUTO : OSDOPTVAL_NONE)) moptions.set_value(OSDOPTION_SOUND, m_sound ? OSDOPTVAL_AUTO : OSDOPTVAL_NONE, OPTION_PRIORITY_CMDLINE); - } + if (moptions.bool_value(OPTION_COMPRESSOR) != m_compressor) - { moptions.set_value(OPTION_COMPRESSOR, m_compressor, OPTION_PRIORITY_CMDLINE); - } + if (moptions.int_value(OPTION_SAMPLERATE) != m_sound_rate[m_cur_rates]) - { moptions.set_value(OPTION_SAMPLERATE, m_sound_rate[m_cur_rates], OPTION_PRIORITY_CMDLINE); - } + if (moptions.bool_value(OPTION_SAMPLES) != m_samples) - { moptions.set_value(OPTION_SAMPLES, m_samples, OPTION_PRIORITY_CMDLINE); - } + } //------------------------------------------------- diff --git a/src/frontend/mame/ui/sndmenu.h b/src/frontend/mame/ui/sndmenu.h index 35ac73981df..03f68202748 100644 --- a/src/frontend/mame/ui/sndmenu.h +++ b/src/frontend/mame/ui/sndmenu.h @@ -25,10 +25,10 @@ class menu_sound_options : public menu { public: menu_sound_options(mame_ui_manager &mui, render_container &container); - virtual ~menu_sound_options() override; protected: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; + virtual void menu_dismissed() override; private: enum diff --git a/src/frontend/mame/ui/textbox.cpp b/src/frontend/mame/ui/textbox.cpp index 71de239b35f..cd529aa297d 100644 --- a/src/frontend/mame/ui/textbox.cpp +++ b/src/frontend/mame/ui/textbox.cpp @@ -29,6 +29,7 @@ menu_textbox::menu_textbox(mame_ui_manager &mui, render_container &container) , m_layout_width(-1.0f) , m_desired_width(-1.0f) , m_desired_lines(-1) + , m_window_lines(0) , m_top_line(0) { } |