diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2015-12-03 18:17:25 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2015-12-03 18:17:25 +0100 |
commit | 91605d3f4df9b9fb1490c276053ff274fb728816 (patch) | |
tree | ec89d290d9bfba3b27d4aa28336a5ac9a9d45a7a /src/devices/imagedev | |
parent | 5232ca932afe0acc8c3ef2bd3599e04a8c7def69 (diff) |
clang-modernize part 1 (nw)
Diffstat (limited to 'src/devices/imagedev')
-rw-r--r-- | src/devices/imagedev/cassette.h | 36 | ||||
-rw-r--r-- | src/devices/imagedev/floppy.h | 50 |
2 files changed, 43 insertions, 43 deletions
diff --git a/src/devices/imagedev/cassette.h b/src/devices/imagedev/cassette.h index 188670922cc..e7edd0acef2 100644 --- a/src/devices/imagedev/cassette.h +++ b/src/devices/imagedev/cassette.h @@ -55,22 +55,22 @@ public: static void static_set_interface(device_t &device, const char *_interface) { downcast<cassette_image_device &>(device).m_interface = _interface; } // image-level overrides - virtual bool call_load(); - virtual bool call_create(int format_type, option_resolution *format_options); - virtual void call_unload(); - virtual void call_display(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } - - virtual iodevice_t image_type() const { return IO_CASSETTE; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return m_extension_list; } - virtual const option_guide *create_option_guide() const { return NULL; } + virtual bool call_load() override; + virtual bool call_create(int format_type, option_resolution *format_options) override; + virtual void call_unload() override; + virtual void call_display() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); } + + virtual iodevice_t image_type() const override { return IO_CASSETTE; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return m_extension_list; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // specific implementation cassette_state get_state() { return m_state; } @@ -94,8 +94,8 @@ protected: void update(); // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; private: cassette_image *m_cassette; cassette_state m_state; diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h index 15b1095571f..dd1465ba6bf 100644 --- a/src/devices/imagedev/floppy.h +++ b/src/devices/imagedev/floppy.h @@ -79,20 +79,20 @@ public: void set_rpm(float rpm); // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_create(int format_type, option_resolution *format_options); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_create(int format_type, option_resolution *format_options) override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); } virtual const char *image_interface() const = 0; - virtual iodevice_t image_type() const { return IO_FLOPPY; } - - virtual bool is_readable() const { return true; } - virtual bool is_writeable() const { return true; } - virtual bool is_creatable() const { return true; } - virtual bool must_be_loaded() const { return false; } - virtual bool is_reset_on_load() const { return false; } - virtual const char *file_extensions() const { return extension_list; } - virtual const option_guide *create_option_guide() const { return NULL; } + virtual iodevice_t image_type() const override { return IO_FLOPPY; } + + virtual bool is_readable() const override { return true; } + virtual bool is_writeable() const override { return true; } + virtual bool is_creatable() const override { return true; } + virtual bool must_be_loaded() const override { return false; } + virtual bool is_reset_on_load() const override { return false; } + virtual const char *file_extensions() const override { return extension_list; } + virtual const option_guide *create_option_guide() const override { return nullptr; } void setup_write(floppy_image_format_t *output_format); void setup_load_cb(load_cb cb); @@ -131,7 +131,7 @@ public: UINT32 get_form_factor() const; UINT32 get_variant() const; - virtual ui_menu *get_selection_menu(running_machine &machine, class render_container *container); + virtual ui_menu *get_selection_menu(running_machine &machine, class render_container *container) override; static const floppy_format_type default_floppy_formats[]; @@ -140,12 +140,12 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; virtual void setup_characteristics() = 0; @@ -209,7 +209,7 @@ public: ui_menu_control_floppy_image(running_machine &machine, render_container *container, device_image_interface *image); virtual ~ui_menu_control_floppy_image(); - virtual void handle(); + virtual void handle() override; protected: enum { SELECT_FORMAT = LAST_ID, SELECT_MEDIA, SELECT_RW }; @@ -219,7 +219,7 @@ protected: std::string input_filename, output_filename; void do_load_create(); - virtual void hook_load(std::string filename, bool softlist); + virtual void hook_load(std::string filename, bool softlist) override; }; @@ -283,11 +283,11 @@ public: void register_for_save_states(); protected: - void device_start(); + void device_start() override; private: // device_sound_interface overrides - void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; sound_stream* m_sound; bool m_loaded; @@ -323,8 +323,8 @@ public: void enable_sound(bool doit) { m_enable_sound = doit; } protected: - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; private: const floppy_format_type *formats; |