summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-05 20:32:27 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-05 21:20:53 +0100
commit1c4865d66ff88a6891ebdde4580c3d61ee46ffa2 (patch)
tree268936fc8389b1a2adb8bfc3fa3006f12a4ccc95 /src/lib
parente8516832e941e39fa1db11211249afa9f015e7bb (diff)
override part 1 (nw)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/abc800_dsk.h6
-rw-r--r--src/lib/formats/abcfd2_dsk.h6
-rw-r--r--src/lib/formats/adam_dsk.h6
-rw-r--r--src/lib/formats/ap2_dsk.h40
-rw-r--r--src/lib/formats/apollo_dsk.h8
-rw-r--r--src/lib/formats/c3040_dsk.h14
-rw-r--r--src/lib/formats/c4040_dsk.h12
-rw-r--r--src/lib/formats/c8280_dsk.h6
-rw-r--r--src/lib/formats/ccvf_dsk.h12
-rw-r--r--src/lib/formats/cgenie_dsk.h10
-rw-r--r--src/lib/formats/comx35_dsk.h6
-rw-r--r--src/lib/formats/concept_dsk.h16
-rw-r--r--src/lib/formats/cpis_dsk.h6
-rw-r--r--src/lib/formats/d64_dsk.h16
-rw-r--r--src/lib/formats/d71_dsk.h6
-rw-r--r--src/lib/formats/d80_dsk.h18
-rw-r--r--src/lib/formats/d81_dsk.h8
-rw-r--r--src/lib/formats/d82_dsk.h6
-rw-r--r--src/lib/formats/dmk_dsk.h16
-rw-r--r--src/lib/formats/ep64_dsk.h6
-rw-r--r--src/lib/formats/g64_dsk.h16
-rw-r--r--src/lib/formats/iq151_dsk.h6
-rw-r--r--src/lib/formats/jvc_dsk.h16
-rw-r--r--src/lib/formats/kc85_dsk.h6
-rw-r--r--src/lib/formats/mfm_hd.h8
-rw-r--r--src/lib/formats/msx_dsk.h6
-rw-r--r--src/lib/formats/nascom_dsk.h6
-rw-r--r--src/lib/formats/naslite_dsk.h8
-rw-r--r--src/lib/formats/oric_dsk.h16
-rw-r--r--src/lib/formats/pc_dsk.h6
-rw-r--r--src/lib/formats/ql_dsk.h6
-rw-r--r--src/lib/formats/ti99_dsk.h42
-rw-r--r--src/lib/formats/tvc_dsk.h6
-rw-r--r--src/lib/formats/upd765_dsk.h8
-rw-r--r--src/lib/formats/vdk_dsk.h16
-rw-r--r--src/lib/formats/wd177x_dsk.h8
36 files changed, 202 insertions, 202 deletions
diff --git a/src/lib/formats/abc800_dsk.h b/src/lib/formats/abc800_dsk.h
index 96a15d3817e..28d5e5b01ad 100644
--- a/src/lib/formats/abc800_dsk.h
+++ b/src/lib/formats/abc800_dsk.h
@@ -17,9 +17,9 @@ class abc800_format : public wd177x_format {
public:
abc800_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/abcfd2_dsk.h b/src/lib/formats/abcfd2_dsk.h
index a97e46cb5ed..b9eacfb55ba 100644
--- a/src/lib/formats/abcfd2_dsk.h
+++ b/src/lib/formats/abcfd2_dsk.h
@@ -17,9 +17,9 @@ class abc_fd2_format : public wd177x_format {
public:
abc_fd2_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/adam_dsk.h b/src/lib/formats/adam_dsk.h
index 717c81cbe7f..0f378edcb58 100644
--- a/src/lib/formats/adam_dsk.h
+++ b/src/lib/formats/adam_dsk.h
@@ -17,9 +17,9 @@ class adam_format : public wd177x_format {
public:
adam_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.h b/src/lib/formats/ap2_dsk.h
index a5bd53f0926..19e55e05ff0 100644
--- a/src/lib/formats/ap2_dsk.h
+++ b/src/lib/formats/ap2_dsk.h
@@ -39,14 +39,14 @@ class a2_16sect_format : public floppy_image_format_t
public:
a2_16sect_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:
static const desc_e mac_gcr[];
@@ -64,14 +64,14 @@ class a2_rwts18_format : public floppy_image_format_t
public:
a2_rwts18_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:
static const desc_e mac_gcr[];
@@ -88,13 +88,13 @@ class a2_edd_format : public floppy_image_format_t
public:
a2_edd_format();
- 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 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;
- 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 UINT8 pick(const UINT8 *data, int pos);
diff --git a/src/lib/formats/apollo_dsk.h b/src/lib/formats/apollo_dsk.h
index 05013d79055..51f9eb4aebc 100644
--- a/src/lib/formats/apollo_dsk.h
+++ b/src/lib/formats/apollo_dsk.h
@@ -17,10 +17,10 @@ class apollo_format : public upd765_format {
public:
apollo_format();
- virtual int identify(io_generic *io, UINT32 form_factor);
- 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 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/c3040_dsk.h b/src/lib/formats/c3040_dsk.h
index cbf320273a8..659b2748571 100644
--- a/src/lib/formats/c3040_dsk.h
+++ b/src/lib/formats/c3040_dsk.h
@@ -17,15 +17,15 @@ class c3040_format : public d64_format {
public:
c3040_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_sectors_per_track(const format &f, int track) { return c3040_sectors_per_track[track]; }
- virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int &current_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2);
- virtual int get_gap2(const format &f, int head, int track) { return c3040_gap2[track]; }
- virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size);
+ virtual int get_sectors_per_track(const format &f, int track) override { return c3040_sectors_per_track[track]; }
+ virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int &current_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2) override;
+ virtual int get_gap2(const format &f, int head, int track) override { return c3040_gap2[track]; }
+ virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size) override;
static const format file_formats[];
diff --git a/src/lib/formats/c4040_dsk.h b/src/lib/formats/c4040_dsk.h
index 231b961c765..591fcd42925 100644
--- a/src/lib/formats/c4040_dsk.h
+++ b/src/lib/formats/c4040_dsk.h
@@ -17,14 +17,14 @@ class c4040_format : public d64_format {
public:
c4040_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 floppy_image_format_t::desc_e* get_sector_desc(const format &f, int &current_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2);
- virtual int get_gap2(const format &f, int head, int track) { return c4040_gap2[track]; }
- virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size);
+ virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int &current_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2) override;
+ virtual int get_gap2(const format &f, int head, int track) override { return c4040_gap2[track]; }
+ virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size) override;
static const format file_formats[];
diff --git a/src/lib/formats/c8280_dsk.h b/src/lib/formats/c8280_dsk.h
index eed34f5d846..b30ea667241 100644
--- a/src/lib/formats/c8280_dsk.h
+++ b/src/lib/formats/c8280_dsk.h
@@ -17,9 +17,9 @@ class c8280_format : public wd177x_format {
public:
c8280_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/ccvf_dsk.h b/src/lib/formats/ccvf_dsk.h
index 9577c180c24..671b0c0f88c 100644
--- a/src/lib/formats/ccvf_dsk.h
+++ b/src/lib/formats/ccvf_dsk.h
@@ -32,13 +32,13 @@ public:
ccvf_format();
ccvf_format(const format *formats);
- 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;
- 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 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;
protected:
const format *formats;
diff --git a/src/lib/formats/cgenie_dsk.h b/src/lib/formats/cgenie_dsk.h
index 1eda22404c5..0cd402225d9 100644
--- a/src/lib/formats/cgenie_dsk.h
+++ b/src/lib/formats/cgenie_dsk.h
@@ -20,13 +20,13 @@ class cgenie_format : public wd177x_format
public:
cgenie_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_mfm(const format &f, int head, int track);
+ virtual int get_track_dam_fm(const format &f, int head, int track) override;
+ virtual int get_track_dam_mfm(const format &f, int head, int track) override;
private:
static const format formats[];
diff --git a/src/lib/formats/comx35_dsk.h b/src/lib/formats/comx35_dsk.h
index 03a298673e5..1dc91806e3c 100644
--- a/src/lib/formats/comx35_dsk.h
+++ b/src/lib/formats/comx35_dsk.h
@@ -17,9 +17,9 @@ class comx35_format : public wd177x_format {
public:
comx35_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/concept_dsk.h b/src/lib/formats/concept_dsk.h
index 171798c0fc6..87444c31ab0 100644
--- a/src/lib/formats/concept_dsk.h
+++ b/src/lib/formats/concept_dsk.h
@@ -18,14 +18,14 @@ class cc525dsdd_format : public floppy_image_format_t
public:
cc525dsdd_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 cc_9_desc[];
diff --git a/src/lib/formats/cpis_dsk.h b/src/lib/formats/cpis_dsk.h
index 3879c6a17c6..98d303c85fe 100644
--- a/src/lib/formats/cpis_dsk.h
+++ b/src/lib/formats/cpis_dsk.h
@@ -17,9 +17,9 @@ class cpis_format : public upd765_format {
public:
cpis_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/d64_dsk.h b/src/lib/formats/d64_dsk.h
index ec99a36251b..5eaecc3b042 100644
--- a/src/lib/formats/d64_dsk.h
+++ b/src/lib/formats/d64_dsk.h
@@ -30,14 +30,14 @@ public:
d64_format();
d64_format(const format *formats);
- 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; }
protected:
enum
diff --git a/src/lib/formats/d71_dsk.h b/src/lib/formats/d71_dsk.h
index 5dc8a356186..eff2cff2c2a 100644
--- a/src/lib/formats/d71_dsk.h
+++ b/src/lib/formats/d71_dsk.h
@@ -17,9 +17,9 @@ class d71_format : public d64_format {
public:
d71_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:
static const format formats[];
diff --git a/src/lib/formats/d80_dsk.h b/src/lib/formats/d80_dsk.h
index e48984b2322..d823b85a9bc 100644
--- a/src/lib/formats/d80_dsk.h
+++ b/src/lib/formats/d80_dsk.h
@@ -18,19 +18,19 @@ public:
d80_format();
d80_format(const format *formats);
- 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:
const format *formats;
- 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);
- virtual int get_disk_id_offset(const format &f);
- virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int &current_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2);
- virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size);
+ virtual int get_physical_track(const format &f, int head, int track) override;
+ virtual UINT32 get_cell_size(const format &f, int track) override;
+ virtual int get_sectors_per_track(const format &f, int track) override;
+ virtual int get_disk_id_offset(const format &f) override;
+ virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int &current_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2) override;
+ virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size) override;
static const format file_formats[];
diff --git a/src/lib/formats/d81_dsk.h b/src/lib/formats/d81_dsk.h
index 6ea96c70b17..80c95b2a91d 100644
--- a/src/lib/formats/d81_dsk.h
+++ b/src/lib/formats/d81_dsk.h
@@ -17,11 +17,11 @@ class d81_format : public wd177x_format {
public:
d81_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;
- virtual floppy_image_format_t::desc_e* get_desc_mfm(const format &f, int &current_size, int &end_gap_index);
+ virtual floppy_image_format_t::desc_e* get_desc_mfm(const format &f, int &current_size, int &end_gap_index) override;
private:
static const format formats[];
diff --git a/src/lib/formats/d82_dsk.h b/src/lib/formats/d82_dsk.h
index 8753fc62d0c..8919deee775 100644
--- a/src/lib/formats/d82_dsk.h
+++ b/src/lib/formats/d82_dsk.h
@@ -17,9 +17,9 @@ class d82_format : public d80_format {
public:
d82_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:
static const format file_formats[];
diff --git a/src/lib/formats/dmk_dsk.h b/src/lib/formats/dmk_dsk.h
index f89fed8f95d..5a2f2f6cb7c 100644
--- a/src/lib/formats/dmk_dsk.h
+++ b/src/lib/formats/dmk_dsk.h
@@ -20,14 +20,14 @@ class dmk_format : public floppy_image_format_t
public:
dmk_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_DMK_FORMAT;
diff --git a/src/lib/formats/ep64_dsk.h b/src/lib/formats/ep64_dsk.h
index e6e3fdda21a..47d05594964 100644
--- a/src/lib/formats/ep64_dsk.h
+++ b/src/lib/formats/ep64_dsk.h
@@ -17,9 +17,9 @@ class ep64_format : public wd177x_format {
public:
ep64_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/g64_dsk.h b/src/lib/formats/g64_dsk.h
index f7f06548ede..ddc12636b7e 100644
--- a/src/lib/formats/g64_dsk.h
+++ b/src/lib/formats/g64_dsk.h
@@ -18,14 +18,14 @@ class g64_format : public floppy_image_format_t {
public:
g64_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 { return true; }
+ 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 { return true; }
protected:
enum
diff --git a/src/lib/formats/iq151_dsk.h b/src/lib/formats/iq151_dsk.h
index 9f2b69d7617..472cbaf64f9 100644
--- a/src/lib/formats/iq151_dsk.h
+++ b/src/lib/formats/iq151_dsk.h
@@ -17,9 +17,9 @@ class iq151_format : public upd765_format {
public:
iq151_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/jvc_dsk.h b/src/lib/formats/jvc_dsk.h
index eaeeefb84aa..244c84a8592 100644
--- a/src/lib/formats/jvc_dsk.h
+++ b/src/lib/formats/jvc_dsk.h
@@ -32,14 +32,14 @@ public:
int header_size;
};
- 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:
bool parse_header(io_generic *io, int &header_size, int &tracks, int &heads, int &sectors, int &sector_size, int &base_sector_id);
diff --git a/src/lib/formats/kc85_dsk.h b/src/lib/formats/kc85_dsk.h
index f13ba7f6a0d..c941a9e7647 100644
--- a/src/lib/formats/kc85_dsk.h
+++ b/src/lib/formats/kc85_dsk.h
@@ -17,9 +17,9 @@ class kc85_format : public upd765_format {
public:
kc85_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 dfa4d3ffba7..45963e2c3d5 100644
--- a/src/lib/formats/mfm_hd.h
+++ b/src/lib/formats/mfm_hd.h
@@ -195,12 +195,12 @@ class mfmhd_generic_format : public mfmhd_image_format_t
{
public:
mfmhd_generic_format() { m_devtag = std::string("mfmhd_generic_format"); };
- chd_error load(chd_file* chdfile, UINT16* trackimage, int tracksize, int cylinder, int head);
- chd_error save(chd_file* chdfile, UINT16* trackimage, int tracksize, int cylinder, int head);
+ chd_error load(chd_file* chdfile, UINT16* trackimage, int tracksize, int cylinder, int head) override;
+ chd_error save(chd_file* chdfile, UINT16* trackimage, int tracksize, int cylinder, int head) override;
// Yes, we want to save all parameters
- virtual bool save_param(mfmhd_param_t type) { return true; }
- virtual int get_default(mfmhd_param_t type);
+ virtual bool save_param(mfmhd_param_t type) override { return true; }
+ virtual int get_default(mfmhd_param_t type) override;
protected:
virtual UINT8 cylinder_to_ident(int cylinder);
diff --git a/src/lib/formats/msx_dsk.h b/src/lib/formats/msx_dsk.h
index 94a5411c51a..d776620624d 100644
--- a/src/lib/formats/msx_dsk.h
+++ b/src/lib/formats/msx_dsk.h
@@ -19,9 +19,9 @@ class msx_format: public upd765_format {
public:
msx_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/nascom_dsk.h b/src/lib/formats/nascom_dsk.h
index 95b1e80e49e..a1c3653cdac 100644
--- a/src/lib/formats/nascom_dsk.h
+++ b/src/lib/formats/nascom_dsk.h
@@ -20,9 +20,9 @@ class nascom_format : public wd177x_format
public:
nascom_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/naslite_dsk.h b/src/lib/formats/naslite_dsk.h
index e9ab87488f0..00f9df1567e 100644
--- a/src/lib/formats/naslite_dsk.h
+++ b/src/lib/formats/naslite_dsk.h
@@ -17,14 +17,14 @@ class naslite_format : public upd765_format {
public:
naslite_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:
static const format formats[];
- virtual void build_sector_description(const format &d, UINT8 *sectdata, desc_s *sectors, int track, int head) const;
+ virtual void build_sector_description(const format &d, UINT8 *sectdata, desc_s *sectors, int track, int head) const override;
};
extern const floppy_format_type FLOPPY_NASLITE_FORMAT;
diff --git a/src/lib/formats/oric_dsk.h b/src/lib/formats/oric_dsk.h
index 97bd6e35408..3eeb719eed0 100644
--- a/src/lib/formats/oric_dsk.h
+++ b/src/lib/formats/oric_dsk.h
@@ -17,14 +17,14 @@ class oric_dsk_format : public floppy_image_format_t
{
public:
oric_dsk_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_ORIC_DSK_FORMAT;
diff --git a/src/lib/formats/pc_dsk.h b/src/lib/formats/pc_dsk.h
index f6e1fbc5637..381ad49e99a 100644
--- a/src/lib/formats/pc_dsk.h
+++ b/src/lib/formats/pc_dsk.h
@@ -24,9 +24,9 @@ class pc_format : public upd765_format
public:
pc_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/ql_dsk.h b/src/lib/formats/ql_dsk.h
index 7c7f52be852..96003df6984 100644
--- a/src/lib/formats/ql_dsk.h
+++ b/src/lib/formats/ql_dsk.h
@@ -17,9 +17,9 @@ class ql_format : public wd177x_format {
public:
ql_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/ti99_dsk.h b/src/lib/formats/ti99_dsk.h
index a61d3da1a69..94ae7cf1f36 100644
--- a/src/lib/formats/ti99_dsk.h
+++ b/src/lib/formats/ti99_dsk.h
@@ -19,9 +19,9 @@
class ti99_floppy_format : public floppy_image_format_t
{
public:
- bool supports_save() const { return true; }
- bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
- bool save(io_generic *io, floppy_image *image);
+ bool supports_save() const override { return true; }
+ bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override;
+ bool save(io_generic *io, floppy_image *image) override;
protected:
int decode_bitstream(const UINT8 *bitstream, UINT8 *trackdata, int *sector, int cell_count, int encoding, UINT8 gapbytes, int track_size);
@@ -52,19 +52,19 @@ protected:
class ti99_sdf_format : public ti99_floppy_format
{
public:
- int identify(io_generic *io, UINT32 form_factor);
- const char *name() const;
- const char *description() const;
- const char *extensions() const;
+ int identify(io_generic *io, UINT32 form_factor) override;
+ const char *name() const override;
+ const char *description() const override;
+ const char *extensions() const override;
private:
- void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads);
- int get_track_size(int cell_size, int sector_count);
- void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes);
- void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize);
+ void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads) override;
+ int get_track_size(int cell_size, int sector_count) override;
+ void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) override;
+ void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) override;
// This format supports single-sided images
- int min_heads() { return 1; }
+ int min_heads() override { return 1; }
struct ti99vib
{
@@ -91,19 +91,19 @@ extern const floppy_format_type FLOPPY_TI99_SDF_FORMAT;
class ti99_tdf_format : public ti99_floppy_format
{
public:
- int identify(io_generic *io, UINT32 form_factor);
- const char *name() const;
- const char *description() const;
- const char *extensions() const;
+ int identify(io_generic *io, UINT32 form_factor) override;
+ const char *name() const override;
+ const char *description() const override;
+ const char *extensions() const override;
private:
- void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads);
- void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize);
- void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes);
- int get_track_size(int cell_size, int sector_count);
+ void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads) override;
+ void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) override;
+ void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) override;
+ int get_track_size(int cell_size, int sector_count) override;
// This format only supports double-sided images
- int min_heads() { return 2; }
+ int min_heads() override { return 2; }
};
extern const floppy_format_type FLOPPY_TI99_TDF_FORMAT;
diff --git a/src/lib/formats/tvc_dsk.h b/src/lib/formats/tvc_dsk.h
index f6796639d03..67df189b3da 100644
--- a/src/lib/formats/tvc_dsk.h
+++ b/src/lib/formats/tvc_dsk.h
@@ -17,9 +17,9 @@ class tvc_format : public wd177x_format {
public:
tvc_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/upd765_dsk.h b/src/lib/formats/upd765_dsk.h
index 6f36d1225a5..12bda75d51b 100644
--- a/src/lib/formats/upd765_dsk.h
+++ b/src/lib/formats/upd765_dsk.h
@@ -38,10 +38,10 @@ public:
// End the array with {}
upd765_format(const format *formats);
- 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 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;
protected:
floppy_image_format_t::desc_e* get_desc_fm(const format &f, int &current_size, int &end_gap_index);
diff --git a/src/lib/formats/vdk_dsk.h b/src/lib/formats/vdk_dsk.h
index 5570c14eab8..b685cb32f8b 100644
--- a/src/lib/formats/vdk_dsk.h
+++ b/src/lib/formats/vdk_dsk.h
@@ -22,14 +22,14 @@ class vdk_format : public floppy_image_format_t
public:
vdk_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 SECTOR_SIZE = 256;
diff --git a/src/lib/formats/wd177x_dsk.h b/src/lib/formats/wd177x_dsk.h
index a932beb1ced..6c93000b02c 100644
--- a/src/lib/formats/wd177x_dsk.h
+++ b/src/lib/formats/wd177x_dsk.h
@@ -37,10 +37,10 @@ public:
// End the array with {}
wd177x_format(const format *formats);
- 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 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;
protected:
enum { FM_DAM = 0xf56f, FM_DDAM = 0xf56a, MFM_DAM = 0xfb, MFM_DDAM = 0xf8 };