Merge pull request #738 from davidgiven/overrides

Fix a whole pile of missing 'override' keywords.
davidgiven · Jan 22, 2024 · bfcfa8e · bfcfa8e
2 parents 45e796f + 7095c03
commit bfcfa8e
Show file tree

Hide file tree

Showing 38 changed files with 92 additions and 81 deletions.
diff --git 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
@@ -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<std::string>
     {
     }
 
-    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<int>
     {
     }
 
-    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<double>
@@ -275,11 +281,12 @@ class DoubleFlag : public ValueFlag<double>
     {
     }
 
-    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<bool>
     {
     }
 
-    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
@@ -88,7 +88,7 @@ class CwfFluxSource : public TrivialFluxSource
     }
 
 public:
-    std::unique_ptr<const Fluxmap> readSingleFlux(int track, int side)
+    std::unique_ptr<const Fluxmap> 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
@@ -111,7 +111,7 @@ class EmptyFluxSourceIterator : public FluxSourceIterator
 class TrivialFluxSource : public FluxSource
 {
 public:
-    std::unique_ptr<FluxSourceIterator> readFlux(int track, int side);
+    std::unique_ptr<FluxSourceIterator> readFlux(int track, int side) override;
     virtual std::unique_ptr<const Fluxmap> readSingleFlux(
         int track, int side) = 0;
 };

diff --git 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
@@ -47,7 +47,7 @@ class MemoryFluxSource : public FluxSource
         return std::make_unique<EmptyFluxSourceIterator>();
     }
 
-    void recalibrate() {}
+    void recalibrate() override {}
 
 private:
     const DiskFlux& _flux;

diff --git 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
@@ -14,7 +14,7 @@ class D64ImageReader : public ImageReader
 public:
     D64ImageReader(const ImageReaderProto& config): ImageReader(config) {}
 
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -18,7 +18,7 @@ class D88ImageReader : public ImageReader
 public:
     D88ImageReader(const ImageReaderProto& config): ImageReader(config) {}
 
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -18,7 +18,7 @@ class DimImageReader : public ImageReader
 public:
     DimImageReader(const ImageReaderProto& config): ImageReader(config) {}
 
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -14,7 +14,7 @@ class DiskCopyImageReader : public ImageReader
 public:
     DiskCopyImageReader(const ImageReaderProto& config): ImageReader(config) {}
 
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -18,7 +18,7 @@ class FdiImageReader : public ImageReader
 public:
     FdiImageReader(const ImageReaderProto& config): ImageReader(config) {}
 
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -137,7 +137,7 @@ class IMDImageReader : public ImageReader
      * <End of file>
      */
     // clang-format on
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> readImage() override
     {
         // Read File
         std::ifstream inputFile(

diff --git 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<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -89,7 +89,7 @@ class Jv3ImageReader : public ImageReader
 public:
     Jv3ImageReader(const ImageReaderProto& config): ImageReader(config) {}
 
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -18,7 +18,7 @@ class NFDImageReader : public ImageReader
 public:
     NFDImageReader(const ImageReaderProto& config): ImageReader(config) {}
 
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -16,7 +16,7 @@ class NsiImageReader : public ImageReader
 public:
     NsiImageReader(const ImageReaderProto& config): ImageReader(config) {}
 
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -47,7 +47,7 @@ class Td0ImageReader : public ImageReader
 public:
     Td0ImageReader(const ImageReaderProto& config): ImageReader(config) {}
 
-    std::unique_ptr<Image> readImage()
+    std::unique_ptr<Image> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();