From ab1939b8fbdc0f84af5993d0058738e8e536f4d0 Mon Sep 17 00:00:00 2001 From: Kevin Krammer Date: Wed, 29 Aug 2007 23:33:30 +0000 Subject: [PATCH] Unfix compiler warning. Compiler warnings good, BIC changes bad. Make it a bit more obvious for the next poor fellow git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@706333 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- taglib/fileref.cpp | 4 ---- taglib/fileref.h | 7 +++---- taglib/mpeg/id3v1/id3v1tag.cpp | 4 ---- taglib/mpeg/id3v1/id3v1tag.h | 4 +++- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp index 0b0a49a3..afc19796 100644 --- a/taglib/fileref.cpp +++ b/taglib/fileref.cpp @@ -48,10 +48,6 @@ List FileRef::FileRefPrivate::fileTypeResolve // public members //////////////////////////////////////////////////////////////////////////////// -FileRef::FileTypeResolver::~FileTypeResolver() -{ -} - FileRef::FileRef() { d = new FileRefPrivate(0); diff --git a/taglib/fileref.h b/taglib/fileref.h index b4f1c46e..774d8f90 100644 --- a/taglib/fileref.h +++ b/taglib/fileref.h @@ -89,10 +89,9 @@ namespace TagLib { class FileTypeResolver { public: - /*! - * Destroys this FileTypeResolver instance. - */ - virtual ~FileTypeResolver(); + // do not fix compiler warning about missing virtual destructor + // since this would not be binary compatible + // let Scott fix it whenever he thinks BIC changes can next be applied /*! * This method must be overridden to provide an additional file type * resolver. If the resolver is able to determine the file type it should diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp index b336a484..f6fb501e 100644 --- a/taglib/mpeg/id3v1/id3v1tag.cpp +++ b/taglib/mpeg/id3v1/id3v1tag.cpp @@ -53,10 +53,6 @@ const ID3v1::StringHandler *ID3v1::Tag::TagPrivate::stringHandler = new StringHa // StringHandler implementation //////////////////////////////////////////////////////////////////////////////// -ID3v1::StringHandler::~StringHandler() -{ -} - String ID3v1::StringHandler::parse(const ByteVector &data) const { return String(data, String::Latin1).stripWhiteSpace(); diff --git a/taglib/mpeg/id3v1/id3v1tag.h b/taglib/mpeg/id3v1/id3v1tag.h index baef325b..a0ef6bb4 100644 --- a/taglib/mpeg/id3v1/id3v1tag.h +++ b/taglib/mpeg/id3v1/id3v1tag.h @@ -56,10 +56,12 @@ namespace TagLib { class StringHandler { public: + // do not fix compiler warning about missing virtual destructor + // since this would not be binary compatible + // let Scott fix it whenever he thinks BIC changes can next be applied /*! * Destroys this StringHandler instance. */ - virtual ~StringHandler(); /*! * Decode a string from \a data. The default implementation assumes that * \a data is an ISO-8859-1 (Latin1) character array.