From dae95374721d2c9a3aa26dfa7fc5976e9ad1532e Mon Sep 17 00:00:00 2001 From: dg Date: Fri, 7 Jul 2023 21:51:24 +0000 Subject: [PATCH] Warning fixes. --- lib/fluxsink/scpfluxsink.cc | 2 +- lib/fluxsink/vcdfluxsink.cc | 2 +- lib/fluxsource/a2rfluxsource.cc | 2 +- lib/fluxsource/erasefluxsource.cc | 2 +- lib/fluxsource/fl2fluxsource.cc | 6 +++--- lib/fluxsource/flxfluxsource.cc | 2 +- lib/fluxsource/scpfluxsource.cc | 2 +- lib/imagewriter/imdimagewriter.cc | 2 ++ lib/vfs/amigaffs.cc | 4 ++-- lib/vfs/appledos.cc | 2 +- lib/vfs/brother120fs.cc | 2 +- lib/vfs/cbmfs.cc | 2 +- lib/vfs/cpmfs.cc | 2 +- lib/vfs/fatfs.cc | 6 +++--- lib/vfs/fluxsectorinterface.cc | 2 +- lib/vfs/imagesectorinterface.cc | 6 +++--- lib/vfs/machfs.cc | 2 +- lib/vfs/philefs.cc | 2 +- lib/vfs/prodos.cc | 2 +- lib/vfs/smaky6fs.cc | 2 +- scripts/mkdocindex.cc | 5 +++-- src/gui/imagerpanel.cc | 2 +- src/gui/mainwindow.cc | 16 ++++++++-------- 23 files changed, 40 insertions(+), 37 deletions(-) diff --git a/lib/fluxsink/scpfluxsink.cc b/lib/fluxsink/scpfluxsink.cc index a8155e47..a08e7c56 100644 --- a/lib/fluxsink/scpfluxsink.cc +++ b/lib/fluxsink/scpfluxsink.cc @@ -180,7 +180,7 @@ public: trackdataWriter += fluxdata; } - operator std::string() const + operator std::string() const override { return fmt::format("scp({})", _config.filename()); } diff --git a/lib/fluxsink/vcdfluxsink.cc b/lib/fluxsink/vcdfluxsink.cc index e3ca6ea8..0ba83a64 100644 --- a/lib/fluxsink/vcdfluxsink.cc +++ b/lib/fluxsink/vcdfluxsink.cc @@ -64,7 +64,7 @@ public: of << "\n"; } - operator std::string() const + operator std::string() const override { return fmt::format("vcd({})", _config.directory()); } diff --git a/lib/fluxsource/a2rfluxsource.cc b/lib/fluxsource/a2rfluxsource.cc index 06229bb3..b189fd99 100644 --- a/lib/fluxsource/a2rfluxsource.cc +++ b/lib/fluxsource/a2rfluxsource.cc @@ -142,7 +142,7 @@ public: } } - void recalibrate() {} + void recalibrate() override {} private: Bytes findChunk(Bytes id) diff --git a/lib/fluxsource/erasefluxsource.cc b/lib/fluxsource/erasefluxsource.cc index defa452c..4ac3de59 100644 --- a/lib/fluxsource/erasefluxsource.cc +++ b/lib/fluxsource/erasefluxsource.cc @@ -15,7 +15,7 @@ public: return std::unique_ptr(); } - void recalibrate() {} + void recalibrate() override {} }; std::unique_ptr FluxSource::createEraseFluxSource( diff --git a/lib/fluxsource/fl2fluxsource.cc b/lib/fluxsource/fl2fluxsource.cc index fad71e6c..2e02a71c 100644 --- a/lib/fluxsource/fl2fluxsource.cc +++ b/lib/fluxsource/fl2fluxsource.cc @@ -39,8 +39,8 @@ public: _extraConfig.mutable_drive()->set_rotational_period_ms( _proto.rotational_period_ms()); - if (_proto.has_tpi()) - _extraConfig.mutable_drive()->set_tpi(_proto.tpi()); + if (_proto.has_tpi()) + _extraConfig.mutable_drive()->set_tpi(_proto.tpi()); } public: @@ -55,7 +55,7 @@ public: return std::make_unique(); } - void recalibrate() {} + void recalibrate() override {} private: void check_for_error(std::ifstream& ifs) diff --git a/lib/fluxsource/flxfluxsource.cc b/lib/fluxsource/flxfluxsource.cc index fbbb119a..4b5e0e74 100644 --- a/lib/fluxsource/flxfluxsource.cc +++ b/lib/fluxsource/flxfluxsource.cc @@ -19,7 +19,7 @@ public: return readFlxBytes(Bytes::readFromFile(path)); } - void recalibrate() {} + void recalibrate() override {} private: const std::string _path; diff --git a/lib/fluxsource/scpfluxsource.cc b/lib/fluxsource/scpfluxsource.cc index 332d26b6..cb92846b 100644 --- a/lib/fluxsource/scpfluxsource.cc +++ b/lib/fluxsource/scpfluxsource.cc @@ -128,7 +128,7 @@ public: return fluxmap; } - void recalibrate() {} + void recalibrate() override {} private: void check_for_error() diff --git a/lib/imagewriter/imdimagewriter.cc b/lib/imagewriter/imdimagewriter.cc index e071492b..4d00b20f 100644 --- a/lib/imagewriter/imdimagewriter.cc +++ b/lib/imagewriter/imdimagewriter.cc @@ -273,6 +273,8 @@ public: case ImdOutputProto::RATE_DD: RATE = 2000; break; + case ImdOutputProto::RATE_GUESS: + break; } } header.ModeValue = diff --git a/lib/vfs/amigaffs.cc b/lib/vfs/amigaffs.cc index 4ca44f22..ef18f203 100644 --- a/lib/vfs/amigaffs.cc +++ b/lib/vfs/amigaffs.cc @@ -56,7 +56,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_CREATE | OP_LIST | OP_GETFILE | OP_PUTFILE | OP_GETDIRENT | OP_DELETE | OP_MOVE | OP_CREATEDIR; @@ -229,7 +229,7 @@ public: throw CannotWriteException(); } - void createDirectory(const Path& path) + void createDirectory(const Path& path) override { AdfMount m(this); if (path.empty()) diff --git a/lib/vfs/appledos.cc b/lib/vfs/appledos.cc index cdaa051b..e8c5246f 100644 --- a/lib/vfs/appledos.cc +++ b/lib/vfs/appledos.cc @@ -50,7 +50,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_LIST | OP_GETDIRENT | OP_GETFSDATA | OP_GETFILE; } diff --git a/lib/vfs/brother120fs.cc b/lib/vfs/brother120fs.cc index cdd2652c..3e7b905f 100644 --- a/lib/vfs/brother120fs.cc +++ b/lib/vfs/brother120fs.cc @@ -232,7 +232,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_LIST | OP_GETFILE | OP_PUTFILE | OP_GETDIRENT | OP_DELETE; diff --git a/lib/vfs/cbmfs.cc b/lib/vfs/cbmfs.cc index d2c0ad7a..52d860dd 100644 --- a/lib/vfs/cbmfs.cc +++ b/lib/vfs/cbmfs.cc @@ -195,7 +195,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_LIST | OP_GETFILE | OP_GETDIRENT; } diff --git a/lib/vfs/cpmfs.cc b/lib/vfs/cpmfs.cc index 238f3cee..e3da4f69 100644 --- a/lib/vfs/cpmfs.cc +++ b/lib/vfs/cpmfs.cc @@ -81,7 +81,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_LIST | OP_GETFILE | OP_GETDIRENT; } diff --git a/lib/vfs/fatfs.cc b/lib/vfs/fatfs.cc index b1a78708..b112ad4f 100644 --- a/lib/vfs/fatfs.cc +++ b/lib/vfs/fatfs.cc @@ -36,7 +36,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_CREATE | OP_LIST | OP_GETFILE | OP_PUTFILE | OP_GETDIRENT | OP_MOVE | OP_CREATEDIR | OP_DELETE; @@ -199,7 +199,7 @@ public: throwError(res); } - void createDirectory(const Path& path) + void createDirectory(const Path& path) override { mount(); auto pathStr = path.to_str(); @@ -296,7 +296,7 @@ private: default: throw FilesystemException( - fmt::format("unknown fatfs error {}", (int) res)); + fmt::format("unknown fatfs error {}", (int)res)); } } diff --git a/lib/vfs/fluxsectorinterface.cc b/lib/vfs/fluxsectorinterface.cc index a417ccfa..6f7d47ca 100644 --- a/lib/vfs/fluxsectorinterface.cc +++ b/lib/vfs/fluxsectorinterface.cc @@ -44,7 +44,7 @@ public: return _changedSectors.put(track, side, sectorId); } - virtual bool isReadOnly() + virtual bool isReadOnly() override { return (_fluxSink == nullptr); } diff --git a/lib/vfs/imagesectorinterface.cc b/lib/vfs/imagesectorinterface.cc index 49663de3..0043214c 100644 --- a/lib/vfs/imagesectorinterface.cc +++ b/lib/vfs/imagesectorinterface.cc @@ -20,19 +20,19 @@ public: public: std::shared_ptr get( - unsigned track, unsigned side, unsigned sectorId) + unsigned track, unsigned side, unsigned sectorId) override { return _image->get(track, side, sectorId); } std::shared_ptr put( - unsigned track, unsigned side, unsigned sectorId) + unsigned track, unsigned side, unsigned sectorId) override { _changed = true; return _image->put(track, side, sectorId); } - virtual bool isReadOnly() + virtual bool isReadOnly() override { return (_writer == nullptr); } diff --git a/lib/vfs/machfs.cc b/lib/vfs/machfs.cc index 089e05be..2b6dad4b 100644 --- a/lib/vfs/machfs.cc +++ b/lib/vfs/machfs.cc @@ -23,7 +23,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_CREATE | OP_LIST | OP_GETFILE | OP_PUTFILE | OP_GETDIRENT | OP_MOVE | OP_CREATEDIR | OP_DELETE; diff --git a/lib/vfs/philefs.cc b/lib/vfs/philefs.cc index 1cb3e1cc..9e68ccbc 100644 --- a/lib/vfs/philefs.cc +++ b/lib/vfs/philefs.cc @@ -160,7 +160,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_GETFSDATA | OP_LIST | OP_GETFILE | OP_GETDIRENT; } diff --git a/lib/vfs/prodos.cc b/lib/vfs/prodos.cc index af6cb00b..d638f631 100644 --- a/lib/vfs/prodos.cc +++ b/lib/vfs/prodos.cc @@ -140,7 +140,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_LIST | OP_GETDIRENT | OP_GETFILE | OP_GETFSDATA; } diff --git a/lib/vfs/smaky6fs.cc b/lib/vfs/smaky6fs.cc index ee4ea9bf..12526163 100644 --- a/lib/vfs/smaky6fs.cc +++ b/lib/vfs/smaky6fs.cc @@ -139,7 +139,7 @@ public: { } - uint32_t capabilities() const + uint32_t capabilities() const override { return OP_LIST | OP_GETFILE | OP_GETFSDATA | OP_GETDIRENT; } diff --git a/scripts/mkdocindex.cc b/scripts/mkdocindex.cc index 6df9a3c4..8363981d 100644 --- a/scripts/mkdocindex.cc +++ b/scripts/mkdocindex.cc @@ -14,9 +14,10 @@ static std::string supportStatus(SupportStatus status) case SupportStatus::UNICORN: return "🦄"; - } - return ""; + case SupportStatus::UNSUPPORTED: + return ""; + } } int main(int argc, const char* argv[]) diff --git a/src/gui/imagerpanel.cc b/src/gui/imagerpanel.cc index 4cca6fde..dd3cc5b1 100644 --- a/src/gui/imagerpanel.cc +++ b/src/gui/imagerpanel.cc @@ -78,7 +78,7 @@ private: } public: - void StartReading() + void StartReading() override { try { diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc index 65163aae..0865358e 100644 --- a/src/gui/mainwindow.cc +++ b/src/gui/mainwindow.cc @@ -83,7 +83,7 @@ public: Fit(); } - void SafeFit() + void SafeFit() override { auto minSize = GetMinClientSize(); @@ -94,32 +94,32 @@ public: SetMinClientSize(minSize); } - void StartIdle() + void StartIdle() override { _idlePanel->Start(); } - void StartReading() + void StartReading() override { _imagerPanel->StartReading(); } - void StartWriting() + void StartWriting() override { _imagerPanel->StartWriting(); } - void StartBrowsing() + void StartBrowsing() override { _browserPanel->StartBrowsing(); } - void StartFormatting() + void StartFormatting() override { _browserPanel->StartFormatting(); } - void StartExploring() + void StartExploring() override { _explorerPanel->Start(); } @@ -186,7 +186,7 @@ public: _configWindow->GetTextControl()->AppendText(s); } - void PrepareConfig() + void PrepareConfig() override { _idlePanel->PrepareConfig(); ShowConfig();