diff --git a/app/actions.hpp b/app/actions.hpp index 91c1ccaf..60f3cfa8 100644 --- a/app/actions.hpp +++ b/app/actions.hpp @@ -128,7 +128,6 @@ class TaskFactory { //! %Print the Exif (or other metadata) of a file to stdout class Print : public Task { public: - ~Print() override = default; int run(const std::string& path) override; Task::UniquePtr clone() const override; @@ -174,7 +173,6 @@ class Print : public Task { /// @brief %Rename a file to its metadata creation timestamp, in the specified format. class Rename : public Task { public: - ~Rename() override = default; int run(const std::string& path) override; Task::UniquePtr clone() const override; }; // class Rename @@ -182,7 +180,6 @@ class Rename : public Task { //! %Adjust the Exif (or other metadata) timestamps class Adjust : public Task { public: - ~Adjust() override = default; int run(const std::string& path) override; Task::UniquePtr clone() const override; @@ -199,7 +196,6 @@ class Adjust : public Task { /// @brief %Erase the entire exif data or only the thumbnail section. class Erase : public Task { public: - ~Erase() override = default; int run(const std::string& path) override; Task::UniquePtr clone() const override; @@ -228,7 +224,6 @@ class Erase : public Task { /// @brief %Extract the entire exif data or only the thumbnail section. class Extract : public Task { public: - ~Extract() override = default; int run(const std::string& path) override; Task::UniquePtr clone() const override; @@ -258,7 +253,6 @@ class Extract : public Task { /// @brief %Insert the Exif data from corresponding *.exv files. class Insert : public Task { public: - ~Insert() override = default; int run(const std::string& path) override; Task::UniquePtr clone() const override; @@ -285,8 +279,6 @@ class Insert : public Task { /// @brief %Modify the Exif data according to the commands in the modification table. class Modify : public Task { public: - Modify() = default; - ~Modify() override = default; int run(const std::string& path) override; Task::UniquePtr clone() const override; //! Apply modification commands to the \em pImage, return 0 if successful. @@ -306,7 +298,6 @@ class Modify : public Task { /// @brief %Copy ISO settings from any of the Nikon makernotes to the regular Exif tag, Exif.Photo.ISOSpeedRatings. class FixIso : public Task { public: - ~FixIso() override = default; int run(const std::string& path) override; Task::UniquePtr clone() const override; @@ -319,7 +310,6 @@ class FixIso : public Task { /// Decodes the comment using the auto-detected or specified character encoding and writes it back in UCS-2. class FixCom : public Task { public: - ~FixCom() override = default; int run(const std::string& path) override; Task::UniquePtr clone() const override; diff --git a/include/exiv2/value.hpp b/include/exiv2/value.hpp index dd82be4f..6433db86 100644 --- a/include/exiv2/value.hpp +++ b/include/exiv2/value.hpp @@ -253,8 +253,6 @@ class EXIV2API DataValue : public Value { DataValue(const byte* buf, size_t len, ByteOrder byteOrder = invalidByteOrder, TypeId typeId = undefined); - ~DataValue() override = default; - //! @name Manipulators //@{ int read(const byte* buf, size_t len, ByteOrder byteOrder = invalidByteOrder) override; @@ -395,8 +393,6 @@ class EXIV2API StringValue : public StringValueBase { StringValue(); //! Constructor explicit StringValue(const std::string& buf); - //! Virtual destructor. - ~StringValue() override = default; //@} //! @name Accessors @@ -429,8 +425,6 @@ class EXIV2API AsciiValue : public StringValueBase { AsciiValue(); //! Constructor explicit AsciiValue(const std::string& buf); - //! Virtual destructor. - ~AsciiValue() override = default; //@} //! @name Manipulators @@ -515,8 +509,6 @@ class EXIV2API CommentValue : public StringValueBase { CommentValue(); //! Constructor, uses read(const std::string& comment) explicit CommentValue(const std::string& comment); - //! Virtual destructor. - ~CommentValue() override = default; //@} //! @name Manipulators @@ -933,8 +925,6 @@ class EXIV2API DateValue : public Value { DateValue(); //! Constructor DateValue(int32_t year, int32_t month, int32_t day); - //! Virtual destructor. - ~DateValue() override = default; //@} //! Simple Date helper structure @@ -1026,9 +1016,6 @@ class EXIV2API TimeValue : public Value { TimeValue(); //! Constructor TimeValue(int32_t hour, int32_t minute, int32_t second = 0, int32_t tzHour = 0, int32_t tzMinute = 0); - - //! Virtual destructor. - ~TimeValue() override = default; //@} //! Simple Time helper structure diff --git a/src/cr2header_int.hpp b/src/cr2header_int.hpp index 802ba82c..51ff5328 100644 --- a/src/cr2header_int.hpp +++ b/src/cr2header_int.hpp @@ -27,8 +27,6 @@ class Cr2Header : public TiffHeaderBase { //@{ //! Default constructor explicit Cr2Header(ByteOrder byteOrder = littleEndian); - //! Destructor. - ~Cr2Header() override = default; //@} //! @name Manipulators diff --git a/src/exif.cpp b/src/exif.cpp index 2bed6128..b72437dd 100644 --- a/src/exif.cpp +++ b/src/exif.cpp @@ -97,7 +97,6 @@ class TiffThumbnail : public Thumbnail { public: //! Shortcut for a %TiffThumbnail auto pointer. using UniquePtr = std::unique_ptr; - ~TiffThumbnail() override = default; //! @name Accessors //@{ @@ -113,7 +112,6 @@ class JpegThumbnail : public Thumbnail { public: //! Shortcut for a %JpegThumbnail auto pointer. using UniquePtr = std::unique_ptr; - ~JpegThumbnail() override = default; //! @name Accessors //@{ diff --git a/src/makernote_int.hpp b/src/makernote_int.hpp index ae3759df..173d87ec 100644 --- a/src/makernote_int.hpp +++ b/src/makernote_int.hpp @@ -139,8 +139,6 @@ class OlympusMnHeader : public MnHeader { //@{ //! Default constructor OlympusMnHeader(); - //! Virtual destructor. - ~OlympusMnHeader() override = default; //@} //! @name Manipulators //@{ @@ -168,8 +166,6 @@ class Olympus2MnHeader : public MnHeader { //@{ //! Default constructor Olympus2MnHeader(); - //! Virtual destructor. - ~Olympus2MnHeader() override = default; //@} //! @name Manipulators //@{ @@ -198,8 +194,6 @@ class OMSystemMnHeader : public MnHeader { //@{ //! Default constructor OMSystemMnHeader(); - //! Virtual destructor. - ~OMSystemMnHeader() override = default; //@} //! @name Manipulators //@{ @@ -228,8 +222,6 @@ class FujiMnHeader : public MnHeader { //@{ //! Default constructor FujiMnHeader(); - //! Virtual destructor. - ~FujiMnHeader() override = default; //@} //! @name Manipulators //@{ @@ -262,8 +254,6 @@ class Nikon2MnHeader : public MnHeader { //@{ //! Default constructor Nikon2MnHeader(); - //! Virtual destructor. - ~Nikon2MnHeader() override = default; //@} //! @name Manipulators //@{ @@ -292,8 +282,6 @@ class Nikon3MnHeader : public MnHeader { //@{ //! Default constructor Nikon3MnHeader(); - //! Virtual destructor. - ~Nikon3MnHeader() override = default; //@} //! @name Manipulators //@{ @@ -326,8 +314,6 @@ class PanasonicMnHeader : public MnHeader { //@{ //! Default constructor PanasonicMnHeader(); - //! Virtual destructor. - ~PanasonicMnHeader() override = default; //@} //! @name Manipulators //@{ @@ -356,8 +342,6 @@ class PentaxDngMnHeader : public MnHeader { //@{ //! Default constructor PentaxDngMnHeader(); - //! Virtual destructor. - ~PentaxDngMnHeader() override = default; //@} //! @name Manipulators //@{ @@ -386,8 +370,6 @@ class PentaxMnHeader : public MnHeader { //@{ //! Default constructor PentaxMnHeader(); - //! Virtual destructor. - ~PentaxMnHeader() override = default; //@} //! @name Manipulators //@{ @@ -436,8 +418,6 @@ class SigmaMnHeader : public MnHeader { //@{ //! Default constructor SigmaMnHeader(); - //! Virtual destructor. - ~SigmaMnHeader() override = default; //@} //! @name Manipulators //@{ @@ -467,8 +447,6 @@ class SonyMnHeader : public MnHeader { //@{ //! Default constructor SonyMnHeader(); - //! Virtual destructor. - ~SonyMnHeader() override = default; //@} //! @name Manipulators //@{ @@ -497,8 +475,6 @@ class Casio2MnHeader : public MnHeader { //@{ //! Default constructor Casio2MnHeader(); - //! Virtual destructor. - ~Casio2MnHeader() override = default; //@} //! @name Manipulators //@{ diff --git a/src/orfimage_int.hpp b/src/orfimage_int.hpp index 8dbd4355..ed00d0f7 100644 --- a/src/orfimage_int.hpp +++ b/src/orfimage_int.hpp @@ -22,8 +22,6 @@ class OrfHeader : public TiffHeaderBase { //@{ //! Default constructor explicit OrfHeader(ByteOrder byteOrder = littleEndian); - //! Destructor. - ~OrfHeader() override = default; //@} //! @name Manipulators diff --git a/src/riffvideo.cpp b/src/riffvideo.cpp index fca4d38a..8d57011d 100644 --- a/src/riffvideo.cpp +++ b/src/riffvideo.cpp @@ -45,9 +45,7 @@ class DummyTiffHeader : public TiffHeaderBase { //! @name Creators //@{ //! Default constructor - DummyTiffHeader(ByteOrder byteOrder); - //! Destructor - ~DummyTiffHeader() override = default; + explicit DummyTiffHeader(ByteOrder byteOrder); //@} //! @name Manipulators diff --git a/src/rw2image_int.hpp b/src/rw2image_int.hpp index 0d74763f..c239c713 100644 --- a/src/rw2image_int.hpp +++ b/src/rw2image_int.hpp @@ -22,8 +22,6 @@ class Rw2Header : public TiffHeaderBase { //@{ //! Default constructor Rw2Header(); - //! Destructor. - ~Rw2Header() override = default; //@} //! @name Accessors diff --git a/src/tiffimage_int.hpp b/src/tiffimage_int.hpp index 8b9ec135..ecbd0fc1 100644 --- a/src/tiffimage_int.hpp +++ b/src/tiffimage_int.hpp @@ -117,8 +117,6 @@ class TiffHeader : public TiffHeaderBase { //@{ //! Default constructor explicit TiffHeader(ByteOrder byteOrder = littleEndian, uint32_t offset = 0x00000008, bool hasImageTags = true); - //! Destructor - ~TiffHeader() override = default; //@} //@{ //! @name Accessors