From 92f81361d64c720addf5d7e2528b3d1c675f65a4 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 3 Dec 2015 11:40:45 +0100 Subject: Initial conversion of core to C++14. Note that compilers are now limited to GCC 4.9.0 and up, Clang 3.4.0 and up, and VS2013 and up [Miodrag Milanovic] --- src/osd/modules/debugger/debugwin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/osd/modules/debugger/debugwin.cpp') diff --git a/src/osd/modules/debugger/debugwin.cpp b/src/osd/modules/debugger/debugwin.cpp index b7bf048adae..da32b678b67 100644 --- a/src/osd/modules/debugger/debugwin.cpp +++ b/src/osd/modules/debugger/debugwin.cpp @@ -72,7 +72,7 @@ private: template T *create_window(); running_machine *m_machine; - auto_pointer m_metrics; + std::unique_ptr m_metrics; bool m_waiting_for_debugger; simple_list m_window_list; consolewin_info *m_main_console; @@ -94,7 +94,7 @@ void debugger_windows::exit() void debugger_windows::init_debugger(running_machine &machine) { m_machine = &machine; - m_metrics.reset(global_alloc(ui_metrics(downcast(m_machine->options())))); + m_metrics = std::make_unique(downcast(m_machine->options())); } -- cgit v1.2.3-70-g09d2 From 3ee9b6cee4c0757a999f63b70a190ac6020984b2 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 6 Dec 2015 09:23:23 +0100 Subject: fixing some more override (nw) --- src/emu/devfind.h | 4 +-- src/lib/formats/2d_dsk.h | 6 ++-- src/lib/formats/a5105_dsk.h | 6 ++-- src/lib/formats/ap2_dsk.cpp | 2 +- src/lib/formats/ap_dsk35.h | 16 ++++----- src/lib/formats/applix_dsk.h | 6 ++-- src/lib/formats/apridisk.h | 16 ++++----- src/lib/formats/asst128_dsk.h | 6 ++-- src/lib/formats/atom_dsk.h | 6 ++-- src/lib/formats/bbc_dsk.h | 46 ++++++++++++------------ src/lib/formats/bw12_dsk.h | 6 ++-- src/lib/formats/bw2_dsk.h | 6 ++-- src/lib/formats/camplynx_dsk.h | 6 ++-- src/lib/formats/cd90_640_dsk.h | 6 ++-- src/lib/formats/coupedsk.h | 16 ++++----- src/lib/formats/d64_dsk.cpp | 2 +- src/lib/formats/d64_dsk.h | 2 +- src/lib/formats/d80_dsk.cpp | 4 +-- src/lib/formats/dcp_dsk.cpp | 2 +- src/lib/formats/dcp_dsk.h | 12 +++---- src/lib/formats/dim_dsk.h | 16 ++++----- src/lib/formats/dip_dsk.cpp | 2 +- src/lib/formats/dip_dsk.h | 12 +++---- src/lib/formats/dmv_dsk.h | 6 ++-- src/lib/formats/esq16_dsk.h | 16 ++++----- src/lib/formats/esq8_dsk.h | 16 ++++----- src/lib/formats/excali64_dsk.h | 6 ++-- src/lib/formats/fdd_dsk.h | 12 +++---- src/lib/formats/flex_dsk.h | 12 +++---- src/lib/formats/flopimg.cpp | 10 +++--- src/lib/formats/flopimg.h | 8 ++--- src/lib/formats/fmtowns_dsk.h | 6 ++-- src/lib/formats/fsd_dsk.h | 12 +++---- src/lib/formats/guab_dsk.h | 6 ++-- src/lib/formats/hector_minidisc.h | 6 ++-- src/lib/formats/imd_dsk.cpp | 2 +- src/lib/formats/ipf_dsk.cpp | 3 +- src/lib/formats/itt3030_dsk.h | 6 ++-- src/lib/formats/kaypro_dsk.h | 12 +++---- src/lib/formats/m20_dsk.h | 16 ++++----- src/lib/formats/m5_dsk.h | 6 ++-- src/lib/formats/mfm_hd.h | 11 +++--- src/lib/formats/mm_dsk.h | 12 +++---- src/lib/formats/nanos_dsk.h | 6 ++-- src/lib/formats/nfd_dsk.h | 12 +++---- src/lib/formats/pasti_dsk.cpp | 2 +- src/lib/formats/pasti_dsk.h | 12 +++---- src/lib/formats/pc98_dsk.h | 6 ++-- src/lib/formats/pc98fdi_dsk.cpp | 2 +- src/lib/formats/pc98fdi_dsk.h | 12 +++---- src/lib/formats/pk8020_dsk.h | 6 ++-- src/lib/formats/pyldin_dsk.h | 6 ++-- src/lib/formats/rx50_dsk.h | 16 ++++----- src/lib/formats/sf7000_dsk.h | 6 ++-- src/lib/formats/smx_dsk.h | 6 ++-- src/lib/formats/st_dsk.h | 28 +++++++-------- src/lib/formats/svi_dsk.h | 16 ++++----- src/lib/formats/tandy2k_dsk.h | 6 ++-- src/lib/formats/td0_dsk.cpp | 4 +-- src/lib/formats/ti99_dsk.h | 1 - src/lib/formats/tiki100_dsk.h | 6 ++-- src/lib/formats/trd_dsk.h | 6 ++-- src/lib/formats/trs80_dsk.h | 8 ++--- src/lib/formats/upd765_dsk.cpp | 4 +-- src/lib/formats/upd765_dsk.h | 2 +- src/lib/formats/vector06_dsk.h | 6 ++-- src/lib/formats/victor9k_dsk.h | 16 ++++----- src/lib/formats/wd177x_dsk.cpp | 2 +- src/lib/formats/xdf_dsk.h | 6 ++-- src/osd/modules/debugger/debugint.cpp | 14 ++++---- src/osd/modules/debugger/debugwin.cpp | 32 ++++++++--------- src/osd/modules/debugger/none.cpp | 10 +++--- src/osd/modules/debugger/win/consolewininfo.h | 8 ++--- src/osd/modules/debugger/win/disasmbasewininfo.h | 6 ++-- src/osd/modules/debugger/win/disasmwininfo.h | 8 ++--- src/osd/modules/debugger/win/editwininfo.h | 6 ++-- src/osd/modules/debugger/win/memorywininfo.h | 12 +++---- src/osd/modules/debugger/win/pointswininfo.h | 6 ++-- src/osd/modules/debugger/win/uimetrics.cpp | 2 +- src/osd/modules/font/font_none.cpp | 10 +++--- src/osd/modules/font/font_windows.cpp | 10 +++--- src/osd/modules/lib/osdobj_common.h | 26 +++++++------- src/osd/modules/midi/none.cpp | 20 +++++------ src/osd/modules/midi/portmidi.cpp | 20 +++++------ src/osd/modules/netdev/none.cpp | 3 +- src/osd/modules/netdev/pcap.cpp | 12 +++---- src/osd/modules/osdmodule.h | 4 +-- src/osd/modules/render/drawbgfx.cpp | 16 ++++----- src/osd/modules/render/drawd3d.h | 14 ++++---- src/osd/modules/render/drawdd.cpp | 14 ++++---- src/osd/modules/render/drawgdi.cpp | 14 ++++---- src/osd/modules/render/drawnone.cpp | 14 ++++---- src/osd/modules/render/drawogl.cpp | 26 +++++++------- src/osd/modules/sound/direct_sound.cpp | 8 ++--- src/osd/modules/sound/none.cpp | 8 ++--- src/osd/windows/video.h | 2 +- src/osd/windows/window.h | 14 ++++---- src/osd/windows/winmain.cpp | 2 +- src/osd/windows/winmain.h | 32 ++++++++--------- 99 files changed, 484 insertions(+), 482 deletions(-) (limited to 'src/osd/modules/debugger/debugwin.cpp') diff --git a/src/emu/devfind.h b/src/emu/devfind.h index 16dd1f34911..3d0fc80f9de 100644 --- a/src/emu/devfind.h +++ b/src/emu/devfind.h @@ -110,7 +110,7 @@ public: operator _DeviceClass &() { assert(object_finder_base<_DeviceClass>::m_target != nullptr); return *object_finder_base<_DeviceClass>::m_target; } // finder - virtual bool findit(bool isvalidation = false) + virtual bool findit(bool isvalidation = false) override { device_t *device = this->m_base.subdevice(this->m_tag); this->m_target = dynamic_cast<_DeviceClass *>(device); @@ -396,7 +396,7 @@ public: } // finder - virtual bool findit(bool isvalidation = false) + virtual bool findit(bool isvalidation = false) override { if (isvalidation) return true; this->m_target = reinterpret_cast<_PointerType *>(this->find_memshare(m_width, m_bytes, _Required)); diff --git a/src/lib/formats/2d_dsk.h b/src/lib/formats/2d_dsk.h index ab70b95f21a..95ee8dbbf20 100644 --- a/src/lib/formats/2d_dsk.h +++ b/src/lib/formats/2d_dsk.h @@ -20,9 +20,9 @@ class _2d_format : public wd177x_format public: _2d_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/a5105_dsk.h b/src/lib/formats/a5105_dsk.h index 6f987a81199..cfe7a2f6a0e 100644 --- a/src/lib/formats/a5105_dsk.h +++ b/src/lib/formats/a5105_dsk.h @@ -17,9 +17,9 @@ class a5105_format : public upd765_format { public: a5105_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp index 49010ff62e1..774d4785735 100644 --- a/src/lib/formats/ap2_dsk.cpp +++ b/src/lib/formats/ap2_dsk.cpp @@ -535,7 +535,7 @@ static const UINT8 prodos_skewing[] = }; -a2_16sect_format::a2_16sect_format() : floppy_image_format_t() +a2_16sect_format::a2_16sect_format() : floppy_image_format_t(), m_prodos_order(false) { } diff --git a/src/lib/formats/ap_dsk35.h b/src/lib/formats/ap_dsk35.h index 432eed42d8e..533307e2708 100644 --- a/src/lib/formats/ap_dsk35.h +++ b/src/lib/formats/ap_dsk35.h @@ -28,14 +28,14 @@ class dc42_format : public floppy_image_format_t public: dc42_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; private: static const desc_e mac_gcr[]; diff --git a/src/lib/formats/applix_dsk.h b/src/lib/formats/applix_dsk.h index 1a833fa55e6..c56213ade74 100644 --- a/src/lib/formats/applix_dsk.h +++ b/src/lib/formats/applix_dsk.h @@ -17,9 +17,9 @@ class applix_format : public wd177x_format { public: applix_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/apridisk.h b/src/lib/formats/apridisk.h index 6eb5fc4617e..4faf756fd5a 100644 --- a/src/lib/formats/apridisk.h +++ b/src/lib/formats/apridisk.h @@ -20,14 +20,14 @@ class apridisk_format : public floppy_image_format_t public: apridisk_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + virtual bool supports_save() const override; private: static const int APR_HEADER_SIZE = 128; diff --git a/src/lib/formats/asst128_dsk.h b/src/lib/formats/asst128_dsk.h index 32b455fa1f7..b19aab50f27 100644 --- a/src/lib/formats/asst128_dsk.h +++ b/src/lib/formats/asst128_dsk.h @@ -17,9 +17,9 @@ class asst128_format : public upd765_format { public: asst128_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/atom_dsk.h b/src/lib/formats/atom_dsk.h index 45187205f1c..7f64810e87c 100644 --- a/src/lib/formats/atom_dsk.h +++ b/src/lib/formats/atom_dsk.h @@ -9,9 +9,9 @@ class atom_format : public wd177x_format public: atom_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/bbc_dsk.h b/src/lib/formats/bbc_dsk.h index 28bba03e61b..9378a25ec81 100644 --- a/src/lib/formats/bbc_dsk.h +++ b/src/lib/formats/bbc_dsk.h @@ -20,12 +20,12 @@ class bbc_dfs_format : public wd177x_format public: bbc_dfs_format(); - virtual int find_size(io_generic *io, UINT32 form_factor); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual int get_image_offset(const format &f, int head, int track); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual int find_size(io_generic *io, UINT32 form_factor) override; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual int get_image_offset(const format &f, int head, int track) override; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; @@ -36,12 +36,12 @@ class bbc_adfs_format : public wd177x_format public: bbc_adfs_format(); - virtual int find_size(io_generic *io, UINT32 form_factor); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual int get_image_offset(const format &f, int head, int track); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual int find_size(io_generic *io, UINT32 form_factor) override; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual int get_image_offset(const format &f, int head, int track) override; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; @@ -52,12 +52,12 @@ class bbc_dos_format : public wd177x_format public: bbc_dos_format(); - virtual int find_size(io_generic *io, UINT32 form_factor); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual int get_image_offset(const format &f, int head, int track); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual int find_size(io_generic *io, UINT32 form_factor) override; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual int get_image_offset(const format &f, int head, int track) override; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; @@ -68,11 +68,11 @@ class bbc_cpm_format : public wd177x_format public: bbc_cpm_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual int get_image_offset(const format &f, int head, int track); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual int get_image_offset(const format &f, int head, int track) override; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/bw12_dsk.h b/src/lib/formats/bw12_dsk.h index c9455463486..ca43914ffb0 100644 --- a/src/lib/formats/bw12_dsk.h +++ b/src/lib/formats/bw12_dsk.h @@ -17,9 +17,9 @@ class bw12_format : public upd765_format { public: bw12_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/bw2_dsk.h b/src/lib/formats/bw2_dsk.h index d5fa5c66187..edf184ca4ae 100644 --- a/src/lib/formats/bw2_dsk.h +++ b/src/lib/formats/bw2_dsk.h @@ -17,9 +17,9 @@ class bw2_format : public upd765_format { public: bw2_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/camplynx_dsk.h b/src/lib/formats/camplynx_dsk.h index 96efac0b60b..ccbc7015d5b 100644 --- a/src/lib/formats/camplynx_dsk.h +++ b/src/lib/formats/camplynx_dsk.h @@ -17,9 +17,9 @@ class camplynx_format : public wd177x_format { public: camplynx_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/cd90_640_dsk.h b/src/lib/formats/cd90_640_dsk.h index ccf80508047..489942788be 100644 --- a/src/lib/formats/cd90_640_dsk.h +++ b/src/lib/formats/cd90_640_dsk.h @@ -20,9 +20,9 @@ class cd90_640_format : public wd177x_format public: cd90_640_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/coupedsk.h b/src/lib/formats/coupedsk.h index 9345ded421a..19f2d7ddac5 100644 --- a/src/lib/formats/coupedsk.h +++ b/src/lib/formats/coupedsk.h @@ -18,14 +18,14 @@ class mgt_format : public floppy_image_format_t public: mgt_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; static const floppy_image_format_t::desc_e desc_10[]; }; diff --git a/src/lib/formats/d64_dsk.cpp b/src/lib/formats/d64_dsk.cpp index 531ce441b99..b637d44c48c 100644 --- a/src/lib/formats/d64_dsk.cpp +++ b/src/lib/formats/d64_dsk.cpp @@ -79,7 +79,7 @@ const int d64_format::speed_zone[] = 0, 0 // 41-42 }; -int d64_format::find_size(io_generic *io, UINT32 form_factor) +int d64_format::find_size(io_generic *io, UINT32 form_factor) const { UINT64 size = io_generic_size(io); for(int i=0; formats[i].sector_count; i++) { diff --git a/src/lib/formats/d64_dsk.h b/src/lib/formats/d64_dsk.h index 5eaecc3b042..c5bef4b3313 100644 --- a/src/lib/formats/d64_dsk.h +++ b/src/lib/formats/d64_dsk.h @@ -58,7 +58,7 @@ protected: const format *formats; - int find_size(io_generic *io, UINT32 form_factor); + int find_size(io_generic *io, UINT32 form_factor) const; virtual int get_physical_track(const format &f, int head, int track); virtual UINT32 get_cell_size(const format &f, int track); virtual int get_sectors_per_track(const format &f, int track); diff --git a/src/lib/formats/d80_dsk.cpp b/src/lib/formats/d80_dsk.cpp index 222ef488544..12ea14ad80f 100644 --- a/src/lib/formats/d80_dsk.cpp +++ b/src/lib/formats/d80_dsk.cpp @@ -12,11 +12,11 @@ #include "formats/d80_dsk.h" -d80_format::d80_format() : d64_format(file_formats) +d80_format::d80_format() : d64_format(file_formats), formats(nullptr) { } -d80_format::d80_format(const format *_formats) : d64_format(_formats) +d80_format::d80_format(const format *_formats) : d64_format(_formats), formats(nullptr) { } diff --git a/src/lib/formats/dcp_dsk.cpp b/src/lib/formats/dcp_dsk.cpp index fa805979d7b..4e2c305e6f6 100644 --- a/src/lib/formats/dcp_dsk.cpp +++ b/src/lib/formats/dcp_dsk.cpp @@ -205,7 +205,7 @@ bool dcp_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) int cell_count = form_factor == floppy_image::FF_35 ? 200000 : 166666; int ssize; - for (ssize = 0; (128 << ssize) < bps; ssize++); + for (ssize = 0; (128 << ssize) < bps; ssize++) {}; desc_pc_sector sects[256]; UINT8 sect_data[65536]; diff --git a/src/lib/formats/dcp_dsk.h b/src/lib/formats/dcp_dsk.h index d6e169809cf..92e447741f5 100644 --- a/src/lib/formats/dcp_dsk.h +++ b/src/lib/formats/dcp_dsk.h @@ -19,13 +19,13 @@ class dcp_format : public floppy_image_format_t public: dcp_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_DCP_FORMAT; diff --git a/src/lib/formats/dim_dsk.h b/src/lib/formats/dim_dsk.h index c7d4cea0d34..54f84aff471 100644 --- a/src/lib/formats/dim_dsk.h +++ b/src/lib/formats/dim_dsk.h @@ -24,14 +24,14 @@ class dim_format : public floppy_image_format_t public: dim_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_DIM_FORMAT; diff --git a/src/lib/formats/dip_dsk.cpp b/src/lib/formats/dip_dsk.cpp index e7c7aa072e9..9e6570f8071 100644 --- a/src/lib/formats/dip_dsk.cpp +++ b/src/lib/formats/dip_dsk.cpp @@ -61,7 +61,7 @@ bool dip_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) int cell_count = form_factor == floppy_image::FF_35 ? 200000 : 166666; int ssize; - for (ssize = 0; (128 << ssize) < bps; ssize++); + for (ssize = 0; (128 << ssize) < bps; ssize++) {}; desc_pc_sector sects[256]; UINT8 sect_data[65536]; diff --git a/src/lib/formats/dip_dsk.h b/src/lib/formats/dip_dsk.h index e2ca876dff0..dba5e4afee9 100644 --- a/src/lib/formats/dip_dsk.h +++ b/src/lib/formats/dip_dsk.h @@ -19,13 +19,13 @@ class dip_format : public floppy_image_format_t public: dip_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_DIP_FORMAT; diff --git a/src/lib/formats/dmv_dsk.h b/src/lib/formats/dmv_dsk.h index 31551ffc627..022a6e1e489 100644 --- a/src/lib/formats/dmv_dsk.h +++ b/src/lib/formats/dmv_dsk.h @@ -17,9 +17,9 @@ class dmv_format : public upd765_format { public: dmv_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/esq16_dsk.h b/src/lib/formats/esq16_dsk.h index caf02f7995d..696db98345c 100644 --- a/src/lib/formats/esq16_dsk.h +++ b/src/lib/formats/esq16_dsk.h @@ -20,14 +20,14 @@ class esqimg_format : public floppy_image_format_t public: esqimg_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; static const desc_e esq_10_desc[]; diff --git a/src/lib/formats/esq8_dsk.h b/src/lib/formats/esq8_dsk.h index 4646fcc225c..5fb998bf3b0 100644 --- a/src/lib/formats/esq8_dsk.h +++ b/src/lib/formats/esq8_dsk.h @@ -22,14 +22,14 @@ class esq8img_format : public floppy_image_format_t public: esq8img_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; static const desc_e esq_6_desc[]; diff --git a/src/lib/formats/excali64_dsk.h b/src/lib/formats/excali64_dsk.h index b25698a3ffa..c2800d18875 100644 --- a/src/lib/formats/excali64_dsk.h +++ b/src/lib/formats/excali64_dsk.h @@ -17,9 +17,9 @@ class excali64_format : public wd177x_format { public: excali64_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/fdd_dsk.h b/src/lib/formats/fdd_dsk.h index 9e43479565e..6a7faa57669 100644 --- a/src/lib/formats/fdd_dsk.h +++ b/src/lib/formats/fdd_dsk.h @@ -19,13 +19,13 @@ class fdd_format : public floppy_image_format_t public: fdd_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_FDD_FORMAT; diff --git a/src/lib/formats/flex_dsk.h b/src/lib/formats/flex_dsk.h index 95a03a78f15..bade0115c56 100644 --- a/src/lib/formats/flex_dsk.h +++ b/src/lib/formats/flex_dsk.h @@ -15,12 +15,12 @@ class flex_format : public floppy_image_format_t { public: flex_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool supports_save() const override; private: struct sysinfo_sector diff --git a/src/lib/formats/flopimg.cpp b/src/lib/formats/flopimg.cpp index 57281fcda0e..f8cf7c83780 100644 --- a/src/lib/formats/flopimg.cpp +++ b/src/lib/formats/flopimg.cpp @@ -958,7 +958,7 @@ floppy_image::~floppy_image() { } -void floppy_image::get_maximal_geometry(int &_tracks, int &_heads) +void floppy_image::get_maximal_geometry(int &_tracks, int &_heads) const { _tracks = tracks; _heads = heads; @@ -1097,7 +1097,7 @@ bool floppy_image_format_t::type_data_mfm(int type, int p1, const gen_crc_info * (type == CRC && (crcs[p1].type == CRC_CCITT || crcs[p1].type == CRC_AMIGA)); } -void floppy_image_format_t::collect_crcs(const desc_e *desc, gen_crc_info *crcs) +void floppy_image_format_t::collect_crcs(const desc_e *desc, gen_crc_info *crcs) const { memset(crcs, 0, MAX_CRC_COUNT * sizeof(*crcs)); for(int i=0; i != MAX_CRC_COUNT; i++) @@ -1134,7 +1134,7 @@ void floppy_image_format_t::collect_crcs(const desc_e *desc, gen_crc_info *crcs) for(int i=0; desc[i].type != END; i++) if(desc[i].type == CRC) { int j; - for(j = i+1; desc[j].type != END && type_no_data(desc[j].type); j++); + for(j = i+1; desc[j].type != END && type_no_data(desc[j].type); j++) {}; crcs[desc[i].p1].fixup_mfm_clock = type_data_mfm(desc[j].type, desc[j].p1, crcs); } } @@ -1545,7 +1545,7 @@ void floppy_image_format_t::generate_track(const desc_e *desc, int track, int he case SIZE_ID: { int size = sect[sector_idx].size; int id; - for(id = 0; size > 128; size >>=1, id++); + for(id = 0; size > 128; size >>=1, id++) {}; mfm_w(buffer, 8, id); break; } @@ -1553,7 +1553,7 @@ void floppy_image_format_t::generate_track(const desc_e *desc, int track, int he case SIZE_ID_FM: { int size = sect[sector_idx].size; int id; - for(id = 0; size > 128; size >>=1, id++); + for(id = 0; size > 128; size >>=1, id++) {}; fm_w(buffer, 8, id); break; } diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h index c3e42c5c96d..0f8c1a605a9 100644 --- a/src/lib/formats/flopimg.h +++ b/src/lib/formats/flopimg.h @@ -607,7 +607,7 @@ private: void fixup_crc_victor_header(std::vector &buffer, const gen_crc_info *crc); void fixup_crc_victor_data(std::vector &buffer, const gen_crc_info *crc); void fixup_crcs(std::vector &buffer, gen_crc_info *crcs); - void collect_crcs(const desc_e *desc, gen_crc_info *crcs); + void collect_crcs(const desc_e *desc, gen_crc_info *crcs) const; int sbit_r(const UINT8 *bitstream, int pos); int sbit_rp(const UINT8 *bitstream, int &pos, int track_size); @@ -721,9 +721,9 @@ public: virtual ~floppy_image(); //! @return the form factor. - UINT32 get_form_factor() { return form_factor; } + UINT32 get_form_factor() const { return form_factor; } //! @return the variant. - UINT32 get_variant() { return variant; } + UINT32 get_variant() const { return variant; } //! @param v the variant. void set_variant(UINT32 v) { variant = v; } @@ -751,7 +751,7 @@ public: //! @return the current write splice position. UINT32 get_write_splice_position(int track, int head, int subtrack = 0) const { return track_array[track*4+subtrack][head].write_splice; } //! @return the maximal geometry supported by this format. - void get_maximal_geometry(int &tracks, int &heads); + void get_maximal_geometry(int &tracks, int &heads) const; //! @return the current geometry of the loaded image. void get_actual_geometry(int &tracks, int &heads); diff --git a/src/lib/formats/fmtowns_dsk.h b/src/lib/formats/fmtowns_dsk.h index ae11ef78961..4bf20990ec9 100644 --- a/src/lib/formats/fmtowns_dsk.h +++ b/src/lib/formats/fmtowns_dsk.h @@ -15,9 +15,9 @@ class fmtowns_format : public wd177x_format { public: fmtowns_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/fsd_dsk.h b/src/lib/formats/fsd_dsk.h index 8d7a9302926..fdfb6fb3d27 100644 --- a/src/lib/formats/fsd_dsk.h +++ b/src/lib/formats/fsd_dsk.h @@ -29,13 +29,13 @@ class fsd_format : public floppy_image_format_t public: fsd_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; }; extern const floppy_format_type FLOPPY_FSD_FORMAT; diff --git a/src/lib/formats/guab_dsk.h b/src/lib/formats/guab_dsk.h index 36280ddd88f..3fe6e2a670e 100644 --- a/src/lib/formats/guab_dsk.h +++ b/src/lib/formats/guab_dsk.h @@ -20,9 +20,9 @@ class guab_format : public wd177x_format public: guab_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/hector_minidisc.h b/src/lib/formats/hector_minidisc.h index d850573f2b6..54162508dd8 100644 --- a/src/lib/formats/hector_minidisc.h +++ b/src/lib/formats/hector_minidisc.h @@ -20,9 +20,9 @@ class hmd_format : public upd765_format public: hmd_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/imd_dsk.cpp b/src/lib/formats/imd_dsk.cpp index 05320686e40..8f660b91535 100644 --- a/src/lib/formats/imd_dsk.cpp +++ b/src/lib/formats/imd_dsk.cpp @@ -427,7 +427,7 @@ bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) io_generic_read(io, &img[0], 0, size); UINT64 pos; - for(pos=0; pos < size && img[pos] != 0x1a; pos++); + for(pos=0; pos < size && img[pos] != 0x1a; pos++) {}; pos++; if(pos >= size) diff --git a/src/lib/formats/ipf_dsk.cpp b/src/lib/formats/ipf_dsk.cpp index ade50a8e2f9..e7b8aad9137 100644 --- a/src/lib/formats/ipf_dsk.cpp +++ b/src/lib/formats/ipf_dsk.cpp @@ -5,7 +5,8 @@ const floppy_format_type FLOPPY_IPF_FORMAT = &floppy_image_format_creator; -ipf_format::ipf_format() +ipf_format::ipf_format(): tinfos(nullptr), tcount(0), type(0), release(0), revision(0), encoder_type(0), +encoder_revision(0), origin(0), min_cylinder(0), max_cylinder(0), min_head(0), max_head(0), credit_day(0), credit_time(0) { } diff --git a/src/lib/formats/itt3030_dsk.h b/src/lib/formats/itt3030_dsk.h index a43c9c1cd20..49ee5ed95b3 100644 --- a/src/lib/formats/itt3030_dsk.h +++ b/src/lib/formats/itt3030_dsk.h @@ -17,9 +17,9 @@ class itt3030_format : public wd177x_format { public: itt3030_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/kaypro_dsk.h b/src/lib/formats/kaypro_dsk.h index 589d16fc150..f65b410bcc8 100644 --- a/src/lib/formats/kaypro_dsk.h +++ b/src/lib/formats/kaypro_dsk.h @@ -17,9 +17,9 @@ class kayproii_format : public upd765_format { public: kayproii_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; @@ -29,9 +29,9 @@ class kaypro2x_format : public upd765_format { public: kaypro2x_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; }; diff --git a/src/lib/formats/m20_dsk.h b/src/lib/formats/m20_dsk.h index e3f8c9cf411..0ed3deda5ef 100644 --- a/src/lib/formats/m20_dsk.h +++ b/src/lib/formats/m20_dsk.h @@ -17,14 +17,14 @@ class m20_format : public floppy_image_format_t { public: m20_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_M20_FORMAT; diff --git a/src/lib/formats/m5_dsk.h b/src/lib/formats/m5_dsk.h index 15b806b6035..08350c61339 100644 --- a/src/lib/formats/m5_dsk.h +++ b/src/lib/formats/m5_dsk.h @@ -17,9 +17,9 @@ class m5_format : public upd765_format { public: m5_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/mfm_hd.h b/src/lib/formats/mfm_hd.h index 45963e2c3d5..4e583f46db8 100644 --- a/src/lib/formats/mfm_hd.h +++ b/src/lib/formats/mfm_hd.h @@ -80,7 +80,7 @@ public: int headerlen; int ecctype; // -1 is CRC - bool sane_rec() + bool sane_rec() const { return ((interleave > 0 && interleave < 32) && (cylskew >= 0 && cylskew < 32) && (headskew >= 0 && headskew < 32) && (write_precomp_cylinder >= -1 && write_precomp_cylinder < 100000) @@ -93,7 +93,7 @@ public: write_precomp_cylinder = reduced_wcurr_cylinder = -1; } - bool sane_gap() + bool sane_gap() const { return ((gap1 >= 1 && gap1 < 1000) && (gap2 >= 1 && gap2 < 20) && (gap3 >= 1 && gap3 < 1000) && (sync >= 10 && sync < 20) @@ -105,7 +105,7 @@ public: gap1 = gap2 = gap3 = sync = headerlen = ecctype = 0; } - bool equals_rec(mfmhd_layout_params* other) + bool equals_rec(mfmhd_layout_params* other) const { return ((interleave == other->interleave) && (cylskew == other->cylskew) && @@ -114,7 +114,7 @@ public: (reduced_wcurr_cylinder == other->reduced_wcurr_cylinder)); } - bool equals_gap(mfmhd_layout_params* other) + bool equals_gap(mfmhd_layout_params* other) const { return ((gap1 == other->gap1) && (gap2 == other->gap2) && @@ -146,7 +146,8 @@ enum mfmhd_param_t class mfmhd_image_format_t { public: - mfmhd_image_format_t() { m_devtag = std::string("mfmhd_image_format_t"); }; + mfmhd_image_format_t(): m_lastbit(false), m_current_crc(0) + { m_devtag = std::string("mfmhd_image_format_t"); }; virtual ~mfmhd_image_format_t() {}; // Load the image. diff --git a/src/lib/formats/mm_dsk.h b/src/lib/formats/mm_dsk.h index ad72b23d4e9..84b29ab259f 100644 --- a/src/lib/formats/mm_dsk.h +++ b/src/lib/formats/mm_dsk.h @@ -17,9 +17,9 @@ class mm1_format : public upd765_format { public: mm1_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; @@ -29,9 +29,9 @@ class mm2_format : public upd765_format { public: mm2_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/nanos_dsk.h b/src/lib/formats/nanos_dsk.h index 97767aa9a59..5a638a0782a 100644 --- a/src/lib/formats/nanos_dsk.h +++ b/src/lib/formats/nanos_dsk.h @@ -17,9 +17,9 @@ class nanos_format : public upd765_format { public: nanos_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/nfd_dsk.h b/src/lib/formats/nfd_dsk.h index 5bf460f9084..005196399ba 100644 --- a/src/lib/formats/nfd_dsk.h +++ b/src/lib/formats/nfd_dsk.h @@ -19,13 +19,13 @@ class nfd_format : public floppy_image_format_t public: nfd_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_NFD_FORMAT; diff --git a/src/lib/formats/pasti_dsk.cpp b/src/lib/formats/pasti_dsk.cpp index f6ed1556711..78e016991d9 100644 --- a/src/lib/formats/pasti_dsk.cpp +++ b/src/lib/formats/pasti_dsk.cpp @@ -175,7 +175,7 @@ void pasti_format::wd_generate_unsynced_gap(std::vector &track, const wd for(int i=tstart; i != tend;) { unsigned char v = obs.track_data[i]; int j; - for(j=i+1; j != tend && obs.track_data[j] == v; j++); + for(j=i+1; j != tend && obs.track_data[j] == v; j++) {}; int size = j-i; if(size < 4) { mfm_w(track, 8, v, cell_size); diff --git a/src/lib/formats/pasti_dsk.h b/src/lib/formats/pasti_dsk.h index 0d1165f48b4..fe724fb1fb5 100644 --- a/src/lib/formats/pasti_dsk.h +++ b/src/lib/formats/pasti_dsk.h @@ -10,13 +10,13 @@ class pasti_format : public floppy_image_format_t public: pasti_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; static const desc_e xdesc[]; diff --git a/src/lib/formats/pc98_dsk.h b/src/lib/formats/pc98_dsk.h index 5655d187399..d948b19ddcc 100644 --- a/src/lib/formats/pc98_dsk.h +++ b/src/lib/formats/pc98_dsk.h @@ -22,9 +22,9 @@ class pc98_format : public upd765_format public: pc98_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/pc98fdi_dsk.cpp b/src/lib/formats/pc98fdi_dsk.cpp index 83433606400..1e6f1809536 100644 --- a/src/lib/formats/pc98fdi_dsk.cpp +++ b/src/lib/formats/pc98fdi_dsk.cpp @@ -63,7 +63,7 @@ bool pc98fdi_format::load(io_generic *io, UINT32 form_factor, floppy_image *imag int cell_count = form_factor == floppy_image::FF_35 ? 200000 : 166666; int ssize; - for(ssize=0; (128 << ssize) < sector_size; ssize++); + for(ssize=0; (128 << ssize) < sector_size; ssize++) {}; desc_pc_sector sects[256]; UINT8 sect_data[65536]; diff --git a/src/lib/formats/pc98fdi_dsk.h b/src/lib/formats/pc98fdi_dsk.h index c71c4c587fd..05fd1ccc361 100644 --- a/src/lib/formats/pc98fdi_dsk.h +++ b/src/lib/formats/pc98fdi_dsk.h @@ -19,13 +19,13 @@ class pc98fdi_format : public floppy_image_format_t public: pc98fdi_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_PC98FDI_FORMAT; diff --git a/src/lib/formats/pk8020_dsk.h b/src/lib/formats/pk8020_dsk.h index 1700530c781..7a9da57651a 100644 --- a/src/lib/formats/pk8020_dsk.h +++ b/src/lib/formats/pk8020_dsk.h @@ -20,9 +20,9 @@ class pk8020_format : public wd177x_format public: pk8020_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/pyldin_dsk.h b/src/lib/formats/pyldin_dsk.h index 485a5c1e3fe..9ff5482e974 100644 --- a/src/lib/formats/pyldin_dsk.h +++ b/src/lib/formats/pyldin_dsk.h @@ -17,9 +17,9 @@ class pyldin_format : public upd765_format { public: pyldin_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/rx50_dsk.h b/src/lib/formats/rx50_dsk.h index 2fd09429c9a..37decb2fa09 100644 --- a/src/lib/formats/rx50_dsk.h +++ b/src/lib/formats/rx50_dsk.h @@ -22,14 +22,14 @@ class rx50img_format : public floppy_image_format_t public: rx50img_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; static const desc_e rx50_10_desc[]; diff --git a/src/lib/formats/sf7000_dsk.h b/src/lib/formats/sf7000_dsk.h index df84e36fe22..75f7ff7e314 100644 --- a/src/lib/formats/sf7000_dsk.h +++ b/src/lib/formats/sf7000_dsk.h @@ -17,9 +17,9 @@ class sf7000_format : public upd765_format { public: sf7000_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/smx_dsk.h b/src/lib/formats/smx_dsk.h index 0b8aba5ac07..36a3bd251b5 100644 --- a/src/lib/formats/smx_dsk.h +++ b/src/lib/formats/smx_dsk.h @@ -17,9 +17,9 @@ class smx_format : public wd177x_format { public: smx_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/st_dsk.h b/src/lib/formats/st_dsk.h index 0888c980c72..242d7e9cf5b 100644 --- a/src/lib/formats/st_dsk.h +++ b/src/lib/formats/st_dsk.h @@ -18,14 +18,14 @@ class st_format : public floppy_image_format_t public: st_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; private: void find_size(io_generic *io, UINT8 &track_count, UINT8 &head_count, UINT8 §or_count); @@ -36,14 +36,14 @@ class msa_format : public floppy_image_format_t public: msa_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; private: bool uncompress(UINT8 *buffer, int csize, int usize); diff --git a/src/lib/formats/svi_dsk.h b/src/lib/formats/svi_dsk.h index 6ffd74619a1..9ae933572df 100644 --- a/src/lib/formats/svi_dsk.h +++ b/src/lib/formats/svi_dsk.h @@ -20,14 +20,14 @@ class svi_format : public floppy_image_format_t public: svi_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_SVI_FORMAT; diff --git a/src/lib/formats/tandy2k_dsk.h b/src/lib/formats/tandy2k_dsk.h index c306018fa48..e69eead2e55 100644 --- a/src/lib/formats/tandy2k_dsk.h +++ b/src/lib/formats/tandy2k_dsk.h @@ -17,9 +17,9 @@ class tandy2k_format : public upd765_format { public: tandy2k_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/td0_dsk.cpp b/src/lib/formats/td0_dsk.cpp index 600a6868a4e..69b3e5bfc14 100644 --- a/src/lib/formats/td0_dsk.cpp +++ b/src/lib/formats/td0_dsk.cpp @@ -510,7 +510,7 @@ void td0dsk_t::reconst() for (i = 0, j = N_CHAR; j < T; i += 2, j++) { k = i + 1; f = freq[j] = freq[i] + freq[k]; - for (k = j - 1; f < freq[k]; k--); + for (k = j - 1; f < freq[k]; k--) {}; k++; l = (j - k) * 2; @@ -550,7 +550,7 @@ void td0dsk_t::update(int c) /* swap nodes to keep the tree freq-ordered */ if (k > freq[l = c + 1]) { - while (k > freq[++l]); + while (k > freq[++l]) {}; l--; freq[c] = freq[l]; freq[l] = k; diff --git a/src/lib/formats/ti99_dsk.h b/src/lib/formats/ti99_dsk.h index 94ae7cf1f36..64285c1dcce 100644 --- a/src/lib/formats/ti99_dsk.h +++ b/src/lib/formats/ti99_dsk.h @@ -35,7 +35,6 @@ protected: virtual void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) =0; int get_encoding(int cell_size); - int get_track_size(int cell_size); void generate_track_fm(int track, int head, int cell_size, UINT8* trackdata, floppy_image *image); void generate_track_mfm(int track, int head, int cell_size, UINT8* trackdata, floppy_image *image); diff --git a/src/lib/formats/tiki100_dsk.h b/src/lib/formats/tiki100_dsk.h index e3899f97ef9..4037ec5fe77 100644 --- a/src/lib/formats/tiki100_dsk.h +++ b/src/lib/formats/tiki100_dsk.h @@ -17,9 +17,9 @@ class tiki100_format : public wd177x_format { public: tiki100_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/trd_dsk.h b/src/lib/formats/trd_dsk.h index 1d830c6d6c5..de4b7ff63d5 100644 --- a/src/lib/formats/trd_dsk.h +++ b/src/lib/formats/trd_dsk.h @@ -17,9 +17,9 @@ class trd_format : public wd177x_format { public: trd_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/trs80_dsk.h b/src/lib/formats/trs80_dsk.h index 988d7ee2a7d..73583ca0f48 100644 --- a/src/lib/formats/trs80_dsk.h +++ b/src/lib/formats/trs80_dsk.h @@ -20,12 +20,12 @@ class trs80_format : public wd177x_format public: trs80_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; protected: - virtual int get_track_dam_fm(const format &f, int head, int track); + virtual int get_track_dam_fm(const format &f, int head, int track) override; private: static const format formats[]; diff --git a/src/lib/formats/upd765_dsk.cpp b/src/lib/formats/upd765_dsk.cpp index eef28c23a4b..d9da1c5bd21 100644 --- a/src/lib/formats/upd765_dsk.cpp +++ b/src/lib/formats/upd765_dsk.cpp @@ -16,7 +16,7 @@ upd765_format::upd765_format(const format *_formats) formats = _formats; } -int upd765_format::find_size(io_generic *io, UINT32 form_factor) +int upd765_format::find_size(io_generic *io, UINT32 form_factor) const { UINT64 size = io_generic_size(io); for(int i=0; formats[i].form_factor; i++) { @@ -232,7 +232,7 @@ bool upd765_format::save(io_generic *io, floppy_image *image) { // Count the number of formats int formats_count; - for(formats_count=0; formats[formats_count].form_factor; formats_count++); + for(formats_count=0; formats[formats_count].form_factor; formats_count++) {}; // Allocate the storage for the list of testable formats for a // given cell size diff --git a/src/lib/formats/upd765_dsk.h b/src/lib/formats/upd765_dsk.h index 12bda75d51b..a108931d89b 100644 --- a/src/lib/formats/upd765_dsk.h +++ b/src/lib/formats/upd765_dsk.h @@ -46,7 +46,7 @@ public: protected: floppy_image_format_t::desc_e* get_desc_fm(const format &f, int ¤t_size, int &end_gap_index); floppy_image_format_t::desc_e* get_desc_mfm(const format &f, int ¤t_size, int &end_gap_index); - int find_size(io_generic *io, UINT32 form_factor); + int find_size(io_generic *io, UINT32 form_factor) const; int compute_track_size(const format &f) const; virtual void build_sector_description(const format &d, UINT8 *sectdata, desc_s *sectors, int track, int head) const; void check_compatibility(floppy_image *image, std::vector &candidates); diff --git a/src/lib/formats/vector06_dsk.h b/src/lib/formats/vector06_dsk.h index cad2fa3ddf3..f884d79cf78 100644 --- a/src/lib/formats/vector06_dsk.h +++ b/src/lib/formats/vector06_dsk.h @@ -20,9 +20,9 @@ class vector06_format : public wd177x_format public: vector06_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/victor9k_dsk.h b/src/lib/formats/victor9k_dsk.h index 1564f1474f7..5664e66155b 100644 --- a/src/lib/formats/victor9k_dsk.h +++ b/src/lib/formats/victor9k_dsk.h @@ -27,14 +27,14 @@ public: victor9k_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - virtual bool supports_save() const { return true; } + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + virtual bool supports_save() const override { return true; } static int get_rpm(int head, int track); diff --git a/src/lib/formats/wd177x_dsk.cpp b/src/lib/formats/wd177x_dsk.cpp index 69458af0335..527fb69a234 100644 --- a/src/lib/formats/wd177x_dsk.cpp +++ b/src/lib/formats/wd177x_dsk.cpp @@ -227,7 +227,7 @@ bool wd177x_format::save(io_generic *io, floppy_image *image) { // Count the number of formats int formats_count; - for(formats_count=0; formats[formats_count].form_factor; formats_count++); + for(formats_count=0; formats[formats_count].form_factor; formats_count++) {}; // Allocate the storage for the list of testable formats for a // given cell size diff --git a/src/lib/formats/xdf_dsk.h b/src/lib/formats/xdf_dsk.h index 628d998be87..8ef01c846e4 100644 --- a/src/lib/formats/xdf_dsk.h +++ b/src/lib/formats/xdf_dsk.h @@ -17,9 +17,9 @@ class xdf_format : public upd765_format { public: xdf_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp index 49ae108e881..02e3ae93689 100644 --- a/src/osd/modules/debugger/debugint.cpp +++ b/src/osd/modules/debugger/debugint.cpp @@ -34,12 +34,12 @@ public: virtual ~debug_internal() { } - virtual int init(const osd_options &options) { return 0; } - virtual void exit(); + virtual int init(const osd_options &options) override { return 0; } + virtual void exit() override; - virtual void init_debugger(running_machine &machine); - virtual void wait_for_debugger(device_t &device, bool firststop); - virtual void debugger_update(); + virtual void init_debugger(running_machine &machine) override; + virtual void wait_for_debugger(device_t &device, bool firststop) override; + virtual void debugger_update() override; private: running_machine *m_machine; @@ -1143,8 +1143,8 @@ class ui_menu_debug : public ui_menu { public: ui_menu_debug(running_machine &machine, render_container *container) : ui_menu(machine, container) {} virtual ~ui_menu_debug() {} - virtual void populate() {} - virtual void handle() {} + virtual void populate() override {} + virtual void handle() override {} }; static void CreateMainMenu(running_machine &machine) diff --git a/src/osd/modules/debugger/debugwin.cpp b/src/osd/modules/debugger/debugwin.cpp index da32b678b67..b31d12ea67a 100644 --- a/src/osd/modules/debugger/debugwin.cpp +++ b/src/osd/modules/debugger/debugwin.cpp @@ -44,29 +44,29 @@ public: virtual ~debugger_windows() { } - virtual int init(const osd_options &options) { return 0; } - virtual void exit(); + virtual int init(const osd_options &options) override { return 0; } + virtual void exit() override; - virtual void init_debugger(running_machine &machine); - virtual void wait_for_debugger(device_t &device, bool firststop); - virtual void debugger_update(); + virtual void init_debugger(running_machine &machine) override; + virtual void wait_for_debugger(device_t &device, bool firststop) override; + virtual void debugger_update() override; protected: - virtual running_machine &machine() const { return *m_machine; } + virtual running_machine &machine() const override { return *m_machine; } - virtual ui_metrics &metrics() const { return *m_metrics; } + virtual ui_metrics &metrics() const override { return *m_metrics; } - virtual bool const &waiting_for_debugger() const { return m_waiting_for_debugger; } - virtual bool seq_pressed() const; + virtual bool const &waiting_for_debugger() const override { return m_waiting_for_debugger; } + virtual bool seq_pressed() const override; - virtual void create_memory_window() { create_window(); } - virtual void create_disasm_window() { create_window(); } - virtual void create_log_window() { create_window(); } - virtual void create_points_window() { create_window(); } - virtual void remove_window(debugwin_info &info); + virtual void create_memory_window() override { create_window(); } + virtual void create_disasm_window() override { create_window(); } + virtual void create_log_window() override { create_window(); } + virtual void create_points_window() override { create_window(); } + virtual void remove_window(debugwin_info &info) override; - virtual void show_all(); - virtual void hide_all(); + virtual void show_all() override; + virtual void hide_all() override; private: template T *create_window(); diff --git a/src/osd/modules/debugger/none.cpp b/src/osd/modules/debugger/none.cpp index f6b22a1883a..27157bbee1b 100644 --- a/src/osd/modules/debugger/none.cpp +++ b/src/osd/modules/debugger/none.cpp @@ -22,12 +22,12 @@ public: virtual ~debug_none() { } - virtual int init(const osd_options &options) { return 0; } - virtual void exit() { } + virtual int init(const osd_options &options) override { return 0; } + virtual void exit() override { } - virtual void init_debugger(running_machine &machine); - virtual void wait_for_debugger(device_t &device, bool firststop); - virtual void debugger_update(); + virtual void init_debugger(running_machine &machine) override; + virtual void wait_for_debugger(device_t &device, bool firststop) override; + virtual void debugger_update() override; private: running_machine *m_machine; diff --git a/src/osd/modules/debugger/win/consolewininfo.h b/src/osd/modules/debugger/win/consolewininfo.h index f788b044873..8281dda4e97 100644 --- a/src/osd/modules/debugger/win/consolewininfo.h +++ b/src/osd/modules/debugger/win/consolewininfo.h @@ -23,9 +23,9 @@ public: void set_cpu(device_t &device); protected: - virtual void recompute_children(); - virtual void update_menu(); - virtual bool handle_command(WPARAM wparam, LPARAM lparam); + virtual void recompute_children() override; + virtual void update_menu() override; + virtual bool handle_command(WPARAM wparam, LPARAM lparam) override; private: enum @@ -41,7 +41,7 @@ private: DEVOPTION_MAX }; - virtual void process_string(char const *string); + virtual void process_string(char const *string) override; static void build_generic_filter(device_image_interface *img, bool is_save, std::string &filter); static void add_filter_entry(std::string &dest, char const *description, char const *extensions); diff --git a/src/osd/modules/debugger/win/disasmbasewininfo.h b/src/osd/modules/debugger/win/disasmbasewininfo.h index 085ec351c98..26cd481b7f6 100644 --- a/src/osd/modules/debugger/win/disasmbasewininfo.h +++ b/src/osd/modules/debugger/win/disasmbasewininfo.h @@ -20,11 +20,11 @@ public: disasmbasewin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler); virtual ~disasmbasewin_info(); - virtual bool handle_key(WPARAM wparam, LPARAM lparam); + virtual bool handle_key(WPARAM wparam, LPARAM lparam) override; protected: - virtual void update_menu(); - virtual bool handle_command(WPARAM wparam, LPARAM lparam); + virtual void update_menu() override; + virtual bool handle_command(WPARAM wparam, LPARAM lparam) override; }; #endif diff --git a/src/osd/modules/debugger/win/disasmwininfo.h b/src/osd/modules/debugger/win/disasmwininfo.h index e55b74ba3c1..6297b628168 100644 --- a/src/osd/modules/debugger/win/disasmwininfo.h +++ b/src/osd/modules/debugger/win/disasmwininfo.h @@ -21,12 +21,12 @@ public: virtual ~disasmwin_info(); protected: - virtual void recompute_children(); - virtual bool handle_command(WPARAM wparam, LPARAM lparam); - virtual void draw_contents(HDC dc); + virtual void recompute_children() override; + virtual bool handle_command(WPARAM wparam, LPARAM lparam) override; + virtual void draw_contents(HDC dc) override; private: - virtual void process_string(char const *string); + virtual void process_string(char const *string) override; void update_caption(); diff --git a/src/osd/modules/debugger/win/editwininfo.h b/src/osd/modules/debugger/win/editwininfo.h index f1b729a1f59..5da80597272 100644 --- a/src/osd/modules/debugger/win/editwininfo.h +++ b/src/osd/modules/debugger/win/editwininfo.h @@ -20,9 +20,9 @@ public: editwin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler); virtual ~editwin_info(); - virtual bool restore_field(HWND wnd); + virtual bool restore_field(HWND wnd) override; - virtual bool set_default_focus(); + virtual bool set_default_focus() override; protected: static DWORD const COMBO_BOX_STYLE = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL; @@ -33,7 +33,7 @@ protected: void editwnd_select_all(); void set_edit_defstr(char const *string) { m_edit_defstr = string; } - virtual void draw_contents(HDC dc); + virtual void draw_contents(HDC dc) override; private: virtual void process_string(char const *string) = 0; diff --git a/src/osd/modules/debugger/win/memorywininfo.h b/src/osd/modules/debugger/win/memorywininfo.h index a52315829b8..f0fe535cf16 100644 --- a/src/osd/modules/debugger/win/memorywininfo.h +++ b/src/osd/modules/debugger/win/memorywininfo.h @@ -20,16 +20,16 @@ public: memorywin_info(debugger_windows_interface &debugger); virtual ~memorywin_info(); - virtual bool handle_key(WPARAM wparam, LPARAM lparam); + virtual bool handle_key(WPARAM wparam, LPARAM lparam) override; protected: - virtual void recompute_children(); - virtual void update_menu(); - virtual bool handle_command(WPARAM wparam, LPARAM lparam); - virtual void draw_contents(HDC dc); + virtual void recompute_children() override; + virtual void update_menu() override; + virtual bool handle_command(WPARAM wparam, LPARAM lparam) override; + virtual void draw_contents(HDC dc) override; private: - virtual void process_string(char const *string); + virtual void process_string(char const *string) override; void update_caption(); diff --git a/src/osd/modules/debugger/win/pointswininfo.h b/src/osd/modules/debugger/win/pointswininfo.h index a6c944bc160..8ba1b31fc00 100644 --- a/src/osd/modules/debugger/win/pointswininfo.h +++ b/src/osd/modules/debugger/win/pointswininfo.h @@ -20,11 +20,11 @@ public: pointswin_info(debugger_windows_interface &debugger); virtual ~pointswin_info(); - virtual bool handle_key(WPARAM wparam, LPARAM lparam); + virtual bool handle_key(WPARAM wparam, LPARAM lparam) override; protected: - virtual void update_menu(); - virtual bool handle_command(WPARAM wparam, LPARAM lparam); + virtual void update_menu() override; + virtual bool handle_command(WPARAM wparam, LPARAM lparam) override; }; #endif diff --git a/src/osd/modules/debugger/win/uimetrics.cpp b/src/osd/modules/debugger/win/uimetrics.cpp index aebbf1cfe06..7da41d6f79f 100644 --- a/src/osd/modules/debugger/win/uimetrics.cpp +++ b/src/osd/modules/debugger/win/uimetrics.cpp @@ -12,7 +12,7 @@ ui_metrics::ui_metrics(osd_options const &options) : - m_debug_font(NULL), + m_debug_font(nullptr), m_debug_font_height(0), m_debug_font_width(0), m_debug_font_ascent(0), diff --git a/src/osd/modules/font/font_none.cpp b/src/osd/modules/font/font_none.cpp index 7ea689c8f35..de9d01bb103 100644 --- a/src/osd/modules/font/font_none.cpp +++ b/src/osd/modules/font/font_none.cpp @@ -18,9 +18,9 @@ class osd_font_none : public osd_font public: virtual ~osd_font_none() { } - virtual bool open(const char *font_path, const char *name, int &height); - virtual void close(); - virtual bool get_bitmap(unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs); + virtual bool open(const char *font_path, const char *name, int &height) override; + virtual void close() override; + virtual bool get_bitmap(unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs) override; }; bool osd_font_none::open(const char *font_path, const char *_name, int &height) @@ -57,9 +57,9 @@ public: { } - virtual int init(const osd_options &options) { return 0; } + virtual int init(const osd_options &options) override { return 0; } - osd_font *font_alloc() + virtual osd_font *font_alloc() override { return global_alloc(osd_font_none); } diff --git a/src/osd/modules/font/font_windows.cpp b/src/osd/modules/font/font_windows.cpp index 6192c965564..6d561e5cddd 100644 --- a/src/osd/modules/font/font_windows.cpp +++ b/src/osd/modules/font/font_windows.cpp @@ -39,9 +39,9 @@ public: osd_font_windows(): m_font(NULL) { } virtual ~osd_font_windows() { } - virtual bool open(const char *font_path, const char *name, int &height); - virtual void close(); - virtual bool get_bitmap(unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs); + virtual bool open(const char *font_path, const char *name, int &height) override; + virtual void close() override; + virtual bool get_bitmap(unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs) override; private: HGDIOBJ m_font; }; @@ -273,9 +273,9 @@ public: { } - virtual int init(const osd_options &options) { return 0; } + virtual int init(const osd_options &options) override { return 0; } - osd_font *font_alloc() + virtual osd_font *font_alloc() override { return global_alloc(osd_font_windows); } diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h index c3501ec84b6..3e56996f9ec 100644 --- a/src/osd/modules/lib/osdobj_common.h +++ b/src/osd/modules/lib/osdobj_common.h @@ -166,20 +166,20 @@ public: virtual void register_options(); // general overridables - virtual void init(running_machine &machine); - virtual void update(bool skip_redraw); + virtual void init(running_machine &machine) override; + virtual void update(bool skip_redraw) override; // debugger overridables - virtual void init_debugger(); - virtual void wait_for_debugger(device_t &device, bool firststop); + virtual void init_debugger() override; + virtual void wait_for_debugger(device_t &device, bool firststop) override; // audio overridables - virtual void update_audio_stream(const INT16 *buffer, int samples_this_frame); - virtual void set_mastervolume(int attenuation); - virtual bool no_sound(); + virtual void update_audio_stream(const INT16 *buffer, int samples_this_frame) override; + virtual void set_mastervolume(int attenuation) override; + virtual bool no_sound() override; // input overridables - virtual void customize_input_type_list(simple_list &typelist); + virtual void customize_input_type_list(simple_list &typelist) override; // font overridables virtual osd_font *font_open(const char *name, int &height); @@ -187,14 +187,14 @@ public: virtual bool font_get_bitmap(osd_font *font, unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs); // video overridables - virtual void *get_slider_list(); + virtual void *get_slider_list() override; // command option overrides - virtual bool execute_command(const char *command); + virtual bool execute_command(const char *command) override; - osd_font *font_alloc() { return m_font_module->font_alloc(); } + virtual osd_font *font_alloc() override { return m_font_module->font_alloc(); } - osd_midi_device *create_midi_device() { return m_midi->create_midi_device(); } + virtual osd_midi_device *create_midi_device() override { return m_midi->create_midi_device(); } // FIXME: everything below seems to be osd specific and not part of // this INTERFACE but part of the osd IMPLEMENTATION @@ -227,7 +227,7 @@ public: osd_options &options() { return m_options; } // osd_output interface ... - virtual void output_callback(osd_output_channel channel, const char *msg, va_list args); + virtual void output_callback(osd_output_channel channel, const char *msg, va_list args) override; protected: virtual bool input_init(); diff --git a/src/osd/modules/midi/none.cpp b/src/osd/modules/midi/none.cpp index 12e15558a4d..1c16c5e04b2 100644 --- a/src/osd/modules/midi/none.cpp +++ b/src/osd/modules/midi/none.cpp @@ -23,11 +23,11 @@ public: } virtual ~none_module() { } - virtual int init(const osd_options &options); - virtual void exit(); + virtual int init(const osd_options &options) override; + virtual void exit() override; - osd_midi_device *create_midi_device(); - void list_midi_devices(void); + virtual osd_midi_device *create_midi_device() override; + virtual void list_midi_devices(void) override; }; @@ -35,12 +35,12 @@ class osd_midi_device_none : public osd_midi_device { public: virtual ~osd_midi_device_none() { } - virtual bool open_input(const char *devname); - virtual bool open_output(const char *devname); - virtual void close(); - virtual bool poll(); - virtual int read(UINT8 *pOut); - virtual void write(UINT8 data); + virtual bool open_input(const char *devname) override; + virtual bool open_output(const char *devname) override; + virtual void close() override; + virtual bool poll() override; + virtual int read(UINT8 *pOut) override; + virtual void write(UINT8 data) override; }; osd_midi_device *none_module::create_midi_device() diff --git a/src/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp index 9aa02c63c5b..a158b9033cd 100644 --- a/src/osd/modules/midi/portmidi.cpp +++ b/src/osd/modules/midi/portmidi.cpp @@ -30,11 +30,11 @@ public: } virtual ~pm_module() { } - virtual int init(const osd_options &options); - virtual void exit(); + virtual int init(const osd_options &options)override; + virtual void exit()override; - osd_midi_device *create_midi_device(); - void list_midi_devices(void); + virtual osd_midi_device *create_midi_device() override; + virtual void list_midi_devices(void) override; }; @@ -48,12 +48,12 @@ class osd_midi_device_pm : public osd_midi_device public: osd_midi_device_pm(): pmStream(nullptr), xmit_cnt(0), last_status(0), rx_sysex(false) { } virtual ~osd_midi_device_pm() { } - virtual bool open_input(const char *devname); - virtual bool open_output(const char *devname); - virtual void close(); - virtual bool poll(); - virtual int read(UINT8 *pOut); - virtual void write(UINT8 data); + virtual bool open_input(const char *devname) override; + virtual bool open_output(const char *devname) override; + virtual void close() override; + virtual bool poll() override; + virtual int read(UINT8 *pOut) override; + virtual void write(UINT8 data) override; private: PortMidiStream *pmStream; diff --git a/src/osd/modules/netdev/none.cpp b/src/osd/modules/netdev/none.cpp index d5b11392309..5a9be50a36c 100644 --- a/src/osd/modules/netdev/none.cpp +++ b/src/osd/modules/netdev/none.cpp @@ -15,7 +15,8 @@ public: : osd_module(OSD_NETDEV_PROVIDER, "none"), netdev_module() { } - int init(const osd_options &options) { return 0; } + + virtual int init(const osd_options &options) override { return 0; } }; MODULE_DEFINITION(NETDEV_NONE, netdev_none) diff --git a/src/osd/modules/netdev/pcap.cpp b/src/osd/modules/netdev/pcap.cpp index 833548cfabb..1e4f7dbea5e 100644 --- a/src/osd/modules/netdev/pcap.cpp +++ b/src/osd/modules/netdev/pcap.cpp @@ -60,10 +60,10 @@ public: } virtual ~pcap_module() { } - virtual int init(const osd_options &options); - virtual void exit(); + virtual int init(const osd_options &options) override; + virtual void exit() override; - virtual bool probe(); + virtual bool probe() override; HMODULE handle; }; @@ -109,10 +109,10 @@ public: netdev_pcap(const char *name, class device_network_interface *ifdev, int rate); ~netdev_pcap(); - int send(UINT8 *buf, int len); - void set_mac(const char *mac); + virtual int send(UINT8 *buf, int len) override; + virtual void set_mac(const char *mac) override; protected: - int recv_dev(UINT8 **buf); + virtual int recv_dev(UINT8 **buf) override; private: pcap_t *m_p; #ifdef SDLMAME_MACOSX diff --git a/src/osd/modules/osdmodule.h b/src/osd/modules/osdmodule.h index 1a49b5ff4f9..1e545aa299b 100644 --- a/src/osd/modules/osdmodule.h +++ b/src/osd/modules/osdmodule.h @@ -102,8 +102,8 @@ private: class _mod : public osd_module { \ public: \ _mod () : osd_module(_type, _name) { } \ - int init(const osd_options &options) { return -1; } \ - bool probe() { return false; } \ + virtual int init(const osd_options &options) override { return -1; } \ + virtual bool probe() override { return false; } \ }; #endif /* __OSDMODULE_H__ */ diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp index 1920aa94684..ee808bfc197 100644 --- a/src/osd/modules/render/drawbgfx.cpp +++ b/src/osd/modules/render/drawbgfx.cpp @@ -64,17 +64,17 @@ public: m_last_blit_time(0), m_last_blit_pixels(0) {} - /* virtual */ int create(); - /* virtual */ int draw(const int update); + virtual int create() override; + virtual int draw(const int update) override; #ifdef OSD_SDL - /* virtual */ int xy_to_render_target(const int x, const int y, int *xt, int *yt); + virtual int xy_to_render_target(const int x, const int y, int *xt, int *yt) override; #else - /* virtual */ void save() { } - /* virtual */ void record() { } - /* virtual */ void toggle_fsfx() { } + virtual void save() override { } + virtual void record() override { } + virtual void toggle_fsfx() override { } #endif - /* virtual */ void destroy(); - /* virtual */ render_primitive_list *get_primitives() + virtual void destroy() override; + virtual render_primitive_list *get_primitives() override { #ifdef OSD_WINDOWS RECT client; diff --git a/src/osd/modules/render/drawd3d.h b/src/osd/modules/render/drawd3d.h index daedf235bd3..ab5385914b5 100644 --- a/src/osd/modules/render/drawd3d.h +++ b/src/osd/modules/render/drawd3d.h @@ -101,13 +101,13 @@ public: renderer(osd_window *window); virtual ~renderer(); - virtual int create(); - virtual render_primitive_list *get_primitives(); - virtual int draw(const int update); - virtual void save(); - virtual void record(); - virtual void toggle_fsfx(); - virtual void destroy(); + virtual int create() override; + virtual render_primitive_list *get_primitives() override; + virtual int draw(const int update) override; + virtual void save() override; + virtual void record() override; + virtual void toggle_fsfx() override; + virtual void destroy() override; int initialize(); diff --git a/src/osd/modules/render/drawdd.cpp b/src/osd/modules/render/drawdd.cpp index a4dfc58777b..8ba2df0df91 100644 --- a/src/osd/modules/render/drawdd.cpp +++ b/src/osd/modules/render/drawdd.cpp @@ -64,13 +64,13 @@ public: virtual ~renderer_dd() { } - virtual int create(); - virtual render_primitive_list *get_primitives(); - virtual int draw(const int update); - virtual void save() {}; - virtual void record() {}; - virtual void toggle_fsfx() {}; - virtual void destroy(); + virtual int create() override; + virtual render_primitive_list *get_primitives() override; + virtual int draw(const int update) override; + virtual void save() override {}; + virtual void record() override {}; + virtual void toggle_fsfx() override {}; + virtual void destroy() override; int width, height; // current width, height int refresh; // current refresh rate diff --git a/src/osd/modules/render/drawgdi.cpp b/src/osd/modules/render/drawgdi.cpp index ccbbc6c03eb..11e61a28407 100644 --- a/src/osd/modules/render/drawgdi.cpp +++ b/src/osd/modules/render/drawgdi.cpp @@ -30,13 +30,13 @@ public: virtual ~renderer_gdi() { } - virtual int create(); - virtual render_primitive_list *get_primitives(); - virtual int draw(const int update); - virtual void save() {}; - virtual void record() {}; - virtual void toggle_fsfx() {}; - virtual void destroy(); + virtual int create() override; + virtual render_primitive_list *get_primitives() override; + virtual int draw(const int update) override; + virtual void save() override {}; + virtual void record() override {}; + virtual void toggle_fsfx() override {}; + virtual void destroy() override; private: /* gdi_info is the information for the current screen */ diff --git a/src/osd/modules/render/drawnone.cpp b/src/osd/modules/render/drawnone.cpp index 08bd81666ca..9f45683e6da 100644 --- a/src/osd/modules/render/drawnone.cpp +++ b/src/osd/modules/render/drawnone.cpp @@ -25,13 +25,13 @@ public: virtual ~renderer_none() { } - virtual int create(); - virtual render_primitive_list *get_primitives(); - virtual int draw(const int update); - virtual void save() { }; - virtual void record() { }; - virtual void toggle_fsfx() { }; - virtual void destroy(); + virtual int create() override; + virtual render_primitive_list *get_primitives() override; + virtual int draw(const int update) override; + virtual void save() override { }; + virtual void record() override { }; + virtual void toggle_fsfx() override { }; + virtual void destroy() override; }; //============================================================ diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp index de04e04a580..750eb5ae2d6 100644 --- a/src/osd/modules/render/drawogl.cpp +++ b/src/osd/modules/render/drawogl.cpp @@ -233,12 +233,12 @@ public: ReleaseDC(m_window, m_hdc); } - virtual void MakeCurrent() + virtual void MakeCurrent() override { this->pfn_wglMakeCurrent(m_hdc, m_context); } - virtual const char *LastErrorMsg() + virtual const char *LastErrorMsg() override { if (m_error[0] == 0) return NULL; @@ -246,7 +246,7 @@ public: return m_error; } - virtual void *getProcAddress(const char *proc) + virtual void *getProcAddress(const char *proc) override { void *ret = (void *) GetProcAddress(m_module, proc); if (ret == NULL) @@ -254,7 +254,7 @@ public: return ret; } - virtual int SetSwapInterval(const int swap) + virtual int SetSwapInterval(const int swap) override { if (this->pfn_wglSwapIntervalEXT != NULL) { @@ -263,7 +263,7 @@ public: return 0; } - virtual void SwapBuffer() + virtual void SwapBuffer() override { SwapBuffers(m_hdc); //wglSwapLayerBuffers(GetDC(window().m_hwnd), WGL_SWAP_MAIN_PLANE); @@ -535,12 +535,12 @@ public: m_texVerticex[i] = 0.0f; } - /* virtual */ int create(); - /* virtual */ int draw(const int update); + virtual int create() override; + virtual int draw(const int update) override; - /* virtual */ int xy_to_render_target(const int x, const int y, int *xt, int *yt); - /* virtual */ void destroy(); - /* virtual */ render_primitive_list *get_primitives() + int xy_to_render_target(const int x, const int y, int *xt, int *yt); + virtual void destroy() override; + virtual render_primitive_list *get_primitives() override { #ifdef OSD_WINDOWS osd_dim nd = window().get_size(); @@ -556,9 +556,9 @@ public: return &window().target()->get_primitives(); } - /* virtual */ void save() { } - /* virtual */ void record() { } - /* virtual */ void toggle_fsfx() { } + virtual void save() override { } + virtual void record() override { } + virtual void toggle_fsfx() override { } private: void destroy_all_textures(); diff --git a/src/osd/modules/sound/direct_sound.cpp b/src/osd/modules/sound/direct_sound.cpp index 01610e2a9d3..78996093e77 100644 --- a/src/osd/modules/sound/direct_sound.cpp +++ b/src/osd/modules/sound/direct_sound.cpp @@ -66,12 +66,12 @@ public: } virtual ~sound_direct_sound() { } - virtual int init(osd_options const &options); - virtual void exit(); + virtual int init(osd_options const &options) override; + virtual void exit() override; // sound_module - virtual void update_audio_stream(bool is_throttled, INT16 const *buffer, int samples_this_frame); - virtual void set_mastervolume(int attenuation); + virtual void update_audio_stream(bool is_throttled, INT16 const *buffer, int samples_this_frame) override; + virtual void set_mastervolume(int attenuation) override; private: class buffer diff --git a/src/osd/modules/sound/none.cpp b/src/osd/modules/sound/none.cpp index 2c2e07b8198..651f74021bf 100644 --- a/src/osd/modules/sound/none.cpp +++ b/src/osd/modules/sound/none.cpp @@ -20,13 +20,13 @@ public: } virtual ~sound_none() { } - virtual int init(const osd_options &options) { return 0; } - virtual void exit() { } + virtual int init(const osd_options &options) override { return 0; } + virtual void exit() override { } // sound_module - virtual void update_audio_stream(bool is_throttled, const INT16 *buffer, int samples_this_frame) { } - virtual void set_mastervolume(int attenuation) { } + virtual void update_audio_stream(bool is_throttled, const INT16 *buffer, int samples_this_frame) override { } + virtual void set_mastervolume(int attenuation) override { } }; diff --git a/src/osd/windows/video.h b/src/osd/windows/video.h index 875aebe81b5..9215dc189bf 100644 --- a/src/osd/windows/video.h +++ b/src/osd/windows/video.h @@ -150,7 +150,7 @@ public: win_monitor_info(const HMONITOR handle, const char *monitor_device, float aspect); virtual ~win_monitor_info(); - virtual void refresh(); + virtual void refresh() override; // static diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h index 10a871d2f5f..0010d2bbd28 100644 --- a/src/osd/windows/window.h +++ b/src/osd/windows/window.h @@ -39,28 +39,28 @@ public: win_window_info(running_machine &machine); virtual ~win_window_info(); - running_machine &machine() const { return m_machine; } + running_machine &machine() const override { return m_machine; } - render_target *target() { return m_target; } - int fullscreen() const { return m_fullscreen; } + virtual render_target *target() override { return m_target; } + int fullscreen() const override { return m_fullscreen; } void update(); - osd_monitor_info *winwindow_video_window_monitor(const osd_rect *proposed); + virtual osd_monitor_info *winwindow_video_window_monitor(const osd_rect *proposed) override; - bool win_has_menu() + virtual bool win_has_menu() override { return GetMenu(m_hwnd) ? true : false; } - /* virtual */ osd_dim get_size() + virtual osd_dim get_size() override { RECT client; GetClientRect(m_hwnd, &client); return osd_dim(client.right - client.left, client.bottom - client.top); } - osd_monitor_info *monitor() const { return m_monitor; } + virtual osd_monitor_info *monitor() const override { return m_monitor; } void destroy(); diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp index a7b946332c7..e3d8d9cccc6 100644 --- a/src/osd/windows/winmain.cpp +++ b/src/osd/windows/winmain.cpp @@ -199,7 +199,7 @@ private: class winui_output_error : public osd_output { public: - virtual void output_callback(osd_output_channel channel, const char *msg, va_list args) + virtual void output_callback(osd_output_channel channel, const char *msg, va_list args) override { if (channel == OSD_OUTPUT_CHANNEL_ERROR) { diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h index 27b503fa99c..4c15cd1cbf6 100644 --- a/src/osd/windows/winmain.h +++ b/src/osd/windows/winmain.h @@ -240,35 +240,35 @@ public: virtual ~windows_osd_interface(); // general overridables - virtual void init(running_machine &machine); - virtual void update(bool skip_redraw); + virtual void init(running_machine &machine) override; + virtual void update(bool skip_redraw) override; // video overridables - virtual void *get_slider_list(); + virtual void *get_slider_list() override; // input overridables - virtual void customize_input_type_list(simple_list &typelist); + virtual void customize_input_type_list(simple_list &typelist) override; - virtual void video_register(); + virtual void video_register() override; - virtual bool video_init(); - virtual bool window_init(); - virtual bool input_init(); - virtual void input_pause(); - virtual void input_resume(); - virtual bool output_init(); + virtual bool video_init() override; + virtual bool window_init() override; + virtual bool input_init() override; + virtual void input_pause() override; + virtual void input_resume() override; + virtual bool output_init() override; - virtual void video_exit(); - virtual void window_exit(); - virtual void input_exit(); - virtual void output_exit(); + virtual void video_exit() override; + virtual void window_exit() override; + virtual void input_exit() override; + virtual void output_exit() override; void extract_video_config(); windows_options &options() { return m_options; } private: - void osd_exit(); + virtual void osd_exit() override; windows_options &m_options; static const int DEFAULT_FONT_HEIGHT = 200; -- cgit v1.2.3-70-g09d2