diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp index 00d463c0..9432502a 100644 --- a/taglib/asf/asffile.cpp +++ b/taglib/asf/asffile.cpp @@ -103,7 +103,7 @@ class ASF::File::FilePrivate::BaseObject { public: ByteVector data; - virtual ~BaseObject() {} + virtual ~BaseObject() = default; virtual ByteVector guid() const = 0; virtual void parse(ASF::File *file, unsigned int size); virtual ByteVector render(ASF::File *file); diff --git a/taglib/audioproperties.cpp b/taglib/audioproperties.cpp index ca433fd9..09e6af3e 100644 --- a/taglib/audioproperties.cpp +++ b/taglib/audioproperties.cpp @@ -36,10 +36,7 @@ class AudioProperties::AudioPropertiesPrivate // public methods //////////////////////////////////////////////////////////////////////////////// -AudioProperties::~AudioProperties() -{ - -} +AudioProperties::~AudioProperties() = default; int AudioProperties::length() const { diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp index e9f8a5a8..20d54062 100644 --- a/taglib/fileref.cpp +++ b/taglib/fileref.cpp @@ -516,10 +516,6 @@ void FileRef::parse(IOStream *stream, bool readAudioProperties, d->file = detectByContent(stream, readAudioProperties, audioPropertiesStyle); } -FileRef::FileTypeResolver::~FileTypeResolver() -{ -} +FileRef::FileTypeResolver::~FileTypeResolver() = default; -FileRef::StreamTypeResolver::~StreamTypeResolver() -{ -} +FileRef::StreamTypeResolver::~StreamTypeResolver() = default; diff --git a/taglib/flac/flacmetadatablock.cpp b/taglib/flac/flacmetadatablock.cpp index 695e559b..21efde4f 100644 --- a/taglib/flac/flacmetadatablock.cpp +++ b/taglib/flac/flacmetadatablock.cpp @@ -32,8 +32,7 @@ using namespace TagLib; class FLAC::MetadataBlock::MetadataBlockPrivate { public: - MetadataBlockPrivate() {} - + MetadataBlockPrivate() = default; }; FLAC::MetadataBlock::MetadataBlock() @@ -41,7 +40,4 @@ FLAC::MetadataBlock::MetadataBlock() { } -FLAC::MetadataBlock::~MetadataBlock() -{ -} - +FLAC::MetadataBlock::~MetadataBlock() = default; diff --git a/taglib/mod/modtag.cpp b/taglib/mod/modtag.cpp index 96f3bf99..11a710e1 100644 --- a/taglib/mod/modtag.cpp +++ b/taglib/mod/modtag.cpp @@ -34,9 +34,7 @@ using namespace Mod; class Mod::Tag::TagPrivate { public: - TagPrivate() - { - } + TagPrivate() = default; String title; String comment; diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp index 3ae2fb40..8ac60761 100644 --- a/taglib/mp4/mp4atom.cpp +++ b/taglib/mp4/mp4atom.cpp @@ -129,9 +129,7 @@ MP4::Atom::Atom(File *file) file->seek(offset + length); } -MP4::Atom::~Atom() -{ -} +MP4::Atom::~Atom() = default; MP4::Atom * MP4::Atom::find(const char *name1, const char *name2, const char *name3, const char *name4) @@ -193,8 +191,7 @@ MP4::Atoms::Atoms(File *file) } MP4::Atoms::~Atoms() -{ -} += default; MP4::Atom * MP4::Atoms::find(const char *name1, const char *name2, const char *name3, const char *name4) diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp index cc335bda..8b21162d 100644 --- a/taglib/mpeg/id3v1/id3v1tag.cpp +++ b/taglib/mpeg/id3v1/id3v1tag.cpp @@ -63,13 +63,9 @@ public: // StringHandler implementation //////////////////////////////////////////////////////////////////////////////// -StringHandler::StringHandler() -{ -} +StringHandler::StringHandler() = default; -StringHandler::~StringHandler() -{ -} +StringHandler::~StringHandler() = default; String ID3v1::StringHandler::parse(const ByteVector &data) const { diff --git a/taglib/mpeg/id3v2/id3v2footer.cpp b/taglib/mpeg/id3v2/id3v2footer.cpp index 2d1ec7d0..78f7ea94 100644 --- a/taglib/mpeg/id3v2/id3v2footer.cpp +++ b/taglib/mpeg/id3v2/id3v2footer.cpp @@ -38,9 +38,7 @@ Footer::Footer() : { } -Footer::~Footer() -{ -} +Footer::~Footer() = default; unsigned int Footer::size() { diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp index f78af096..4a631d51 100644 --- a/taglib/mpeg/id3v2/id3v2tag.cpp +++ b/taglib/mpeg/id3v2/id3v2tag.cpp @@ -102,13 +102,9 @@ public: // StringHandler implementation //////////////////////////////////////////////////////////////////////////////// -Latin1StringHandler::Latin1StringHandler() -{ -} +Latin1StringHandler::Latin1StringHandler() = default; -Latin1StringHandler::~Latin1StringHandler() -{ -} +Latin1StringHandler::~Latin1StringHandler() = default; String Latin1StringHandler::parse(const ByteVector &data) const { diff --git a/taglib/riff/wav/infotag.cpp b/taglib/riff/wav/infotag.cpp index 1f834090..a82b4ca6 100644 --- a/taglib/riff/wav/infotag.cpp +++ b/taglib/riff/wav/infotag.cpp @@ -48,13 +48,9 @@ public: // StringHandler implementation //////////////////////////////////////////////////////////////////////////////// -StringHandler::StringHandler() -{ -} +StringHandler::StringHandler() = default; -StringHandler::~StringHandler() -{ -} +StringHandler::~StringHandler() = default; String RIFF::Info::StringHandler::parse(const ByteVector &data) const { diff --git a/taglib/tag.cpp b/taglib/tag.cpp index c7f32f34..75ff178b 100644 --- a/taglib/tag.cpp +++ b/taglib/tag.cpp @@ -34,15 +34,9 @@ class Tag::TagPrivate }; -Tag::Tag() -{ +Tag::Tag() = default; -} - -Tag::~Tag() -{ - -} +Tag::~Tag() = default; bool Tag::isEmpty() const { diff --git a/taglib/toolkit/tbytevectorlist.cpp b/taglib/toolkit/tbytevectorlist.cpp index 26c1610a..218f55b1 100644 --- a/taglib/toolkit/tbytevectorlist.cpp +++ b/taglib/toolkit/tbytevectorlist.cpp @@ -64,20 +64,14 @@ ByteVectorList ByteVectorList::split(const ByteVector &v, const ByteVector &patt // public members //////////////////////////////////////////////////////////////////////////////// -ByteVectorList::ByteVectorList() -{ - -} +ByteVectorList::ByteVectorList() = default; ByteVectorList::ByteVectorList(const ByteVectorList &l) : List(l) { } -ByteVectorList::~ByteVectorList() -{ - -} +ByteVectorList::~ByteVectorList() = default; ByteVector ByteVectorList::toByteVector(const ByteVector &separator) const { diff --git a/taglib/toolkit/tdebuglistener.cpp b/taglib/toolkit/tdebuglistener.cpp index bc89ab9e..eb4a15a0 100644 --- a/taglib/toolkit/tdebuglistener.cpp +++ b/taglib/toolkit/tdebuglistener.cpp @@ -56,7 +56,7 @@ namespace std::cerr << msg; -#endif +#endif } }; @@ -67,13 +67,9 @@ namespace TagLib { DebugListener *debugListener = &defaultListener; - DebugListener::DebugListener() - { - } + DebugListener::DebugListener() = default; - DebugListener::~DebugListener() - { - } + DebugListener::~DebugListener() = default; void setDebugListener(DebugListener *listener) { diff --git a/taglib/toolkit/tiostream.cpp b/taglib/toolkit/tiostream.cpp index 3bc3cc5b..0a918793 100644 --- a/taglib/toolkit/tiostream.cpp +++ b/taglib/toolkit/tiostream.cpp @@ -85,13 +85,9 @@ String FileName::toString() const // public members //////////////////////////////////////////////////////////////////////////////// -IOStream::IOStream() -{ -} +IOStream::IOStream() = default; -IOStream::~IOStream() -{ -} +IOStream::~IOStream() = default; void IOStream::clear() { diff --git a/taglib/toolkit/tpropertymap.cpp b/taglib/toolkit/tpropertymap.cpp index e6fef3d4..da7a9cf2 100644 --- a/taglib/toolkit/tpropertymap.cpp +++ b/taglib/toolkit/tpropertymap.cpp @@ -28,13 +28,9 @@ using namespace TagLib; -PropertyMap::PropertyMap() -{ -} +PropertyMap::PropertyMap() = default; -PropertyMap::PropertyMap(const PropertyMap &m) : SimplePropertyMap(m), unsupported(m.unsupported) -{ -} +PropertyMap::PropertyMap(const PropertyMap &m) = default; PropertyMap::PropertyMap(const SimplePropertyMap &m) { @@ -47,9 +43,7 @@ PropertyMap::PropertyMap(const SimplePropertyMap &m) } } -PropertyMap::~PropertyMap() -{ -} +PropertyMap::~PropertyMap() = default; bool PropertyMap::insert(const String &key, const StringList &values) { diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp index 6d50a2a1..1f75207d 100644 --- a/taglib/toolkit/tstring.cpp +++ b/taglib/toolkit/tstring.cpp @@ -140,8 +140,7 @@ namespace TagLib { class String::StringPrivate : public RefCounter { public: - StringPrivate() - {} + StringPrivate() = default; /*! * Stores string in UTF-16. The byte order depends on the CPU endian. diff --git a/taglib/toolkit/tstringlist.cpp b/taglib/toolkit/tstringlist.cpp index 436fb913..bd9b5914 100644 --- a/taglib/toolkit/tstringlist.cpp +++ b/taglib/toolkit/tstringlist.cpp @@ -55,10 +55,7 @@ StringList StringList::split(const String &s, const String &pattern) // public members //////////////////////////////////////////////////////////////////////////////// -StringList::StringList() -{ - -} +StringList::StringList() = default; StringList::StringList(const StringList &l) : List(l) { @@ -78,9 +75,7 @@ StringList::StringList(const ByteVectorList &bl, String::Type t) } StringList::~StringList() -{ - -} += default; String StringList::toString(const String &separator) const { diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp index 66c4052e..b8ca6037 100644 --- a/taglib/xm/xmfile.cpp +++ b/taglib/xm/xmfile.cpp @@ -70,9 +70,7 @@ namespace class Reader { public: - virtual ~Reader() - { - } + virtual ~Reader() = default; /*! * Reads associated values from \a file, but never reads more