Fix warning

Fix create HAVE_ZLIB variable

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@611286 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 5a8d9f1d5ff9e9039a2cb7f4b407402a430295bc..b8f19e84f722e011eb6951a2eba69636f8dbd7d3 100644 (file)
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -14,7 +14,7 @@ include(CheckCXXSourceCompiles)
 #check for libz using the cmake supplied FindZLIB.cmake
 
 IF(ZLIB_FOUND)
-       SET(HAVE_LIBZ 1)
+       SET(HAVE_ZLIB 1)
 ELSE(ZLIB_FOUND)
-       SET(HAVE_LIBZ 0)
+       SET(HAVE_ZLIB 0)
 ENDIF(ZLIB_FOUND)

diff --git a/config-taglib.h.cmake b/config-taglib.h.cmake
index a3439996723d7c5228caa7cc7d5aa240b963c0c0..cb35884fb687ed7da0199b16e3027194d4751100 100644 (file)
--- a/config-taglib.h.cmake
+++ b/config-taglib.h.cmake
@@ -4,4 +4,4 @@
    Otherwise please prefer adding to the relevant config-foo.h.cmake file,
    to minimize recompilations and increase modularity. */
 /* Define if you have libz */
-#cmakedefine   HAVE_LIBZ 1
+#cmakedefine   HAVE_ZLIB 1

diff --git a/taglib/fileref.h b/taglib/fileref.h
index fa435eb997ee65e0690ee6f240f0f6512c431fd6..5044c004d8f6d186ed2923a9082df704024f0cef 100644 (file)
--- a/taglib/fileref.h
+++ b/taglib/fileref.h
@@ -88,6 +88,7 @@ namespace TagLib {
     class FileTypeResolver
     {
     public:
+      virtual ~FileTypeResolver() {}
       /*!
        * This method must be overriden 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.h b/taglib/mpeg/id3v1/id3v1tag.h
index 0b238bddfb1d4d021fb1635a52b0b99ac28367ef..8aa3b71c01d4df36ef69cf43e272f268ce30a2c1 100644 (file)
--- a/taglib/mpeg/id3v1/id3v1tag.h
+++ b/taglib/mpeg/id3v1/id3v1tag.h
@@ -55,6 +55,7 @@ namespace TagLib {
     class StringHandler
     {
     public:
+      virtual ~StringHandler(){}
       /*!
        * Decode a string from \a data.  The default implementation assumes that
        * \a data is an ISO-8859-1 (Latin1) character array.