From 8a4ebb5dbc42812aa6474910179f5ef0a386797c Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 30 Jan 2022 15:58:19 -0500 Subject: frontend: Use util::core_file instead of emu_file where applicable --- src/frontend/mame/ui/utils.cpp | 90 +++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'src/frontend/mame/ui/utils.cpp') diff --git a/src/frontend/mame/ui/utils.cpp b/src/frontend/mame/ui/utils.cpp index 27a27b45678..60fc8598823 100644 --- a/src/frontend/mame/ui/utils.cpp +++ b/src/frontend/mame/ui/utils.cpp @@ -165,7 +165,7 @@ public: virtual bool adjust_left() override { return false; } virtual bool adjust_right() override { return false; } - virtual void save_ini(emu_file &file, unsigned indent) const override + virtual void save_ini(util::core_file &file, unsigned indent) const override { file.puts(util::string_format("%2$*1$s%3$s = 1\n", 2 * indent, "", config_name())); } @@ -243,7 +243,7 @@ public: return true; } - virtual void save_ini(emu_file &file, unsigned indent) const override + virtual void save_ini(util::core_file &file, unsigned indent) const override { char const *const text(filter_text()); file.puts(util::string_format("%2$*1$s%3$s = %4$s\n", 2 * indent, "", this->config_name(), text ? text : "")); @@ -290,7 +290,7 @@ public: virtual bool wants_adjuster() const override { return true; } virtual char const *adjust_text() const override { return _(""); } - virtual void save_ini(emu_file &file, unsigned indent) const override + virtual void save_ini(util::core_file &file, unsigned indent) const override { auto const tail(std::find_if(std::begin(m_filters), std::end(m_filters), [] (typename Base::ptr const &flt) { return !flt; })); file.puts(util::string_format("%2$*1$s%3$s = %4$d\n", 2 * indent, "", this->config_name(), std::distance(std::begin(m_filters), tail))); @@ -346,7 +346,7 @@ public: protected: composite_filter_impl_base() { } - void populate(char const *value, emu_file *file, unsigned indent) + void populate(char const *value, util::core_file *file, unsigned indent) { // try to load filters from a file if (value && file) @@ -683,7 +683,7 @@ template class available_machine_filter_impl : public simple_filter_impl_base { public: - available_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + available_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.available; } }; @@ -693,7 +693,7 @@ template class working_machine_filter_impl : public simple_filter_impl_base { public: - working_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + working_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return !(system.driver->flags & machine_flags::NOT_WORKING); } }; @@ -703,7 +703,7 @@ template class mechanical_machine_filter_impl : public simple_filter_impl_base { public: - mechanical_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + mechanical_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.driver->flags & machine_flags::MECHANICAL; } }; @@ -713,7 +713,7 @@ template class bios_machine_filter_impl : public simple_filter_impl_base { public: - bios_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + bios_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.driver->flags & machine_flags::IS_BIOS_ROOT; } }; @@ -723,7 +723,7 @@ template class parents_machine_filter_impl : public simple_filter_impl_base { public: - parents_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + parents_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { @@ -738,7 +738,7 @@ template class chd_machine_filter_impl : public simple_filter_impl_base { public: - chd_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + chd_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { @@ -756,7 +756,7 @@ template class save_machine_filter_impl : public simple_filter_impl_base { public: - save_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + save_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.driver->flags & machine_flags::SUPPORTS_SAVE; } }; @@ -766,7 +766,7 @@ template class vertical_machine_filter_impl : public simple_filter_impl_base { public: - vertical_machine_filter_impl(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) { } + vertical_machine_filter_impl(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) { } virtual bool apply(ui_system_info const &system) const override { return system.driver->flags & machine_flags::SWAP_XY; } }; @@ -780,7 +780,7 @@ public: class manufacturer_machine_filter : public choice_filter_impl_base { public: - manufacturer_machine_filter(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) + manufacturer_machine_filter(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : choice_filter_impl_base(data.manufacturers(), value) { } @@ -801,7 +801,7 @@ public: class year_machine_filter : public choice_filter_impl_base { public: - year_machine_filter(machine_filter_data const &data, char const *value, emu_file *file, unsigned indent) + year_machine_filter(machine_filter_data const &data, char const *value, util::core_file *file, unsigned indent) : choice_filter_impl_base(data.years(), value) { } @@ -819,7 +819,7 @@ template