From de51307de71d510356d1f845f1d5c37a55c1cdb1 Mon Sep 17 00:00:00 2001 From: Michael Helmling Date: Wed, 15 Feb 2012 21:54:19 +0100 Subject: [PATCH] Added lots of missing includes --- taglib/ape/apefile.cpp | 1 + taglib/ape/apetag.cpp | 3 ++- taglib/flac/flacfile.cpp | 1 + taglib/it/itfile.cpp | 1 + taglib/mod/modfile.cpp | 1 + taglib/mod/modtag.cpp | 2 ++ taglib/mpc/mpcfile.cpp | 1 + taglib/riff/aiff/aifffile.cpp | 1 + taglib/riff/wav/wavfile.cpp | 1 + taglib/s3m/s3mfile.cpp | 1 + taglib/tag.cpp | 2 ++ taglib/toolkit/tfile.cpp | 1 + taglib/toolkit/tpropertymap.cpp | 2 +- taglib/trueaudio/trueaudiofile.cpp | 1 + taglib/wavpack/wavpackfile.cpp | 1 + taglib/xm/xmfile.cpp | 1 + 16 files changed, 19 insertions(+), 2 deletions(-) diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp index 6e806415..c66b55a2 100644 --- a/taglib/ape/apefile.cpp +++ b/taglib/ape/apefile.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include "apefile.h" diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp index 5393d72d..8da91ac3 100644 --- a/taglib/ape/apetag.cpp +++ b/taglib/ape/apetag.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include "apetag.h" #include "apefooter.h" @@ -251,7 +252,7 @@ PropertyMap APE::Tag::setProperties(const PropertyMap &origProps) } } } - return PropertyMap; + return PropertyMap(); } APE::Footer *APE::Tag::footer() const diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp index 352ee27e..3ba096f4 100644 --- a/taglib/flac/flacfile.cpp +++ b/taglib/flac/flacfile.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp index 1c3474cb..dc03b60a 100644 --- a/taglib/it/itfile.cpp +++ b/taglib/it/itfile.cpp @@ -23,6 +23,7 @@ #include "itfile.h" #include "tdebug.h" #include "modfileprivate.h" +#include "tpropertymap.h" using namespace TagLib; using namespace IT; diff --git a/taglib/mod/modfile.cpp b/taglib/mod/modfile.cpp index a05c2137..25fc8715 100644 --- a/taglib/mod/modfile.cpp +++ b/taglib/mod/modfile.cpp @@ -23,6 +23,7 @@ #include "tstringlist.h" #include "tdebug.h" #include "modfileprivate.h" +#include "tpropertymap.h" using namespace TagLib; using namespace Mod; diff --git a/taglib/mod/modtag.cpp b/taglib/mod/modtag.cpp index aaa2f16a..fe6a374c 100644 --- a/taglib/mod/modtag.cpp +++ b/taglib/mod/modtag.cpp @@ -21,6 +21,8 @@ #include "modtag.h" #include "tstringlist.h" +#include "tpropertymap.h" + using namespace TagLib; using namespace Mod; diff --git a/taglib/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp index 6b372a60..ca9471ae 100644 --- a/taglib/mpc/mpcfile.cpp +++ b/taglib/mpc/mpcfile.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "mpcfile.h" #include "id3v1tag.h" diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp index bc2a8569..ece84f05 100644 --- a/taglib/riff/aiff/aifffile.cpp +++ b/taglib/riff/aiff/aifffile.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "aifffile.h" diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp index afc307d8..613db4ef 100644 --- a/taglib/riff/wav/wavfile.cpp +++ b/taglib/riff/wav/wavfile.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "wavfile.h" diff --git a/taglib/s3m/s3mfile.cpp b/taglib/s3m/s3mfile.cpp index cf8a7b61..98bc6a56 100644 --- a/taglib/s3m/s3mfile.cpp +++ b/taglib/s3m/s3mfile.cpp @@ -23,6 +23,7 @@ #include "tstringlist.h" #include "tdebug.h" #include "modfileprivate.h" +#include "tpropertymap.h" #include diff --git a/taglib/tag.cpp b/taglib/tag.cpp index 3cebd134..67634081 100644 --- a/taglib/tag.cpp +++ b/taglib/tag.cpp @@ -25,6 +25,8 @@ #include "tag.h" #include "tstringlist.h" +#include "tpropertymap.h" + using namespace TagLib; class Tag::TagPrivate diff --git a/taglib/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp index 639bc0ec..56a8e19c 100644 --- a/taglib/toolkit/tfile.cpp +++ b/taglib/toolkit/tfile.cpp @@ -27,6 +27,7 @@ #include "tfilestream.h" #include "tstring.h" #include "tdebug.h" +#include "tpropertymap.h" #include #include diff --git a/taglib/toolkit/tpropertymap.cpp b/taglib/toolkit/tpropertymap.cpp index fc71181f..4868f2d0 100644 --- a/taglib/toolkit/tpropertymap.cpp +++ b/taglib/toolkit/tpropertymap.cpp @@ -146,7 +146,7 @@ const StringList &PropertyMap::unsupportedData() const return unsupported; } -static String PropertyMap::prepareKey(const String &proposed) { +String PropertyMap::prepareKey(const String &proposed) { if(proposed.isEmpty()) return String::null; for (String::ConstIterator it = proposed.begin(); it != proposed.end(); it++) diff --git a/taglib/trueaudio/trueaudiofile.cpp b/taglib/trueaudio/trueaudiofile.cpp index 346331df..f45c6545 100644 --- a/taglib/trueaudio/trueaudiofile.cpp +++ b/taglib/trueaudio/trueaudiofile.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include "trueaudiofile.h" #include "id3v1tag.h" diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp index bc0f607a..285d8ef4 100644 --- a/taglib/wavpack/wavpackfile.cpp +++ b/taglib/wavpack/wavpackfile.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include "wavpackfile.h" #include "id3v1tag.h" diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp index d4225c45..272e5fe0 100644 --- a/taglib/xm/xmfile.cpp +++ b/taglib/xm/xmfile.cpp @@ -23,6 +23,7 @@ #include "tdebug.h" #include "xmfile.h" #include "modfileprivate.h" +#include "tpropertymap.h" #include #include