default con/destructors in headers

Helps to optimize trivially destructable stuff.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
main
Rosen Penev 4 years ago committed by Luis Díaz Más
parent 428c436629
commit 2e73aa9dc0

@ -63,7 +63,7 @@ namespace Exiv2 {
//! @name Creators //! @name Creators
//@{ //@{
//! Destructor //! Destructor
virtual ~BasicIo(); virtual ~BasicIo() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators

@ -297,7 +297,7 @@ namespace Exiv2 {
//! Copy constructor //! Copy constructor
IptcKey(const IptcKey& rhs); IptcKey(const IptcKey& rhs);
//! Destructor //! Destructor
virtual ~IptcKey(); virtual ~IptcKey() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators

@ -76,7 +76,7 @@ namespace Exiv2 {
//! Copy constructor //! Copy constructor
Exifdatum(const Exifdatum& rhs); Exifdatum(const Exifdatum& rhs);
//! Destructor //! Destructor
virtual ~Exifdatum(); virtual ~Exifdatum() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators

@ -91,7 +91,7 @@ namespace Exiv2 {
uint16_t supportedMetadata, uint16_t supportedMetadata,
BasicIo::UniquePtr io); BasicIo::UniquePtr io);
//! Virtual Destructor //! Virtual Destructor
virtual ~Image(); virtual ~Image() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators

@ -67,7 +67,7 @@ namespace Exiv2 {
//! Copy constructor //! Copy constructor
Iptcdatum(const Iptcdatum& rhs); Iptcdatum(const Iptcdatum& rhs);
//! Destructor //! Destructor
virtual ~Iptcdatum(); virtual ~Iptcdatum() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators

@ -93,7 +93,7 @@ namespace Exiv2 {
@brief Assignment operator. Protected so that it can only be used @brief Assignment operator. Protected so that it can only be used
by subclasses but not directly. by subclasses but not directly.
*/ */
Key& operator=(const Key& rhs); Key& operator=(const Key& rhs) = default;
//@} //@}
private: private:
@ -117,11 +117,11 @@ namespace Exiv2 {
//! @name Creators //! @name Creators
//@{ //@{
//! Default Constructor //! Default Constructor
Metadatum(); Metadatum() = default;
//! Copy constructor //! Copy constructor
Metadatum(const Metadatum& rhs); Metadatum(const Metadatum& rhs) = default;
//! Destructor //! Destructor
virtual ~Metadatum(); virtual ~Metadatum() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -275,7 +275,7 @@ namespace Exiv2 {
@brief Assignment operator. Protected so that it can only be used @brief Assignment operator. Protected so that it can only be used
by subclasses but not directly. by subclasses but not directly.
*/ */
Metadatum& operator=(const Metadatum& rhs); Metadatum& operator=(const Metadatum& rhs) = default;
//@} //@}
}; // class Metadatum }; // class Metadatum

@ -261,7 +261,7 @@ namespace Exiv2 {
long len, ByteOrder byteOrder =invalidByteOrder, long len, ByteOrder byteOrder =invalidByteOrder,
TypeId typeId =undefined); TypeId typeId =undefined);
virtual ~DataValue(); virtual ~DataValue() = default;
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -344,9 +344,9 @@ namespace Exiv2 {
//! Constructor for subclasses //! Constructor for subclasses
StringValueBase(TypeId typeId, const std::string& buf); StringValueBase(TypeId typeId, const std::string& buf);
//! Copy constructor //! Copy constructor
StringValueBase(const StringValueBase& rhs); StringValueBase(const StringValueBase& rhs) = default;
//! Virtual destructor. //! Virtual destructor.
virtual ~StringValueBase(); virtual ~StringValueBase() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -426,7 +426,7 @@ namespace Exiv2 {
//! Constructor //! Constructor
explicit StringValue(const std::string& buf); explicit StringValue(const std::string& buf);
//! Virtual destructor. //! Virtual destructor.
virtual ~StringValue(); virtual ~StringValue() = default;
//@} //@}
//! @name Accessors //! @name Accessors
@ -458,7 +458,7 @@ namespace Exiv2 {
//! Constructor //! Constructor
explicit AsciiValue(const std::string& buf); explicit AsciiValue(const std::string& buf);
//! Virtual destructor. //! Virtual destructor.
virtual ~AsciiValue(); virtual ~AsciiValue() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -546,7 +546,7 @@ namespace Exiv2 {
//! Constructor, uses read(const std::string& comment) //! Constructor, uses read(const std::string& comment)
explicit CommentValue(const std::string& comment); explicit CommentValue(const std::string& comment);
//! Virtual destructor. //! Virtual destructor.
virtual ~CommentValue(); virtual ~CommentValue() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -987,7 +987,7 @@ namespace Exiv2 {
//! Constructor //! Constructor
DateValue(int year, int month, int day); DateValue(int year, int month, int day);
//! Virtual destructor. //! Virtual destructor.
virtual ~DateValue(); virtual ~DateValue() = default;
//@} //@}
//! Simple Date helper structure //! Simple Date helper structure
@ -1090,7 +1090,7 @@ namespace Exiv2 {
int tzHour =0, int tzMinute =0); int tzHour =0, int tzMinute =0);
//! Virtual destructor. //! Virtual destructor.
virtual ~TimeValue(); virtual ~TimeValue() = default;
//@} //@}
//! Simple Time helper structure //! Simple Time helper structure

@ -162,8 +162,6 @@ namespace {
// ***************************************************************************** // *****************************************************************************
// class member definitions // class member definitions
namespace Action { namespace Action {
Task::~Task() = default;
Task::UniquePtr Task::clone() const Task::UniquePtr Task::clone() const
{ {
return UniquePtr(clone_()); return UniquePtr(clone_());
@ -223,8 +221,6 @@ namespace Action {
return nullptr; return nullptr;
} // TaskFactory::create } // TaskFactory::create
Print::~Print() = default;
int setModeAndPrintStructure(Exiv2::PrintStructureOption option, const std::string& path,bool binary) int setModeAndPrintStructure(Exiv2::PrintStructureOption option, const std::string& path,bool binary)
{ {
int result = 0 ; int result = 0 ;
@ -699,8 +695,6 @@ namespace Action {
return new Print(*this); return new Print(*this);
} }
Rename::~Rename() = default;
int Rename::run(const std::string& path) int Rename::run(const std::string& path)
{ {
try { try {
@ -785,8 +779,6 @@ namespace Action {
return new Rename(*this); return new Rename(*this);
} }
Erase::~Erase() = default;
int Erase::run(const std::string& path) int Erase::run(const std::string& path)
try { try {
path_ = path; path_ = path;
@ -909,8 +901,6 @@ namespace Action {
return new Erase(*this); return new Erase(*this);
} }
Extract::~Extract() = default;
int Extract::run(const std::string& path) int Extract::run(const std::string& path)
{ {
try { try {
@ -1098,8 +1088,6 @@ namespace Action {
return new Extract(*this); return new Extract(*this);
} }
Insert::~Insert() = default;
int Insert::run(const std::string& path) int Insert::run(const std::string& path)
try { try {
// -i{tgt}- reading from stdin? // -i{tgt}- reading from stdin?
@ -1278,8 +1266,6 @@ namespace Action {
return new Insert(*this); return new Insert(*this);
} }
Modify::~Modify() = default;
int Modify::run(const std::string& path) int Modify::run(const std::string& path)
{ {
try { try {
@ -1510,8 +1496,6 @@ namespace Action {
return new Modify(*this); return new Modify(*this);
} }
Adjust::~Adjust() = default;
int Adjust::run(const std::string& path) int Adjust::run(const std::string& path)
try { try {
adjustment_ = Params::instance().adjustment_; adjustment_ = Params::instance().adjustment_;
@ -1648,8 +1632,6 @@ namespace Action {
return 0; return 0;
} // Adjust::adjustDateTime } // Adjust::adjustDateTime
FixIso::~FixIso() = default;
int FixIso::run(const std::string& path) int FixIso::run(const std::string& path)
{ {
try { try {
@ -1709,8 +1691,6 @@ namespace Action {
return new FixIso(*this); return new FixIso(*this);
} }
FixCom::~FixCom() = default;
int FixCom::run(const std::string& path) int FixCom::run(const std::string& path)
{ {
try { try {

@ -67,7 +67,7 @@ namespace Action {
//! Shortcut for an auto pointer. //! Shortcut for an auto pointer.
using UniquePtr = std::unique_ptr<Task>; using UniquePtr = std::unique_ptr<Task>;
//! Virtual destructor. //! Virtual destructor.
virtual ~Task(); virtual ~Task() = default;
//! Virtual copy construction. //! Virtual copy construction.
UniquePtr clone() const; UniquePtr clone() const;
/*! /*!
@ -159,7 +159,7 @@ namespace Action {
//! %Print the Exif (or other metadata) of a file to stdout //! %Print the Exif (or other metadata) of a file to stdout
class Print : public Task { class Print : public Task {
public: public:
virtual ~Print(); virtual ~Print() = default;
virtual int run(const std::string& path); virtual int run(const std::string& path);
using UniquePtr = std::unique_ptr<Print>; using UniquePtr = std::unique_ptr<Print>;
UniquePtr clone() const; UniquePtr clone() const;
@ -215,7 +215,7 @@ namespace Action {
*/ */
class Rename : public Task { class Rename : public Task {
public: public:
virtual ~Rename(); virtual ~Rename() = default;
virtual int run(const std::string& path); virtual int run(const std::string& path);
using UniquePtr = std::unique_ptr<Rename>; using UniquePtr = std::unique_ptr<Rename>;
UniquePtr clone() const; UniquePtr clone() const;
@ -227,7 +227,7 @@ namespace Action {
//! %Adjust the Exif (or other metadata) timestamps //! %Adjust the Exif (or other metadata) timestamps
class Adjust : public Task { class Adjust : public Task {
public: public:
virtual ~Adjust(); virtual ~Adjust() = default;
virtual int run(const std::string& path); virtual int run(const std::string& path);
using UniquePtr = std::unique_ptr<Adjust>; using UniquePtr = std::unique_ptr<Adjust>;
UniquePtr clone() const; UniquePtr clone() const;
@ -250,7 +250,7 @@ namespace Action {
*/ */
class Erase : public Task { class Erase : public Task {
public: public:
virtual ~Erase(); virtual ~Erase() = default;
virtual int run(const std::string& path); virtual int run(const std::string& path);
using UniquePtr = std::unique_ptr<Erase>; using UniquePtr = std::unique_ptr<Erase>;
UniquePtr clone() const; UniquePtr clone() const;
@ -292,7 +292,7 @@ namespace Action {
*/ */
class Extract : public Task { class Extract : public Task {
public: public:
virtual ~Extract(); virtual ~Extract() = default;
virtual int run(const std::string& path); virtual int run(const std::string& path);
using UniquePtr = std::unique_ptr<Extract>; using UniquePtr = std::unique_ptr<Extract>;
UniquePtr clone() const; UniquePtr clone() const;
@ -331,7 +331,7 @@ namespace Action {
*/ */
class Insert : public Task { class Insert : public Task {
public: public:
virtual ~Insert(); virtual ~Insert() = default;
virtual int run(const std::string& path); virtual int run(const std::string& path);
using UniquePtr = std::unique_ptr<Insert>; using UniquePtr = std::unique_ptr<Insert>;
UniquePtr clone() const; UniquePtr clone() const;
@ -372,7 +372,7 @@ namespace Action {
*/ */
class Modify : public Task { class Modify : public Task {
public: public:
virtual ~Modify(); virtual ~Modify() = default;
virtual int run(const std::string& path); virtual int run(const std::string& path);
using UniquePtr = std::unique_ptr<Modify>; using UniquePtr = std::unique_ptr<Modify>;
UniquePtr clone() const; UniquePtr clone() const;
@ -405,7 +405,7 @@ namespace Action {
*/ */
class FixIso : public Task { class FixIso : public Task {
public: public:
virtual ~FixIso(); virtual ~FixIso() = default;
virtual int run(const std::string& path); virtual int run(const std::string& path);
using UniquePtr = std::unique_ptr<FixIso>; using UniquePtr = std::unique_ptr<FixIso>;
UniquePtr clone() const; UniquePtr clone() const;
@ -423,7 +423,7 @@ namespace Action {
*/ */
class FixCom : public Task { class FixCom : public Task {
public: public:
virtual ~FixCom(); virtual ~FixCom() = default;
virtual int run(const std::string& path); virtual int run(const std::string& path);
using UniquePtr = std::unique_ptr<FixCom>; using UniquePtr = std::unique_ptr<FixCom>;
UniquePtr clone() const; UniquePtr clone() const;

@ -77,8 +77,6 @@ using nlink_t = short;
// ***************************************************************************** // *****************************************************************************
// class member definitions // class member definitions
namespace Exiv2 { namespace Exiv2 {
BasicIo::~BasicIo() = default;
//! Internal Pimpl structure of class FileIo. //! Internal Pimpl structure of class FileIo.
class FileIo::Impl { class FileIo::Impl {
public: public:

@ -11,8 +11,6 @@ namespace Exiv2 {
{ {
} }
Cr2Header::~Cr2Header() = default;
bool Cr2Header::read(const byte* pData, uint32_t size) bool Cr2Header::read(const byte* pData, uint32_t size)
{ {
if (!pData || size < 16) { if (!pData || size < 16) {

@ -47,7 +47,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
explicit Cr2Header(ByteOrder byteOrder =littleEndian); explicit Cr2Header(ByteOrder byteOrder =littleEndian);
//! Destructor. //! Destructor.
~Cr2Header(); ~Cr2Header() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators

@ -186,8 +186,6 @@ namespace Exiv2 {
if (isAllocated_) delete[] pData_; if (isAllocated_) delete[] pData_;
} }
CiffEntry::~CiffEntry() = default;
CiffDirectory::~CiffDirectory() CiffDirectory::~CiffDirectory()
{ {
Components::iterator b = components_.begin(); Components::iterator b = components_.begin();

@ -306,7 +306,7 @@ namespace Exiv2 {
CiffEntry(uint16_t tag, uint16_t dir) : CiffComponent(tag, dir) {} CiffEntry(uint16_t tag, uint16_t dir) : CiffComponent(tag, dir) {}
//! Virtual destructor. //! Virtual destructor.
virtual ~CiffEntry(); virtual ~CiffEntry() = default;
//@} //@}
// Default assignment operator is fine // Default assignment operator is fine

@ -602,8 +602,6 @@ namespace Exiv2 {
{ {
} }
IptcKey::~IptcKey() = default;
IptcKey& IptcKey::operator=(const IptcKey& rhs) IptcKey& IptcKey::operator=(const IptcKey& rhs)
{ {
if (this == &rhs) return *this; if (this == &rhs) return *this;

@ -205,8 +205,6 @@ namespace Exiv2 {
if (pValue) value_ = pValue->clone(); if (pValue) value_ = pValue->clone();
} }
Exifdatum::~Exifdatum() = default;
Exifdatum::Exifdatum(const Exifdatum& rhs) Exifdatum::Exifdatum(const Exifdatum& rhs)
: Metadatum(rhs) : Metadatum(rhs)
{ {

@ -113,8 +113,6 @@ namespace Util {
{ {
} }
Getopt::~Getopt() = default;
int Getopt::getopt(int argc, char* const argv[], const std::string& optstring) int Getopt::getopt(int argc, char* const argv[], const std::string& optstring)
{ {
progname_ = Util::basename(argv[0]); progname_ = Util::basename(argv[0]);

@ -53,7 +53,7 @@ namespace Util {
Getopt(); Getopt();
//! Destructor. //! Destructor.
virtual ~Getopt(); virtual ~Getopt() = default;
/*! /*!
@brief Parse command line arguments. @brief Parse command line arguments.

@ -157,8 +157,6 @@ namespace Exiv2 {
{ {
} }
Image::~Image() = default;
void Image::printStructure(std::ostream&, PrintStructureOption,int /*depth*/) void Image::printStructure(std::ostream&, PrintStructureOption,int /*depth*/)
{ {
throw Error(kerUnsupportedImageType, io_->path()); throw Error(kerUnsupportedImageType, io_->path());

@ -94,8 +94,6 @@ namespace Exiv2 {
if (rhs.value_.get() != 0) value_ = rhs.value_->clone(); // deep copy if (rhs.value_.get() != 0) value_ = rhs.value_->clone(); // deep copy
} }
Iptcdatum::~Iptcdatum() = default;
long Iptcdatum::copy(byte* buf, ByteOrder byteOrder) const long Iptcdatum::copy(byte* buf, ByteOrder byteOrder) const
{ {
return value_.get() == 0 ? 0 : value_->copy(buf, byteOrder); return value_.get() == 0 ? 0 : value_->copy(buf, byteOrder);

@ -205,8 +205,6 @@ namespace Exiv2 {
return tc; return tc;
} // TiffMnCreator::create } // TiffMnCreator::create
MnHeader::~MnHeader() = default;
void MnHeader::setByteOrder(ByteOrder /*byteOrder*/) void MnHeader::setByteOrder(ByteOrder /*byteOrder*/)
{ {
} }
@ -240,8 +238,6 @@ namespace Exiv2 {
read(signature_, sizeOfSignature(), invalidByteOrder); read(signature_, sizeOfSignature(), invalidByteOrder);
} }
OlympusMnHeader::~OlympusMnHeader() = default;
uint32_t OlympusMnHeader::size() const uint32_t OlympusMnHeader::size() const
{ {
return header_.size_; return header_.size_;
@ -284,8 +280,6 @@ namespace Exiv2 {
read(signature_, sizeOfSignature(), invalidByteOrder); read(signature_, sizeOfSignature(), invalidByteOrder);
} }
Olympus2MnHeader::~Olympus2MnHeader() = default;
uint32_t Olympus2MnHeader::size() const uint32_t Olympus2MnHeader::size() const
{ {
return header_.size_; return header_.size_;
@ -334,8 +328,6 @@ namespace Exiv2 {
read(signature_, sizeOfSignature(), byteOrder_); read(signature_, sizeOfSignature(), byteOrder_);
} }
FujiMnHeader::~FujiMnHeader() = default;
uint32_t FujiMnHeader::size() const uint32_t FujiMnHeader::size() const
{ {
return header_.size_; return header_.size_;
@ -391,8 +383,6 @@ namespace Exiv2 {
read(signature_, sizeOfSignature(), invalidByteOrder); read(signature_, sizeOfSignature(), invalidByteOrder);
} }
Nikon2MnHeader::~Nikon2MnHeader() = default;
uint32_t Nikon2MnHeader::size() const uint32_t Nikon2MnHeader::size() const
{ {
return sizeOfSignature(); return sizeOfSignature();
@ -440,8 +430,6 @@ namespace Exiv2 {
start_ = sizeOfSignature(); start_ = sizeOfSignature();
} }
Nikon3MnHeader::~Nikon3MnHeader() = default;
uint32_t Nikon3MnHeader::size() const uint32_t Nikon3MnHeader::size() const
{ {
return sizeOfSignature(); return sizeOfSignature();
@ -510,8 +498,6 @@ namespace Exiv2 {
read(signature_, sizeOfSignature(), invalidByteOrder); read(signature_, sizeOfSignature(), invalidByteOrder);
} }
PanasonicMnHeader::~PanasonicMnHeader() = default;
uint32_t PanasonicMnHeader::size() const uint32_t PanasonicMnHeader::size() const
{ {
return sizeOfSignature(); return sizeOfSignature();
@ -555,8 +541,6 @@ namespace Exiv2 {
read(signature_, sizeOfSignature(), invalidByteOrder); read(signature_, sizeOfSignature(), invalidByteOrder);
} }
PentaxDngMnHeader::~PentaxDngMnHeader() = default;
uint32_t PentaxDngMnHeader::size() const uint32_t PentaxDngMnHeader::size() const
{ {
return header_.size_; return header_.size_;
@ -604,8 +588,6 @@ namespace Exiv2 {
read(signature_, sizeOfSignature(), invalidByteOrder); read(signature_, sizeOfSignature(), invalidByteOrder);
} }
PentaxMnHeader::~PentaxMnHeader() = default;
uint32_t PentaxMnHeader::size() const uint32_t PentaxMnHeader::size() const
{ {
return header_.size_; return header_.size_;
@ -680,8 +662,6 @@ namespace Exiv2 {
read(signature1_, sizeOfSignature(), invalidByteOrder); read(signature1_, sizeOfSignature(), invalidByteOrder);
} }
SigmaMnHeader::~SigmaMnHeader() = default;
uint32_t SigmaMnHeader::size() const uint32_t SigmaMnHeader::size() const
{ {
return sizeOfSignature(); return sizeOfSignature();
@ -726,8 +706,6 @@ namespace Exiv2 {
read(signature_, sizeOfSignature(), invalidByteOrder); read(signature_, sizeOfSignature(), invalidByteOrder);
} }
SonyMnHeader::~SonyMnHeader() = default;
uint32_t SonyMnHeader::size() const uint32_t SonyMnHeader::size() const
{ {
return sizeOfSignature(); return sizeOfSignature();
@ -772,8 +750,6 @@ namespace Exiv2 {
read(signature_, sizeOfSignature(), invalidByteOrder ); read(signature_, sizeOfSignature(), invalidByteOrder );
} }
Casio2MnHeader::~Casio2MnHeader() = default;
uint32_t Casio2MnHeader::size() const uint32_t Casio2MnHeader::size() const
{ {
return sizeOfSignature(); return sizeOfSignature();

@ -128,7 +128,7 @@ namespace Exiv2 {
//! @name Creators //! @name Creators
//@{ //@{
//! Virtual destructor. //! Virtual destructor.
virtual ~MnHeader(); virtual ~MnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -177,7 +177,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
OlympusMnHeader(); OlympusMnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~OlympusMnHeader(); virtual ~OlympusMnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -208,7 +208,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
Olympus2MnHeader(); Olympus2MnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~Olympus2MnHeader(); virtual ~Olympus2MnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -240,7 +240,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
FujiMnHeader(); FujiMnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~FujiMnHeader(); virtual ~FujiMnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -276,7 +276,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
Nikon2MnHeader(); Nikon2MnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~Nikon2MnHeader(); virtual ~Nikon2MnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -308,7 +308,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
Nikon3MnHeader(); Nikon3MnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~Nikon3MnHeader(); virtual ~Nikon3MnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -344,7 +344,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
PanasonicMnHeader(); PanasonicMnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~PanasonicMnHeader(); virtual ~PanasonicMnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -376,7 +376,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
PentaxDngMnHeader(); PentaxDngMnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~PentaxDngMnHeader(); virtual ~PentaxDngMnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -408,7 +408,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
PentaxMnHeader(); PentaxMnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~PentaxMnHeader(); virtual ~PentaxMnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -462,7 +462,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
SigmaMnHeader(); SigmaMnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~SigmaMnHeader(); virtual ~SigmaMnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -495,7 +495,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
SonyMnHeader(); SonyMnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~SonyMnHeader(); virtual ~SonyMnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{
@ -527,7 +527,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
Casio2MnHeader(); Casio2MnHeader();
//! Virtual destructor. //! Virtual destructor.
virtual ~Casio2MnHeader(); virtual ~Casio2MnHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
//@{ //@{

@ -35,16 +35,6 @@ namespace Exiv2 {
return UniquePtr(clone_()); return UniquePtr(clone_());
} }
Key& Key::operator=(const Key& /*rhs*/) = default;
Metadatum::Metadatum() = default;
Metadatum::Metadatum(const Metadatum& /*rhs*/) = default;
Metadatum::~Metadatum() = default;
Metadatum& Metadatum::operator=(const Metadatum& /*rhs*/) = default;
std::string Metadatum::print(const ExifData* pMetadata) const std::string Metadatum::print(const ExifData* pMetadata) const
{ {
std::ostringstream os; std::ostringstream os;

@ -29,8 +29,6 @@ namespace Exiv2 {
{ {
} }
OrfHeader::~OrfHeader() = default;
bool OrfHeader::read(const byte* pData, uint32_t size) bool OrfHeader::read(const byte* pData, uint32_t size)
{ {
if (size < 8) return false; if (size < 8) return false;

@ -43,7 +43,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
explicit OrfHeader(ByteOrder byteOrder =littleEndian); explicit OrfHeader(ByteOrder byteOrder =littleEndian);
//! Destructor. //! Destructor.
~OrfHeader(); ~OrfHeader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators

@ -28,8 +28,6 @@ namespace Exiv2 {
{ {
} }
Rw2Header::~Rw2Header() = default;
DataBuf Rw2Header::write() const DataBuf Rw2Header::write() const
{ {
// Todo: Implement me! // Todo: Implement me!

@ -46,7 +46,7 @@ namespace Exiv2 {
//! Default constructor //! Default constructor
Rw2Header(); Rw2Header();
//! Destructor. //! Destructor.
~Rw2Header(); ~Rw2Header() = default;
//@} //@}
//! @name Accessors //! @name Accessors

@ -172,8 +172,6 @@ namespace Exiv2 {
elDef_.count_ = 0; elDef_.count_ = 0;
} }
TiffComponent::~TiffComponent() = default;
TiffDirectory::~TiffDirectory() TiffDirectory::~TiffDirectory()
{ {
for (auto&& component : components_) { for (auto&& component : components_) {
@ -197,16 +195,6 @@ namespace Exiv2 {
delete pValue_; delete pValue_;
} }
TiffEntry::~TiffEntry() = default;
TiffDataEntryBase::~TiffDataEntryBase() = default;
TiffDataEntry::~TiffDataEntry() = default;
TiffImageEntry::~TiffImageEntry() = default;
TiffSizeEntry::~TiffSizeEntry() = default;
TiffMnEntry::~TiffMnEntry() TiffMnEntry::~TiffMnEntry()
{ {
delete mn_; delete mn_;
@ -224,8 +212,6 @@ namespace Exiv2 {
} }
} }
TiffBinaryElement::~TiffBinaryElement() = default;
TiffEntryBase::TiffEntryBase(const TiffEntryBase& rhs) TiffEntryBase::TiffEntryBase(const TiffEntryBase& rhs)
: TiffComponent(rhs), : TiffComponent(rhs),
tiffType_(rhs.tiffType_), tiffType_(rhs.tiffType_),

@ -181,7 +181,7 @@ namespace Exiv2 {
//! Constructor //! Constructor
TiffComponent(uint16_t tag, IfdId group); TiffComponent(uint16_t tag, IfdId group);
//! Virtual destructor. //! Virtual destructor.
virtual ~TiffComponent(); virtual ~TiffComponent() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -568,7 +568,7 @@ namespace Exiv2 {
//! Constructor //! Constructor
TiffEntry(uint16_t tag, IfdId group) : TiffEntryBase(tag, group) {} TiffEntry(uint16_t tag, IfdId group) : TiffEntryBase(tag, group) {}
//! Virtual destructor. //! Virtual destructor.
virtual ~TiffEntry(); virtual ~TiffEntry() = default;
//@} //@}
protected: protected:
@ -602,7 +602,7 @@ namespace Exiv2 {
: TiffEntryBase(tag, group), : TiffEntryBase(tag, group),
szTag_(szTag), szGroup_(szGroup) {} szTag_(szTag), szGroup_(szGroup) {}
//! Virtual destructor. //! Virtual destructor.
virtual ~TiffDataEntryBase(); virtual ~TiffDataEntryBase() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -658,7 +658,7 @@ namespace Exiv2 {
: TiffDataEntryBase(tag, group, szTag, szGroup), : TiffDataEntryBase(tag, group, szTag, szGroup),
pDataArea_(0), sizeDataArea_(0) {} pDataArea_(0), sizeDataArea_(0) {}
//! Virtual destructor. //! Virtual destructor.
virtual ~TiffDataEntry(); virtual ~TiffDataEntry() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -740,7 +740,7 @@ namespace Exiv2 {
TiffImageEntry(uint16_t tag, IfdId group, uint16_t szTag, IfdId szGroup) TiffImageEntry(uint16_t tag, IfdId group, uint16_t szTag, IfdId szGroup)
: TiffDataEntryBase(tag, group, szTag, szGroup) {} : TiffDataEntryBase(tag, group, szTag, szGroup) {}
//! Virtual destructor. //! Virtual destructor.
virtual ~TiffImageEntry(); virtual ~TiffImageEntry() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -822,7 +822,7 @@ namespace Exiv2 {
TiffSizeEntry(uint16_t tag, IfdId group, uint16_t dtTag, IfdId dtGroup) TiffSizeEntry(uint16_t tag, IfdId group, uint16_t dtTag, IfdId dtGroup)
: TiffEntryBase(tag, group), dtTag_(dtTag), dtGroup_(dtGroup) {} : TiffEntryBase(tag, group), dtTag_(dtTag), dtGroup_(dtGroup) {}
//! Virtual destructor. //! Virtual destructor.
virtual ~TiffSizeEntry(); virtual ~TiffSizeEntry() = default;
//@} //@}
//! @name Accessors //! @name Accessors
@ -1498,7 +1498,7 @@ namespace Exiv2 {
//! Constructor //! Constructor
TiffBinaryElement(uint16_t tag, IfdId group); TiffBinaryElement(uint16_t tag, IfdId group);
//! Virtual destructor. //! Virtual destructor.
virtual ~TiffBinaryElement(); virtual ~TiffBinaryElement() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators

@ -1893,8 +1893,6 @@ namespace Exiv2 {
{ {
} }
TiffHeaderBase::~TiffHeaderBase() = default;
bool TiffHeaderBase::read(const byte* pData, uint32_t size) bool TiffHeaderBase::read(const byte* pData, uint32_t size)
{ {
if (!pData || size < 8) return false; if (!pData || size < 8) return false;
@ -2079,8 +2077,6 @@ namespace Exiv2 {
{ {
} }
TiffHeader::~TiffHeader() = default;
bool TiffHeader::isImageTag( uint16_t tag, bool TiffHeader::isImageTag( uint16_t tag,
IfdId group, IfdId group,
const PrimaryGroups* pPrimaryGroups) const const PrimaryGroups* pPrimaryGroups) const

@ -59,7 +59,7 @@ namespace Exiv2 {
ByteOrder byteOrder, ByteOrder byteOrder,
uint32_t offset); uint32_t offset);
//! Virtual destructor. //! Virtual destructor.
virtual ~TiffHeaderBase() =0; virtual ~TiffHeaderBase() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -148,7 +148,7 @@ namespace Exiv2 {
uint32_t offset =0x00000008, uint32_t offset =0x00000008,
bool hasImageTags =true); bool hasImageTags =true);
//! Destructor //! Destructor
~TiffHeader(); ~TiffHeader() = default;
//@} //@}
//@{ //@{
//! @name Accessors //! @name Accessors

@ -83,8 +83,6 @@ namespace Exiv2 {
go_.fill(true); go_.fill(true);
} }
TiffVisitor::~TiffVisitor() = default;
void TiffVisitor::setGo(GoEvent event, bool go) void TiffVisitor::setGo(GoEvent event, bool go)
{ {
assert(event >= 0 && static_cast<int>(event) < events_); assert(event >= 0 && static_cast<int>(event) < events_);
@ -121,8 +119,6 @@ namespace Exiv2 {
setGo(geTraverse, true); setGo(geTraverse, true);
} }
TiffFinder::~TiffFinder() = default;
void TiffFinder::findObject(TiffComponent* object) void TiffFinder::findObject(TiffComponent* object)
{ {
if (object->tag() == tag_ && object->group() == group_) { if (object->tag() == tag_ && object->group() == group_) {
@ -195,8 +191,6 @@ namespace Exiv2 {
assert(pPrimaryGroups_ != 0); assert(pPrimaryGroups_ != 0);
} }
TiffCopier::~TiffCopier() = default;
void TiffCopier::copyObject(TiffComponent* object) void TiffCopier::copyObject(TiffComponent* object)
{ {
assert(object != 0); assert(object != 0);
@ -296,8 +290,6 @@ namespace Exiv2 {
} }
} }
TiffDecoder::~TiffDecoder() = default;
void TiffDecoder::visitEntry(TiffEntry* object) void TiffDecoder::visitEntry(TiffEntry* object)
{ {
decodeTiffEntry(object); decodeTiffEntry(object);
@ -610,8 +602,6 @@ namespace Exiv2 {
} }
} }
TiffEncoder::~TiffEncoder() = default;
void TiffEncoder::encodeIptc() void TiffEncoder::encodeIptc()
{ {
// Update IPTCNAA Exif tag, if it exists. Delete the tag if there // Update IPTCNAA Exif tag, if it exists. Delete the tag if there
@ -1210,8 +1200,6 @@ namespace Exiv2 {
} // TiffReader::TiffReader } // TiffReader::TiffReader
TiffReader::~TiffReader() = default;
void TiffReader::setOrigState() void TiffReader::setOrigState()
{ {
pState_ = &origState_; pState_ = &origState_;

@ -84,7 +84,7 @@ namespace Exiv2 {
//! Default constructor. Initialises all stop/go flags to true. //! Default constructor. Initialises all stop/go flags to true.
TiffVisitor(); TiffVisitor();
//! Virtual destructor //! Virtual destructor
virtual ~TiffVisitor(); virtual ~TiffVisitor() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -162,7 +162,7 @@ namespace Exiv2 {
TiffFinder(uint16_t tag, IfdId group) TiffFinder(uint16_t tag, IfdId group)
: tag_(tag), group_(group), tiffComponent_(0) {} : tag_(tag), group_(group), tiffComponent_(0) {}
//! Virtual destructor //! Virtual destructor
virtual ~TiffFinder(); virtual ~TiffFinder() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -231,7 +231,7 @@ namespace Exiv2 {
const TiffHeaderBase* pHeader, const TiffHeaderBase* pHeader,
const PrimaryGroups* pPrimaryGroups); const PrimaryGroups* pPrimaryGroups);
//! Virtual destructor //! Virtual destructor
virtual ~TiffCopier(); virtual ~TiffCopier() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -291,7 +291,7 @@ namespace Exiv2 {
FindDecoderFct findDecoderFct FindDecoderFct findDecoderFct
); );
//! Virtual destructor //! Virtual destructor
virtual ~TiffDecoder(); virtual ~TiffDecoder() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -394,7 +394,7 @@ namespace Exiv2 {
FindEncoderFct findEncoderFct FindEncoderFct findEncoderFct
); );
//! Virtual destructor //! Virtual destructor
virtual ~TiffEncoder(); virtual ~TiffEncoder() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators
@ -639,7 +639,7 @@ namespace Exiv2 {
TiffRwState state); TiffRwState state);
//! Virtual destructor //! Virtual destructor
virtual ~TiffReader(); virtual ~TiffReader() = default;
//@} //@}
//! @name Manipulators //! @name Manipulators

@ -188,8 +188,6 @@ namespace Exiv2 {
read(buf, len, byteOrder); read(buf, len, byteOrder);
} }
DataValue::~DataValue() = default;
long DataValue::count() const long DataValue::count() const
{ {
return size(); return size();
@ -279,12 +277,6 @@ namespace Exiv2 {
read(buf); read(buf);
} }
StringValueBase::StringValueBase(const StringValueBase& rhs)
= default;
StringValueBase::~StringValueBase() = default;
StringValueBase& StringValueBase::operator=(const StringValueBase& rhs) StringValueBase& StringValueBase::operator=(const StringValueBase& rhs)
{ {
if (this == &rhs) return *this; if (this == &rhs) return *this;
@ -360,8 +352,6 @@ namespace Exiv2 {
{ {
} }
StringValue::~StringValue() = default;
StringValue* StringValue::clone_() const StringValue* StringValue::clone_() const
{ {
return new StringValue(*this); return new StringValue(*this);
@ -377,8 +367,6 @@ namespace Exiv2 {
{ {
} }
AsciiValue::~AsciiValue() = default;
int AsciiValue::read(const std::string& buf) int AsciiValue::read(const std::string& buf)
{ {
value_ = buf; value_ = buf;
@ -459,8 +447,6 @@ namespace Exiv2 {
read(comment); read(comment);
} }
CommentValue::~CommentValue() = default;
int CommentValue::read(const std::string& comment) int CommentValue::read(const std::string& comment)
{ {
std::string c = comment; std::string c = comment;
@ -944,8 +930,6 @@ namespace Exiv2 {
date_.day = day; date_.day = day;
} }
DateValue::~DateValue() = default;
int DateValue::read(const byte* buf, long len, ByteOrder /*byteOrder*/) int DateValue::read(const byte* buf, long len, ByteOrder /*byteOrder*/)
{ {
// Hard coded to read Iptc style dates // Hard coded to read Iptc style dates
@ -1078,8 +1062,6 @@ namespace Exiv2 {
time_.tzMinute = tzMinute; time_.tzMinute = tzMinute;
} }
TimeValue::~TimeValue() = default;
int TimeValue::read(const byte* buf, long len, ByteOrder /*byteOrder*/) int TimeValue::read(const byte* buf, long len, ByteOrder /*byteOrder*/)
{ {
// Make the buffer a 0 terminated C-string for scanTime[36] // Make the buffer a 0 terminated C-string for scanTime[36]

Loading…
Cancel
Save