From 7095c03e28b11a5053b027396029a00429060edb Mon Sep 17 00:00:00 2001 From: David Given Date: Mon, 22 Jan 2024 20:55:38 +0100 Subject: [PATCH] Fix a whole pile of missing 'override' keywords. --- dep/libusbp/include/libusbp.hpp | 2 +- lib/flags.h | 39 +++++++++++++++---------- lib/fluxsource/cwffluxsource.cc | 4 +-- lib/fluxsource/fluxsource.h | 2 +- lib/fluxsource/kryofluxfluxsource.cc | 2 +- lib/fluxsource/memoryfluxsource.cc | 2 +- lib/fluxsource/testpatternfluxsource.cc | 2 +- lib/imagereader/d64imagereader.cc | 2 +- lib/imagereader/d88imagereader.cc | 2 +- lib/imagereader/dimimagereader.cc | 2 +- lib/imagereader/diskcopyimagereader.cc | 2 +- lib/imagereader/fdiimagereader.cc | 2 +- lib/imagereader/imdimagereader.cc | 2 +- lib/imagereader/imgimagereader.cc | 2 +- lib/imagereader/jv3imagereader.cc | 2 +- lib/imagereader/nfdimagereader.cc | 2 +- lib/imagereader/nsiimagereader.cc | 2 +- lib/imagereader/td0imagereader.cc | 2 +- lib/imagewriter/d64imagewriter.cc | 2 +- lib/imagewriter/d88imagewriter.cc | 2 +- lib/imagewriter/diskcopyimagewriter.cc | 2 +- lib/imagewriter/imdimagewriter.cc | 2 +- lib/imagewriter/imgimagewriter.cc | 2 +- lib/imagewriter/ldbsimagewriter.cc | 2 +- lib/imagewriter/nsiimagewriter.cc | 2 +- lib/imagewriter/rawimagewriter.cc | 2 +- lib/usb/fluxengineusb.cc | 24 ++++++++------- lib/usb/greaseweazleusb.cc | 24 ++++++++------- lib/vfs/acorndfs.cc | 12 ++++---- lib/vfs/lif.cc | 2 +- lib/vfs/microdos.cc | 2 +- lib/vfs/zdos.cc | 2 +- src/gui/gui.h | 4 +-- src/gui/main.cc | 2 +- src/gui/texteditorwindow.h | 2 +- src/gui/textviewerwindow.h | 2 +- src/gui/visualisationcontrol.h | 2 +- tests/cpmfs.cc | 4 +-- 38 files changed, 92 insertions(+), 81 deletions(-) diff --git a/dep/libusbp/include/libusbp.hpp b/dep/libusbp/include/libusbp.hpp index 5d3bd9155..3c70bea9e 100644 --- a/dep/libusbp/include/libusbp.hpp +++ b/dep/libusbp/include/libusbp.hpp @@ -234,7 +234,7 @@ namespace libusbp } /*! Wrapper for libusbp_error_get_message(). */ - virtual const char * what() const noexcept + virtual const char * what() const noexcept override { return libusbp_error_get_message(pointer); } diff --git a/lib/flags.h b/lib/flags.h index 77a3069f0..4757b0465 100644 --- a/lib/flags.h +++ b/lib/flags.h @@ -87,15 +87,17 @@ class ActionFlag : Flag { } - bool hasArgument() const + bool hasArgument() const override { return false; } - const std::string defaultValueAsString() const + + const std::string defaultValueAsString() const override { return ""; } - void set(const std::string& value) + + void set(const std::string& value) override { _callback(); } @@ -119,15 +121,17 @@ class SettableFlag : public Flag return _value; } - bool hasArgument() const + bool hasArgument() const override { return false; } - const std::string defaultValueAsString() const + + const std::string defaultValueAsString() const override { return "false"; } - void set(const std::string& value) + + void set(const std::string& value) override { _value = true; } @@ -176,7 +180,7 @@ class ValueFlag : public Flag _value = _defaultValue = value; } - bool hasArgument() const + bool hasArgument() const override { return true; } @@ -203,11 +207,12 @@ class StringFlag : public ValueFlag { } - const std::string defaultValueAsString() const + const std::string defaultValueAsString() const override { return _defaultValue; } - void set(const std::string& value) + + void set(const std::string& value) override { _value = value; _callback(_value); @@ -230,11 +235,12 @@ class IntFlag : public ValueFlag { } - const std::string defaultValueAsString() const + const std::string defaultValueAsString() const override { return std::to_string(_defaultValue); } - void set(const std::string& value) + + void set(const std::string& value) override { _value = std::stoi(value); _callback(_value); @@ -257,7 +263,7 @@ class HexIntFlag : public IntFlag { } - const std::string defaultValueAsString() const; + const std::string defaultValueAsString() const override; }; class DoubleFlag : public ValueFlag @@ -275,11 +281,12 @@ class DoubleFlag : public ValueFlag { } - const std::string defaultValueAsString() const + const std::string defaultValueAsString() const override { return std::to_string(_defaultValue); } - void set(const std::string& value) + + void set(const std::string& value) override { _value = std::stod(value); _callback(_value); @@ -302,11 +309,11 @@ class BoolFlag : public ValueFlag { } - const std::string defaultValueAsString() const + const std::string defaultValueAsString() const override { return _defaultValue ? "true" : "false"; } - void set(const std::string& value); + void set(const std::string& value) override; }; #endif diff --git a/lib/fluxsource/cwffluxsource.cc b/lib/fluxsource/cwffluxsource.cc index b466e275c..927d29bb1 100644 --- a/lib/fluxsource/cwffluxsource.cc +++ b/lib/fluxsource/cwffluxsource.cc @@ -88,7 +88,7 @@ class CwfFluxSource : public TrivialFluxSource } public: - std::unique_ptr readSingleFlux(int track, int side) + std::unique_ptr readSingleFlux(int track, int side) override { const auto& p = _trackOffsets.find(std::make_pair(track, side)); if (p == _trackOffsets.end()) @@ -103,7 +103,7 @@ class CwfFluxSource : public TrivialFluxSource return decodeCatweaselData(fluxdata, _clockPeriod); } - void recalibrate() {} + void recalibrate() override {} private: void check_for_error() diff --git a/lib/fluxsource/fluxsource.h b/lib/fluxsource/fluxsource.h index e06a01ad6..d7efb56b9 100644 --- a/lib/fluxsource/fluxsource.h +++ b/lib/fluxsource/fluxsource.h @@ -111,7 +111,7 @@ class EmptyFluxSourceIterator : public FluxSourceIterator class TrivialFluxSource : public FluxSource { public: - std::unique_ptr readFlux(int track, int side); + std::unique_ptr readFlux(int track, int side) override; virtual std::unique_ptr readSingleFlux( int track, int side) = 0; }; diff --git a/lib/fluxsource/kryofluxfluxsource.cc b/lib/fluxsource/kryofluxfluxsource.cc index e483f0205..ec87c16eb 100644 --- a/lib/fluxsource/kryofluxfluxsource.cc +++ b/lib/fluxsource/kryofluxfluxsource.cc @@ -18,7 +18,7 @@ class KryofluxFluxSource : public TrivialFluxSource return readStream(_path, track, side); } - void recalibrate() {} + void recalibrate() override {} private: const std::string _path; diff --git a/lib/fluxsource/memoryfluxsource.cc b/lib/fluxsource/memoryfluxsource.cc index 333a5ef47..f2f86eeeb 100644 --- a/lib/fluxsource/memoryfluxsource.cc +++ b/lib/fluxsource/memoryfluxsource.cc @@ -47,7 +47,7 @@ class MemoryFluxSource : public FluxSource return std::make_unique(); } - void recalibrate() {} + void recalibrate() override {} private: const DiskFlux& _flux; diff --git a/lib/fluxsource/testpatternfluxsource.cc b/lib/fluxsource/testpatternfluxsource.cc index 0b3a0da18..b5a85c454 100644 --- a/lib/fluxsource/testpatternfluxsource.cc +++ b/lib/fluxsource/testpatternfluxsource.cc @@ -27,7 +27,7 @@ class TestPatternFluxSource : public TrivialFluxSource return fluxmap; } - void recalibrate() {} + void recalibrate() override {} private: const TestPatternFluxSourceProto& _config; diff --git a/lib/imagereader/d64imagereader.cc b/lib/imagereader/d64imagereader.cc index ad3756b6c..6f3e217b8 100644 --- a/lib/imagereader/d64imagereader.cc +++ b/lib/imagereader/d64imagereader.cc @@ -14,7 +14,7 @@ class D64ImageReader : public ImageReader public: D64ImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagereader/d88imagereader.cc b/lib/imagereader/d88imagereader.cc index 3bee40187..21a4be9e8 100644 --- a/lib/imagereader/d88imagereader.cc +++ b/lib/imagereader/d88imagereader.cc @@ -18,7 +18,7 @@ class D88ImageReader : public ImageReader public: D88ImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagereader/dimimagereader.cc b/lib/imagereader/dimimagereader.cc index 8410a9b6a..a389dc387 100644 --- a/lib/imagereader/dimimagereader.cc +++ b/lib/imagereader/dimimagereader.cc @@ -18,7 +18,7 @@ class DimImageReader : public ImageReader public: DimImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagereader/diskcopyimagereader.cc b/lib/imagereader/diskcopyimagereader.cc index d6c85a79e..413e2dc90 100644 --- a/lib/imagereader/diskcopyimagereader.cc +++ b/lib/imagereader/diskcopyimagereader.cc @@ -14,7 +14,7 @@ class DiskCopyImageReader : public ImageReader public: DiskCopyImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagereader/fdiimagereader.cc b/lib/imagereader/fdiimagereader.cc index f73173203..ee6297d7b 100644 --- a/lib/imagereader/fdiimagereader.cc +++ b/lib/imagereader/fdiimagereader.cc @@ -18,7 +18,7 @@ class FdiImageReader : public ImageReader public: FdiImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagereader/imdimagereader.cc b/lib/imagereader/imdimagereader.cc index ab868b269..f4dae8b27 100644 --- a/lib/imagereader/imdimagereader.cc +++ b/lib/imagereader/imdimagereader.cc @@ -137,7 +137,7 @@ class IMDImageReader : public ImageReader * */ // clang-format on - std::unique_ptr readImage() + std::unique_ptr readImage() override { // Read File std::ifstream inputFile( diff --git a/lib/imagereader/imgimagereader.cc b/lib/imagereader/imgimagereader.cc index 8ae3a1080..42c2aad14 100644 --- a/lib/imagereader/imgimagereader.cc +++ b/lib/imagereader/imgimagereader.cc @@ -17,7 +17,7 @@ class ImgImageReader : public ImageReader public: ImgImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagereader/jv3imagereader.cc b/lib/imagereader/jv3imagereader.cc index 15bc51235..6b7a77ce8 100644 --- a/lib/imagereader/jv3imagereader.cc +++ b/lib/imagereader/jv3imagereader.cc @@ -89,7 +89,7 @@ class Jv3ImageReader : public ImageReader public: Jv3ImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagereader/nfdimagereader.cc b/lib/imagereader/nfdimagereader.cc index b626c31cd..a6c588b90 100644 --- a/lib/imagereader/nfdimagereader.cc +++ b/lib/imagereader/nfdimagereader.cc @@ -18,7 +18,7 @@ class NFDImageReader : public ImageReader public: NFDImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagereader/nsiimagereader.cc b/lib/imagereader/nsiimagereader.cc index 0101c656f..c97500429 100644 --- a/lib/imagereader/nsiimagereader.cc +++ b/lib/imagereader/nsiimagereader.cc @@ -16,7 +16,7 @@ class NsiImageReader : public ImageReader public: NsiImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagereader/td0imagereader.cc b/lib/imagereader/td0imagereader.cc index 30ee7c70b..f9771d925 100644 --- a/lib/imagereader/td0imagereader.cc +++ b/lib/imagereader/td0imagereader.cc @@ -47,7 +47,7 @@ class Td0ImageReader : public ImageReader public: Td0ImageReader(const ImageReaderProto& config): ImageReader(config) {} - std::unique_ptr readImage() + std::unique_ptr readImage() override { std::ifstream inputFile( _config.filename(), std::ios::in | std::ios::binary); diff --git a/lib/imagewriter/d64imagewriter.cc b/lib/imagewriter/d64imagewriter.cc index 74990a180..d53a7a2a8 100644 --- a/lib/imagewriter/d64imagewriter.cc +++ b/lib/imagewriter/d64imagewriter.cc @@ -26,7 +26,7 @@ class D64ImageWriter : public ImageWriter public: D64ImageWriter(const ImageWriterProto& config): ImageWriter(config) {} - void writeImage(const Image& image) + void writeImage(const Image& image) override { log("D64: writing triangular image"); diff --git a/lib/imagewriter/d88imagewriter.cc b/lib/imagewriter/d88imagewriter.cc index 75d24e2d8..43aacc580 100644 --- a/lib/imagewriter/d88imagewriter.cc +++ b/lib/imagewriter/d88imagewriter.cc @@ -26,7 +26,7 @@ class D88ImageWriter : public ImageWriter public: D88ImageWriter(const ImageWriterProto& config): ImageWriter(config) {} - void writeImage(const Image& image) + void writeImage(const Image& image) override { const Geometry geometry = image.getGeometry(); diff --git a/lib/imagewriter/diskcopyimagewriter.cc b/lib/imagewriter/diskcopyimagewriter.cc index d98b44fe4..a2b4a2985 100644 --- a/lib/imagewriter/diskcopyimagewriter.cc +++ b/lib/imagewriter/diskcopyimagewriter.cc @@ -30,7 +30,7 @@ class DiskCopyImageWriter : public ImageWriter public: DiskCopyImageWriter(const ImageWriterProto& config): ImageWriter(config) {} - void writeImage(const Image& image) + void writeImage(const Image& image) override { const Geometry& geometry = image.getGeometry(); diff --git a/lib/imagewriter/imdimagewriter.cc b/lib/imagewriter/imdimagewriter.cc index 3e1e5d780..722540247 100644 --- a/lib/imagewriter/imdimagewriter.cc +++ b/lib/imagewriter/imdimagewriter.cc @@ -155,7 +155,7 @@ class ImdImageWriter : public ImageWriter public: ImdImageWriter(const ImageWriterProto& config): ImageWriter(config) {} - void writeImage(const Image& image) + void writeImage(const Image& image) override { const Geometry& geometry = image.getGeometry(); unsigned numHeads; diff --git a/lib/imagewriter/imgimagewriter.cc b/lib/imagewriter/imgimagewriter.cc index 698c1059d..3f07f8348 100644 --- a/lib/imagewriter/imgimagewriter.cc +++ b/lib/imagewriter/imgimagewriter.cc @@ -17,7 +17,7 @@ class ImgImageWriter : public ImageWriter public: ImgImageWriter(const ImageWriterProto& config): ImageWriter(config) {} - void writeImage(const Image& image) + void writeImage(const Image& image) override { const Geometry geometry = image.getGeometry(); diff --git a/lib/imagewriter/ldbsimagewriter.cc b/lib/imagewriter/ldbsimagewriter.cc index 89f36a1ff..baa8b9392 100644 --- a/lib/imagewriter/ldbsimagewriter.cc +++ b/lib/imagewriter/ldbsimagewriter.cc @@ -15,7 +15,7 @@ class LDBSImageWriter : public ImageWriter public: LDBSImageWriter(const ImageWriterProto& config): ImageWriter(config) {} - void writeImage(const Image& image) + void writeImage(const Image& image) override { LDBS ldbs; diff --git a/lib/imagewriter/nsiimagewriter.cc b/lib/imagewriter/nsiimagewriter.cc index 6c002af42..0c951b8df 100644 --- a/lib/imagewriter/nsiimagewriter.cc +++ b/lib/imagewriter/nsiimagewriter.cc @@ -16,7 +16,7 @@ class NsiImageWriter : public ImageWriter public: NsiImageWriter(const ImageWriterProto& config): ImageWriter(config) {} - void writeImage(const Image& image) + void writeImage(const Image& image) override { const Geometry& geometry = image.getGeometry(); bool mixedDensity = false; diff --git a/lib/imagewriter/rawimagewriter.cc b/lib/imagewriter/rawimagewriter.cc index ebe8c2288..81a91dd06 100644 --- a/lib/imagewriter/rawimagewriter.cc +++ b/lib/imagewriter/rawimagewriter.cc @@ -16,7 +16,7 @@ class RawImageWriter : public ImageWriter public: RawImageWriter(const ImageWriterProto& config): ImageWriter(config) {} - void writeImage(const Image& image) + void writeImage(const Image& image) override { const Geometry& geometry = image.getGeometry(); diff --git a/lib/usb/fluxengineusb.cc b/lib/usb/fluxengineusb.cc index 8a2bf0157..d9b9c42ae 100644 --- a/lib/usb/fluxengineusb.cc +++ b/lib/usb/fluxengineusb.cc @@ -123,7 +123,7 @@ class FluxEngineUsb : public USB } public: - int getVersion() + int getVersion() override { struct any_frame f = { .f = {.type = F_FRAME_GET_VERSION_CMD, .size = sizeof(f)} @@ -133,7 +133,7 @@ class FluxEngineUsb : public USB return r->version; } - void seek(int track) + void seek(int track) override { struct seek_frame f = { .f = {.type = F_FRAME_SEEK_CMD, .size = sizeof(f)}, @@ -143,7 +143,7 @@ class FluxEngineUsb : public USB await_reply(F_FRAME_SEEK_REPLY); } - void recalibrate() + void recalibrate() override { struct any_frame f = { .f = {.type = F_FRAME_RECALIBRATE_CMD, .size = sizeof(f)}, @@ -152,7 +152,7 @@ class FluxEngineUsb : public USB await_reply(F_FRAME_RECALIBRATE_REPLY); } - nanoseconds_t getRotationalPeriod(int hardSectorCount) + nanoseconds_t getRotationalPeriod(int hardSectorCount) override { struct measurespeed_frame f = { .f = {.type = F_FRAME_MEASURE_SPEED_CMD, .size = sizeof(f)}, @@ -164,7 +164,7 @@ class FluxEngineUsb : public USB return r->period_ms * 1000000; } - void testBulkWrite() + void testBulkWrite() override { struct any_frame f = { .f = {.type = F_FRAME_BULK_WRITE_TEST_CMD, .size = sizeof(f)} @@ -204,7 +204,7 @@ class FluxEngineUsb : public USB await_reply(F_FRAME_BULK_WRITE_TEST_REPLY); } - void testBulkRead() + void testBulkRead() override { struct any_frame f = { .f = {.type = F_FRAME_BULK_READ_TEST_CMD, .size = sizeof(f)} @@ -242,7 +242,7 @@ class FluxEngineUsb : public USB Bytes read(int side, bool synced, nanoseconds_t readTime, - nanoseconds_t hardSectorThreshold) + nanoseconds_t hardSectorThreshold) override { struct read_frame f = { .f = {.type = F_FRAME_READ_CMD, .size = sizeof(f)}, @@ -265,7 +265,9 @@ class FluxEngineUsb : public USB return buffer; } - void write(int side, const Bytes& bytes, nanoseconds_t hardSectorThreshold) + void write(int side, + const Bytes& bytes, + nanoseconds_t hardSectorThreshold) override { unsigned safelen = bytes.size() & ~(FRAME_SIZE - 1); Bytes safeBytes = bytes.slice(0, safelen); @@ -287,7 +289,7 @@ class FluxEngineUsb : public USB await_reply(F_FRAME_WRITE_REPLY); } - void erase(int side, nanoseconds_t hardSectorThreshold) + void erase(int side, nanoseconds_t hardSectorThreshold) override { struct erase_frame f = { .f = {.type = F_FRAME_ERASE_CMD, .size = sizeof(f)}, @@ -300,7 +302,7 @@ class FluxEngineUsb : public USB await_reply(F_FRAME_ERASE_REPLY); } - void setDrive(int drive, bool high_density, int index_mode) + void setDrive(int drive, bool high_density, int index_mode) override { struct set_drive_frame f = { .f = {.type = F_FRAME_SET_DRIVE_CMD, .size = sizeof(f)}, @@ -312,7 +314,7 @@ class FluxEngineUsb : public USB await_reply(F_FRAME_SET_DRIVE_REPLY); } - void measureVoltages(struct voltages_frame* voltages) + void measureVoltages(struct voltages_frame* voltages) override { struct any_frame f = { {.type = F_FRAME_MEASURE_VOLTAGES_CMD, .size = sizeof(f)}, diff --git a/lib/usb/greaseweazleusb.cc b/lib/usb/greaseweazleusb.cc index 7c0913160..4496adc26 100644 --- a/lib/usb/greaseweazleusb.cc +++ b/lib/usb/greaseweazleusb.cc @@ -109,7 +109,7 @@ class GreaseweazleUsb : public USB do_command({CMD_SET_BUS_TYPE, 3, (uint8_t)config.bus_type()}); } - int getVersion() + int getVersion() override { do_command({CMD_GET_INFO, 3, GETINFO_FIRMWARE}); @@ -124,17 +124,17 @@ class GreaseweazleUsb : public USB return br.read_be16(); } - void recalibrate() + void recalibrate() override { seek(0); } - void seek(int track) + void seek(int track) override { do_command({CMD_SEEK, 3, (uint8_t)track}); } - nanoseconds_t getRotationalPeriod(int hardSectorCount) + nanoseconds_t getRotationalPeriod(int hardSectorCount) override { if (hardSectorCount != 0) error("hard sectors are currently unsupported on the Greaseweazle"); @@ -214,7 +214,7 @@ class GreaseweazleUsb : public USB return _revolutions; } - void testBulkWrite() + void testBulkWrite() override { std::cout << "Writing data: " << std::flush; const int LEN = 10 * 1024 * 1024; @@ -264,7 +264,7 @@ class GreaseweazleUsb : public USB int((LEN / 1024.0) / elapsed_time)); } - void testBulkRead() + void testBulkRead() override { std::cout << "Reading data: " << std::flush; const int LEN = 10 * 1024 * 1024; @@ -309,7 +309,7 @@ class GreaseweazleUsb : public USB Bytes read(int side, bool synced, nanoseconds_t readTime, - nanoseconds_t hardSectorThreshold) + nanoseconds_t hardSectorThreshold) override { if (hardSectorThreshold != 0) error("hard sectors are currently unsupported on the Greaseweazle"); @@ -362,7 +362,9 @@ class GreaseweazleUsb : public USB return fldata; } - void write(int side, const Bytes& fldata, nanoseconds_t hardSectorThreshold) + void write(int side, + const Bytes& fldata, + nanoseconds_t hardSectorThreshold) override { if (hardSectorThreshold != 0) error("hard sectors are currently unsupported on the Greaseweazle"); @@ -385,7 +387,7 @@ class GreaseweazleUsb : public USB do_command({CMD_GET_FLUX_STATUS, 2}); } - void erase(int side, nanoseconds_t hardSectorThreshold) + void erase(int side, nanoseconds_t hardSectorThreshold) override { if (hardSectorThreshold != 0) error("hard sectors are currently unsupported on the Greaseweazle"); @@ -403,14 +405,14 @@ class GreaseweazleUsb : public USB do_command({CMD_GET_FLUX_STATUS, 2}); } - void setDrive(int drive, bool high_density, int index_mode) + void setDrive(int drive, bool high_density, int index_mode) override { do_command({CMD_SELECT, 3, (uint8_t)drive}); do_command({CMD_MOTOR, 4, (uint8_t)drive, 1}); do_command({CMD_SET_PIN, 4, 2, (uint8_t)(high_density ? 1 : 0)}); } - void measureVoltages(struct voltages_frame* voltages) + void measureVoltages(struct voltages_frame* voltages) override { error("unsupported operation on the Greaseweazle"); } diff --git a/lib/vfs/acorndfs.cc b/lib/vfs/acorndfs.cc index b989313c6..13f771c6f 100644 --- a/lib/vfs/acorndfs.cc +++ b/lib/vfs/acorndfs.cc @@ -113,12 +113,12 @@ class AcornDfsFilesystem : public Filesystem { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_LIST | OP_GETFILE | OP_GETDIRENT; } - std::map getMetadata() + std::map getMetadata() override { AcornDfsDirectory dir(this); @@ -130,12 +130,12 @@ class AcornDfsFilesystem : public Filesystem return attributes; } - FilesystemStatus check() + FilesystemStatus check() override { return FS_OK; } - std::vector> list(const Path& path) + std::vector> list(const Path& path) override { if (!path.empty()) throw FileNotFoundException(); @@ -148,7 +148,7 @@ class AcornDfsFilesystem : public Filesystem return result; } - Bytes getFile(const Path& path) + Bytes getFile(const Path& path) override { AcornDfsDirectory dir(this); auto dirent = dir.findFile(path); @@ -166,7 +166,7 @@ class AcornDfsFilesystem : public Filesystem return data; } - std::shared_ptr getDirent(const Path& path) + std::shared_ptr getDirent(const Path& path) override { AcornDfsDirectory dir(this); return dir.findFile(path); diff --git a/lib/vfs/lif.cc b/lib/vfs/lif.cc index 0dbe5c048..ae6aa97a3 100644 --- a/lib/vfs/lif.cc +++ b/lib/vfs/lif.cc @@ -141,7 +141,7 @@ class LifFilesystem : public Filesystem { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_LIST | OP_GETFILE | OP_GETDIRENT; } diff --git a/lib/vfs/microdos.cc b/lib/vfs/microdos.cc index 94b752663..28e68306b 100644 --- a/lib/vfs/microdos.cc +++ b/lib/vfs/microdos.cc @@ -101,7 +101,7 @@ class MicrodosFilesystem : public Filesystem { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_LIST | OP_GETFILE | OP_GETDIRENT; } diff --git a/lib/vfs/zdos.cc b/lib/vfs/zdos.cc index aa47bb7ae..04ddb34df 100644 --- a/lib/vfs/zdos.cc +++ b/lib/vfs/zdos.cc @@ -189,7 +189,7 @@ class ZDosFilesystem : public Filesystem { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_LIST | OP_GETFILE | OP_GETDIRENT; } diff --git a/src/gui/gui.h b/src/gui/gui.h index 3e53583a2..a3910faa6 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -33,7 +33,7 @@ static inline R runOnUiThread(std::function callback) class FluxEngineApp : public wxApp, public wxThreadHelper { public: - virtual bool OnInit(); + virtual bool OnInit() override; void RunOnWorkerThread(std::function callback); private: @@ -44,7 +44,7 @@ class FluxEngineApp : public wxApp, public wxThreadHelper bool IsWorkerThreadRunning(); protected: - virtual wxThread::ExitCode Entry(); + virtual wxThread::ExitCode Entry() override; private: static wxWindow* CreateMainWindow(); diff --git a/src/gui/main.cc b/src/gui/main.cc index f9ba7525c..e3eb44a5f 100644 --- a/src/gui/main.cc +++ b/src/gui/main.cc @@ -26,7 +26,7 @@ class ExecEvent : public wxThreadEvent { } - wxEvent* Clone() const + wxEvent* Clone() const override { return new ExecEvent(*this); } diff --git a/src/gui/texteditorwindow.h b/src/gui/texteditorwindow.h index f150cb361..226f970a3 100644 --- a/src/gui/texteditorwindow.h +++ b/src/gui/texteditorwindow.h @@ -10,7 +10,7 @@ class EditorSaveEvent : public wxEvent { } - wxEvent* Clone() const + wxEvent* Clone() const override { return new EditorSaveEvent(*this); } diff --git a/src/gui/textviewerwindow.h b/src/gui/textviewerwindow.h index ee2624fc9..78e6ba53d 100644 --- a/src/gui/textviewerwindow.h +++ b/src/gui/textviewerwindow.h @@ -20,7 +20,7 @@ class TextViewerWindow : public TextViewerWindowGen wxTextCtrl* GetTextControl() const; private: - void OnClose(wxCloseEvent& event); + void OnClose(wxCloseEvent& event) override; private: bool _autodestroy; diff --git a/src/gui/visualisationcontrol.h b/src/gui/visualisationcontrol.h index a64b83dca..e42d36a38 100644 --- a/src/gui/visualisationcontrol.h +++ b/src/gui/visualisationcontrol.h @@ -24,7 +24,7 @@ class TrackSelectionEvent : public wxEvent { } - wxEvent* Clone() const + wxEvent* Clone() const override { return new TrackSelectionEvent(*this); } diff --git a/tests/cpmfs.cc b/tests/cpmfs.cc index 48ad59288..7d9edf840 100644 --- a/tests/cpmfs.cc +++ b/tests/cpmfs.cc @@ -18,7 +18,7 @@ namespace { public: std::shared_ptr get( - unsigned track, unsigned side, unsigned sectorId) + unsigned track, unsigned side, unsigned sectorId) override { auto s = _image.get(track, side, sectorId); if (!s) @@ -27,7 +27,7 @@ namespace } std::shared_ptr put( - unsigned track, unsigned side, unsigned sectorId) + unsigned track, unsigned side, unsigned sectorId) override { return _image.put(track, side, sectorId); }