From 1661093521047f1021eed896144c645ebdee11d9 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Fri, 17 Jun 2022 02:06:53 -0700 Subject: [PATCH] [TagLib] Completely overhaul import paths Change most, if not all, possible import paths to use the full header directory paths instead of relative or "assume include paths" settings. This should fix building with the CI. Signed-off-by: Christopher Snowhill --- .../TagLib/taglib/taglib/ape/apefile.cpp | 22 ++++---- Frameworks/TagLib/taglib/taglib/ape/apefile.h | 6 +-- .../TagLib/taglib/taglib/ape/apefooter.cpp | 6 +-- .../TagLib/taglib/taglib/ape/apefooter.h | 4 +- .../TagLib/taglib/taglib/ape/apegenfile.cpp | 22 ++++---- .../TagLib/taglib/taglib/ape/apegenfile.h | 6 +-- .../TagLib/taglib/taglib/ape/apeitem.cpp | 6 +-- Frameworks/TagLib/taglib/taglib/ape/apeitem.h | 6 +-- .../taglib/taglib/ape/apeproperties.cpp | 14 +++--- .../TagLib/taglib/taglib/ape/apeproperties.h | 4 +- .../TagLib/taglib/taglib/ape/apetag.cpp | 18 +++---- Frameworks/TagLib/taglib/taglib/ape/apetag.h | 12 ++--- .../TagLib/taglib/taglib/asf/asfattribute.cpp | 12 ++--- .../TagLib/taglib/taglib/asf/asfattribute.h | 8 +-- .../TagLib/taglib/taglib/asf/asffile.cpp | 18 +++---- Frameworks/TagLib/taglib/taglib/asf/asffile.h | 10 ++-- .../TagLib/taglib/taglib/asf/asfpicture.cpp | 14 +++--- .../TagLib/taglib/taglib/asf/asfpicture.h | 8 +-- .../taglib/taglib/asf/asfproperties.cpp | 6 +-- .../TagLib/taglib/taglib/asf/asfproperties.h | 6 +-- .../TagLib/taglib/taglib/asf/asftag.cpp | 4 +- Frameworks/TagLib/taglib/taglib/asf/asftag.h | 10 ++-- .../TagLib/taglib/taglib/audioproperties.cpp | 30 +++++------ .../TagLib/taglib/taglib/audioproperties.h | 2 +- Frameworks/TagLib/taglib/taglib/fileref.cpp | 50 +++++++++---------- Frameworks/TagLib/taglib/taglib/fileref.h | 8 +-- .../TagLib/taglib/taglib/flac/flacfile.cpp | 30 +++++------ .../TagLib/taglib/taglib/flac/flacfile.h | 12 ++--- .../taglib/taglib/flac/flacmetadatablock.cpp | 6 +-- .../taglib/taglib/flac/flacmetadatablock.h | 4 +- .../TagLib/taglib/taglib/flac/flacpicture.cpp | 6 +-- .../TagLib/taglib/taglib/flac/flacpicture.h | 8 +-- .../taglib/taglib/flac/flacproperties.cpp | 8 +-- .../taglib/taglib/flac/flacproperties.h | 4 +- .../taglib/flac/flacunknownmetadatablock.cpp | 8 +-- .../taglib/flac/flacunknownmetadatablock.h | 8 +-- Frameworks/TagLib/taglib/taglib/it/itfile.cpp | 10 ++-- .../TagLib/taglib/taglib/it/itproperties.cpp | 2 +- .../TagLib/taglib/taglib/mod/modfile.cpp | 10 ++-- Frameworks/TagLib/taglib/taglib/mod/modfile.h | 12 ++--- .../TagLib/taglib/taglib/mod/modfilebase.cpp | 4 +- .../TagLib/taglib/taglib/mod/modfilebase.h | 10 ++-- .../taglib/taglib/mod/modproperties.cpp | 2 +- .../TagLib/taglib/taglib/mod/modproperties.h | 4 +- .../TagLib/taglib/taglib/mod/modtag.cpp | 6 +-- Frameworks/TagLib/taglib/taglib/mod/modtag.h | 2 +- .../TagLib/taglib/taglib/mp4/mp4atom.cpp | 6 +-- Frameworks/TagLib/taglib/taglib/mp4/mp4atom.h | 4 +- .../TagLib/taglib/taglib/mp4/mp4coverart.cpp | 8 +-- .../TagLib/taglib/taglib/mp4/mp4coverart.h | 8 +-- .../TagLib/taglib/taglib/mp4/mp4file.cpp | 14 +++--- Frameworks/TagLib/taglib/taglib/mp4/mp4file.h | 10 ++-- .../TagLib/taglib/taglib/mp4/mp4item.cpp | 8 +-- Frameworks/TagLib/taglib/taglib/mp4/mp4item.h | 6 +-- .../taglib/taglib/mp4/mp4properties.cpp | 10 ++-- .../TagLib/taglib/taglib/mp4/mp4properties.h | 4 +- .../TagLib/taglib/taglib/mp4/mp4tag.cpp | 12 ++--- Frameworks/TagLib/taglib/taglib/mp4/mp4tag.h | 16 +++--- .../TagLib/taglib/taglib/mpc/mpcfile.cpp | 22 ++++---- Frameworks/TagLib/taglib/taglib/mpc/mpcfile.h | 10 ++-- .../taglib/taglib/mpc/mpcproperties.cpp | 8 +-- .../taglib/taglib/mpeg/id3v1/id3v1genres.cpp | 2 +- .../taglib/taglib/mpeg/id3v1/id3v1genres.h | 6 +-- .../taglib/taglib/mpeg/id3v1/id3v1tag.cpp | 8 +-- .../taglib/taglib/mpeg/id3v1/id3v1tag.h | 6 +-- .../id3v2/frames/attachedpictureframe.cpp | 6 +-- .../mpeg/id3v2/frames/attachedpictureframe.h | 6 +-- .../taglib/mpeg/id3v2/frames/chapterframe.cpp | 8 +-- .../taglib/mpeg/id3v2/frames/chapterframe.h | 6 +-- .../mpeg/id3v2/frames/commentsframe.cpp | 12 ++--- .../taglib/mpeg/id3v2/frames/commentsframe.h | 4 +- .../id3v2/frames/eventtimingcodesframe.cpp | 10 ++-- .../mpeg/id3v2/frames/eventtimingcodesframe.h | 4 +- .../frames/generalencapsulatedobjectframe.cpp | 6 +-- .../frames/generalencapsulatedobjectframe.h | 6 +-- .../mpeg/id3v2/frames/ownershipframe.cpp | 8 +-- .../taglib/mpeg/id3v2/frames/ownershipframe.h | 4 +- .../taglib/mpeg/id3v2/frames/podcastframe.cpp | 4 +- .../taglib/mpeg/id3v2/frames/podcastframe.h | 4 +- .../mpeg/id3v2/frames/popularimeterframe.cpp | 4 +- .../mpeg/id3v2/frames/popularimeterframe.h | 4 +- .../taglib/mpeg/id3v2/frames/privateframe.cpp | 8 +-- .../taglib/mpeg/id3v2/frames/privateframe.h | 4 +- .../mpeg/id3v2/frames/relativevolumeframe.cpp | 6 +-- .../mpeg/id3v2/frames/relativevolumeframe.h | 6 +-- .../id3v2/frames/synchronizedlyricsframe.cpp | 10 ++-- .../id3v2/frames/synchronizedlyricsframe.h | 4 +- .../id3v2/frames/tableofcontentsframe.cpp | 8 +-- .../mpeg/id3v2/frames/tableofcontentsframe.h | 6 +-- .../id3v2/frames/textidentificationframe.cpp | 10 ++-- .../id3v2/frames/textidentificationframe.h | 8 +-- .../frames/uniquefileidentifierframe.cpp | 10 ++-- .../id3v2/frames/uniquefileidentifierframe.h | 2 +- .../taglib/mpeg/id3v2/frames/unknownframe.cpp | 2 +- .../taglib/mpeg/id3v2/frames/unknownframe.h | 4 +- .../frames/unsynchronizedlyricsframe.cpp | 10 ++-- .../id3v2/frames/unsynchronizedlyricsframe.h | 2 +- .../taglib/mpeg/id3v2/frames/urllinkframe.cpp | 10 ++-- .../taglib/mpeg/id3v2/frames/urllinkframe.h | 2 +- .../taglib/mpeg/id3v2/id3v2extendedheader.cpp | 4 +- .../taglib/mpeg/id3v2/id3v2extendedheader.h | 6 +-- .../taglib/taglib/mpeg/id3v2/id3v2footer.cpp | 4 +- .../taglib/taglib/mpeg/id3v2/id3v2footer.h | 4 +- .../taglib/taglib/mpeg/id3v2/id3v2frame.cpp | 28 +++++------ .../taglib/taglib/mpeg/id3v2/id3v2frame.h | 6 +-- .../taglib/mpeg/id3v2/id3v2framefactory.cpp | 44 ++++++++-------- .../taglib/mpeg/id3v2/id3v2framefactory.h | 8 +-- .../taglib/taglib/mpeg/id3v2/id3v2header.cpp | 10 ++-- .../taglib/taglib/mpeg/id3v2/id3v2header.h | 6 +-- .../taglib/mpeg/id3v2/id3v2synchdata.cpp | 2 +- .../taglib/taglib/mpeg/id3v2/id3v2synchdata.h | 4 +- .../taglib/taglib/mpeg/id3v2/id3v2tag.cpp | 32 ++++++------ .../taglib/taglib/mpeg/id3v2/id3v2tag.h | 16 +++--- .../TagLib/taglib/taglib/mpeg/mpegfile.cpp | 24 ++++----- .../TagLib/taglib/taglib/mpeg/mpegfile.h | 10 ++-- .../TagLib/taglib/taglib/mpeg/mpegheader.cpp | 14 +++--- .../TagLib/taglib/taglib/mpeg/mpegheader.h | 2 +- .../taglib/taglib/mpeg/mpegproperties.cpp | 14 +++--- .../taglib/taglib/mpeg/mpegproperties.h | 6 +-- .../TagLib/taglib/taglib/mpeg/xingheader.cpp | 10 ++-- .../TagLib/taglib/taglib/mpeg/xingheader.h | 4 +- .../taglib/taglib/ogg/flac/oggflacfile.cpp | 14 +++--- .../taglib/taglib/ogg/flac/oggflacfile.h | 8 +-- .../TagLib/taglib/taglib/ogg/oggfile.cpp | 14 +++--- Frameworks/TagLib/taglib/taglib/ogg/oggfile.h | 4 +- .../TagLib/taglib/taglib/ogg/oggpage.cpp | 10 ++-- Frameworks/TagLib/taglib/taglib/ogg/oggpage.h | 4 +- .../taglib/taglib/ogg/oggpageheader.cpp | 10 ++-- .../TagLib/taglib/taglib/ogg/oggpageheader.h | 6 +-- .../taglib/taglib/ogg/opus/opusfile.cpp | 10 ++-- .../TagLib/taglib/taglib/ogg/opus/opusfile.h | 6 +-- .../taglib/taglib/ogg/opus/opusproperties.cpp | 10 ++-- .../taglib/taglib/ogg/opus/opusproperties.h | 2 +- .../taglib/taglib/ogg/speex/speexfile.cpp | 10 ++-- .../taglib/taglib/ogg/speex/speexfile.h | 6 +-- .../taglib/ogg/speex/speexproperties.cpp | 10 ++-- .../taglib/taglib/ogg/speex/speexproperties.h | 2 +- .../taglib/taglib/ogg/vorbis/vorbisfile.cpp | 10 ++-- .../taglib/taglib/ogg/vorbis/vorbisfile.h | 6 +-- .../taglib/ogg/vorbis/vorbisproperties.cpp | 10 ++-- .../TagLib/taglib/taglib/ogg/xiphcomment.cpp | 10 ++-- .../TagLib/taglib/taglib/ogg/xiphcomment.h | 12 ++--- .../taglib/taglib/riff/aiff/aifffile.cpp | 14 +++--- .../TagLib/taglib/taglib/riff/aiff/aifffile.h | 6 +-- .../taglib/riff/aiff/aiffproperties.cpp | 8 +-- .../taglib/taglib/riff/aiff/aiffproperties.h | 2 +- .../TagLib/taglib/taglib/riff/rifffile.cpp | 10 ++-- .../TagLib/taglib/taglib/riff/rifffile.h | 4 +- .../TagLib/taglib/taglib/riff/wav/infotag.cpp | 8 +-- .../TagLib/taglib/taglib/riff/wav/infotag.h | 12 ++--- .../TagLib/taglib/taglib/riff/wav/wavfile.cpp | 18 +++---- .../TagLib/taglib/taglib/riff/wav/wavfile.h | 8 +-- .../taglib/taglib/riff/wav/wavproperties.cpp | 6 +-- .../taglib/taglib/riff/wav/wavproperties.h | 4 +- .../TagLib/taglib/taglib/s3m/s3mfile.cpp | 10 ++-- Frameworks/TagLib/taglib/taglib/s3m/s3mfile.h | 12 ++--- .../taglib/taglib/s3m/s3mproperties.cpp | 2 +- .../TagLib/taglib/taglib/s3m/s3mproperties.h | 4 +- Frameworks/TagLib/taglib/taglib/tag.cpp | 6 +-- Frameworks/TagLib/taglib/taglib/tag.h | 4 +- Frameworks/TagLib/taglib/taglib/tagunion.cpp | 16 +++--- Frameworks/TagLib/taglib/taglib/tagunion.h | 2 +- Frameworks/TagLib/taglib/taglib/tagutils.cpp | 10 ++-- Frameworks/TagLib/taglib/taglib/tagutils.h | 2 +- .../taglib/taglib/toolkit/tbytevector.cpp | 10 ++-- .../taglib/taglib/toolkit/tbytevector.h | 4 +- .../taglib/taglib/toolkit/tbytevectorlist.cpp | 2 +- .../taglib/taglib/toolkit/tbytevectorlist.h | 6 +-- .../taglib/toolkit/tbytevectorstream.cpp | 6 +-- .../taglib/taglib/toolkit/tbytevectorstream.h | 8 +-- .../TagLib/taglib/taglib/toolkit/tdebug.cpp | 10 ++-- .../taglib/taglib/toolkit/tdebuglistener.cpp | 2 +- .../taglib/taglib/toolkit/tdebuglistener.h | 4 +- .../TagLib/taglib/taglib/toolkit/tfile.cpp | 49 +++++++++--------- .../TagLib/taglib/taglib/toolkit/tfile.h | 10 ++-- .../taglib/taglib/toolkit/tfilestream.cpp | 6 +-- .../taglib/taglib/toolkit/tfilestream.h | 8 +-- .../taglib/taglib/toolkit/tiostream.cpp | 2 +- .../TagLib/taglib/taglib/toolkit/tiostream.h | 6 +-- .../TagLib/taglib/taglib/toolkit/tlist.h | 4 +- .../TagLib/taglib/taglib/toolkit/tlist.tcc | 2 +- .../TagLib/taglib/taglib/toolkit/tmap.h | 4 +- .../TagLib/taglib/taglib/toolkit/tmap.tcc | 2 +- .../taglib/taglib/toolkit/tpropertymap.cpp | 2 +- .../taglib/taglib/toolkit/tpropertymap.h | 4 +- .../taglib/taglib/toolkit/trefcounter.cpp | 4 +- .../taglib/taglib/toolkit/trefcounter.h | 2 +- .../TagLib/taglib/taglib/toolkit/tstring.cpp | 10 ++-- .../TagLib/taglib/taglib/toolkit/tstring.h | 6 +-- .../taglib/taglib/toolkit/tstringlist.cpp | 2 +- .../taglib/taglib/toolkit/tstringlist.h | 8 +-- .../TagLib/taglib/taglib/toolkit/tutils.h | 2 +- .../TagLib/taglib/taglib/toolkit/tzlib.cpp | 2 +- .../TagLib/taglib/taglib/toolkit/tzlib.h | 2 +- .../taglib/taglib/trueaudio/trueaudiofile.cpp | 26 +++++----- .../taglib/taglib/trueaudio/trueaudiofile.h | 4 +- .../taglib/trueaudio/trueaudioproperties.cpp | 8 +-- .../taglib/trueaudio/trueaudioproperties.h | 2 +- .../taglib/taglib/wavpack/wavpackfile.cpp | 22 ++++---- .../taglib/taglib/wavpack/wavpackfile.h | 6 +-- .../taglib/wavpack/wavpackproperties.cpp | 8 +-- .../taglib/taglib/wavpack/wavpackproperties.h | 4 +- Frameworks/TagLib/taglib/taglib/xm/xmfile.cpp | 10 ++-- Frameworks/TagLib/taglib/taglib/xm/xmfile.h | 12 ++--- .../TagLib/taglib/taglib/xm/xmproperties.cpp | 2 +- .../TagLib/taglib/taglib/xm/xmproperties.h | 6 +-- .../TagLib/TagLib.xcodeproj/project.pbxproj | 4 +- 207 files changed, 873 insertions(+), 874 deletions(-) diff --git a/Frameworks/TagLib/taglib/taglib/ape/apefile.cpp b/Frameworks/TagLib/taglib/taglib/ape/apefile.cpp index a10c1f646..9c9320f91 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apefile.cpp +++ b/Frameworks/TagLib/taglib/taglib/ape/apefile.cpp @@ -31,18 +31,18 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "apefile.h" -#include "apetag.h" -#include "apefooter.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/ape/apefile.h b/Frameworks/TagLib/taglib/taglib/ape/apefile.h index 267778bae..1331e537b 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apefile.h +++ b/Frameworks/TagLib/taglib/taglib/ape/apefile.h @@ -34,9 +34,9 @@ #ifndef TAGLIB_APEFILE_H #define TAGLIB_APEFILE_H -#include "tfile.h" -#include "taglib_export.h" -#include "apeproperties.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ape/apefooter.cpp b/Frameworks/TagLib/taglib/taglib/ape/apefooter.cpp index c5c99a5a4..6ca8809b9 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apefooter.cpp +++ b/Frameworks/TagLib/taglib/taglib/ape/apefooter.cpp @@ -27,10 +27,10 @@ #include #include -#include -#include +#include +#include -#include "apefooter.h" +#include using namespace TagLib; using namespace APE; diff --git a/Frameworks/TagLib/taglib/taglib/ape/apefooter.h b/Frameworks/TagLib/taglib/taglib/ape/apefooter.h index 47741d0dc..c637d46b0 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apefooter.h +++ b/Frameworks/TagLib/taglib/taglib/ape/apefooter.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_APEFOOTER_H #define TAGLIB_APEFOOTER_H -#include "tbytevector.h" -#include "taglib_export.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ape/apegenfile.cpp b/Frameworks/TagLib/taglib/taglib/ape/apegenfile.cpp index b47282ed5..fc7e4e2c9 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apegenfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/ape/apegenfile.cpp @@ -31,18 +31,18 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "apegenfile.h" -#include "apetag.h" -#include "apefooter.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/ape/apegenfile.h b/Frameworks/TagLib/taglib/taglib/ape/apegenfile.h index 5f2262e12..4bcbdde0c 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apegenfile.h +++ b/Frameworks/TagLib/taglib/taglib/ape/apegenfile.h @@ -34,9 +34,9 @@ #ifndef TAGLIB_APEGENFILE_H #define TAGLIB_APEGENFILE_H -#include "tfile.h" -#include "taglib_export.h" -#include "apeproperties.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ape/apeitem.cpp b/Frameworks/TagLib/taglib/taglib/ape/apeitem.cpp index 45f22da47..37c5033fe 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apeitem.cpp +++ b/Frameworks/TagLib/taglib/taglib/ape/apeitem.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include "apeitem.h" +#include using namespace TagLib; using namespace APE; diff --git a/Frameworks/TagLib/taglib/taglib/ape/apeitem.h b/Frameworks/TagLib/taglib/taglib/ape/apeitem.h index cfd157c35..32e670355 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apeitem.h +++ b/Frameworks/TagLib/taglib/taglib/ape/apeitem.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_APEITEM_H #define TAGLIB_APEITEM_H -#include "tbytevector.h" -#include "tstring.h" -#include "tstringlist.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ape/apeproperties.cpp b/Frameworks/TagLib/taglib/taglib/ape/apeproperties.cpp index dee7e8c05..3ea18f28f 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apeproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/ape/apeproperties.cpp @@ -27,14 +27,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include #include -#include "id3v2tag.h" -#include "apeproperties.h" -#include "apefile.h" -#include "apetag.h" -#include "apefooter.h" +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/ape/apeproperties.h b/Frameworks/TagLib/taglib/taglib/ape/apeproperties.h index ebbf949bd..bf330025c 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apeproperties.h +++ b/Frameworks/TagLib/taglib/taglib/ape/apeproperties.h @@ -30,8 +30,8 @@ #ifndef TAGLIB_APEPROPERTIES_H #define TAGLIB_APEPROPERTIES_H -#include "taglib_export.h" -#include "audioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ape/apetag.cpp b/Frameworks/TagLib/taglib/taglib/ape/apetag.cpp index 3e3f4a2e1..0d4d575eb 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apetag.cpp +++ b/Frameworks/TagLib/taglib/taglib/ape/apetag.cpp @@ -31,16 +31,16 @@ #define WANT_CLASS_INSTANTIATION_OF_MAP (1) #endif -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include "apetag.h" -#include "apefooter.h" -#include "apeitem.h" +#include +#include +#include using namespace TagLib; using namespace APE; diff --git a/Frameworks/TagLib/taglib/taglib/ape/apetag.h b/Frameworks/TagLib/taglib/taglib/ape/apetag.h index bf892b0c6..293cff1da 100644 --- a/Frameworks/TagLib/taglib/taglib/ape/apetag.h +++ b/Frameworks/TagLib/taglib/taglib/ape/apetag.h @@ -26,13 +26,13 @@ #ifndef TAGLIB_APETAG_H #define TAGLIB_APETAG_H -#include "tag.h" -#include "tbytevector.h" -#include "tmap.h" -#include "tstring.h" -#include "taglib_export.h" +#include +#include +#include +#include +#include -#include "apeitem.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/asf/asfattribute.cpp b/Frameworks/TagLib/taglib/taglib/asf/asfattribute.cpp index 6faf7973b..034c81fbb 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asfattribute.cpp +++ b/Frameworks/TagLib/taglib/taglib/asf/asfattribute.cpp @@ -23,13 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include +#include +#include +#include -#include "asfattribute.h" -#include "asffile.h" -#include "asfutils.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/asf/asfattribute.h b/Frameworks/TagLib/taglib/taglib/asf/asfattribute.h index 1738eb459..8d446a58a 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asfattribute.h +++ b/Frameworks/TagLib/taglib/taglib/asf/asfattribute.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_ASFATTRIBUTE_H #define TAGLIB_ASFATTRIBUTE_H -#include "tstring.h" -#include "tbytevector.h" -#include "taglib_export.h" -#include "asfpicture.h" +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/asf/asffile.cpp b/Frameworks/TagLib/taglib/taglib/asf/asffile.cpp index fd754803d..8120cfa39 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asffile.cpp +++ b/Frameworks/TagLib/taglib/taglib/asf/asffile.cpp @@ -23,16 +23,16 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include "asffile.h" -#include "asftag.h" -#include "asfproperties.h" -#include "asfutils.h" +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/asf/asffile.h b/Frameworks/TagLib/taglib/taglib/asf/asffile.h index 05cf4ee2a..0b2e3dda0 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asffile.h +++ b/Frameworks/TagLib/taglib/taglib/asf/asffile.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_ASFFILE_H #define TAGLIB_ASFFILE_H -#include "tag.h" -#include "tfile.h" -#include "taglib_export.h" -#include "asfproperties.h" -#include "asftag.h" +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/asf/asfpicture.cpp b/Frameworks/TagLib/taglib/taglib/asf/asfpicture.cpp index 7039fb15f..6cada46a4 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asfpicture.cpp +++ b/Frameworks/TagLib/taglib/taglib/asf/asfpicture.cpp @@ -23,14 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include +#include +#include +#include -#include "asfattribute.h" -#include "asffile.h" -#include "asfpicture.h" -#include "asfutils.h" +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/asf/asfpicture.h b/Frameworks/TagLib/taglib/taglib/asf/asfpicture.h index 17233ba90..2ca2d50e6 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asfpicture.h +++ b/Frameworks/TagLib/taglib/taglib/asf/asfpicture.h @@ -26,10 +26,10 @@ #ifndef ASFPICTURE_H #define ASFPICTURE_H -#include "tstring.h" -#include "tbytevector.h" -#include "taglib_export.h" -#include "attachedpictureframe.h" +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/asf/asfproperties.cpp b/Frameworks/TagLib/taglib/taglib/asf/asfproperties.cpp index a836da30b..c2e725f01 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asfproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/asf/asfproperties.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include "asfproperties.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/asf/asfproperties.h b/Frameworks/TagLib/taglib/taglib/asf/asfproperties.h index 317bf104f..236b13938 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asfproperties.h +++ b/Frameworks/TagLib/taglib/taglib/asf/asfproperties.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ASFPROPERTIES_H #define TAGLIB_ASFPROPERTIES_H -#include "audioproperties.h" -#include "tstring.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/asf/asftag.cpp b/Frameworks/TagLib/taglib/taglib/asf/asftag.cpp index fdf7e56cc..fd3d7e673 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asftag.cpp +++ b/Frameworks/TagLib/taglib/taglib/asf/asftag.cpp @@ -23,8 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include "asftag.h" +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/asf/asftag.h b/Frameworks/TagLib/taglib/taglib/asf/asftag.h index b11c130dc..6fd3715b2 100644 --- a/Frameworks/TagLib/taglib/taglib/asf/asftag.h +++ b/Frameworks/TagLib/taglib/taglib/asf/asftag.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_ASFTAG_H #define TAGLIB_ASFTAG_H -#include "tag.h" -#include "tlist.h" -#include "tmap.h" -#include "taglib_export.h" -#include "asfattribute.h" +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/audioproperties.cpp b/Frameworks/TagLib/taglib/taglib/audioproperties.cpp index c29051a64..30e66251e 100644 --- a/Frameworks/TagLib/taglib/taglib/audioproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/audioproperties.cpp @@ -23,23 +23,23 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include +#include -#include "aiffproperties.h" -#include "apeproperties.h" -#include "asfproperties.h" -#include "flacproperties.h" -#include "mp4properties.h" -#include "mpcproperties.h" -#include "mpegproperties.h" -#include "opusproperties.h" -#include "speexproperties.h" -#include "trueaudioproperties.h" -#include "vorbisproperties.h" -#include "wavproperties.h" -#include "wavpackproperties.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "audioproperties.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/audioproperties.h b/Frameworks/TagLib/taglib/taglib/audioproperties.h index f27aefca8..8b1053259 100644 --- a/Frameworks/TagLib/taglib/taglib/audioproperties.h +++ b/Frameworks/TagLib/taglib/taglib/audioproperties.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_AUDIOPROPERTIES_H #define TAGLIB_AUDIOPROPERTIES_H -#include "taglib_export.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/fileref.cpp b/Frameworks/TagLib/taglib/taglib/fileref.cpp index dace6f0a4..8332f1bdf 100644 --- a/Frameworks/TagLib/taglib/taglib/fileref.cpp +++ b/Frameworks/TagLib/taglib/taglib/fileref.cpp @@ -29,32 +29,32 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include "fileref.h" -#include "asffile.h" -#include "mpegfile.h" -#include "vorbisfile.h" -#include "flacfile.h" -#include "oggflacfile.h" -#include "mpcfile.h" -#include "mp4file.h" -#include "wavpackfile.h" -#include "speexfile.h" -#include "opusfile.h" -#include "trueaudiofile.h" -#include "aifffile.h" -#include "wavfile.h" -#include "apefile.h" -#include "apegenfile.h" -#include "modfile.h" -#include "s3mfile.h" -#include "itfile.h" -#include "xmfile.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/fileref.h b/Frameworks/TagLib/taglib/taglib/fileref.h index c36f54cbd..d8ca670a7 100644 --- a/Frameworks/TagLib/taglib/taglib/fileref.h +++ b/Frameworks/TagLib/taglib/taglib/fileref.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_FILEREF_H #define TAGLIB_FILEREF_H -#include "tfile.h" -#include "tstringlist.h" +#include +#include -#include "taglib_export.h" -#include "audioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacfile.cpp b/Frameworks/TagLib/taglib/taglib/flac/flacfile.cpp index ada215db1..ce7d4c5cc 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/flac/flacfile.cpp @@ -23,23 +23,23 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include "flacpicture.h" -#include "flacfile.h" -#include "flacmetadatablock.h" -#include "flacunknownmetadatablock.h" +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacfile.h b/Frameworks/TagLib/taglib/taglib/flac/flacfile.h index 1b8654ebd..f57f1d232 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacfile.h +++ b/Frameworks/TagLib/taglib/taglib/flac/flacfile.h @@ -26,13 +26,13 @@ #ifndef TAGLIB_FLACFILE_H #define TAGLIB_FLACFILE_H -#include "taglib_export.h" -#include "tfile.h" -#include "tlist.h" -#include "tag.h" +#include +#include +#include +#include -#include "flacpicture.h" -#include "flacproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.cpp b/Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.cpp index 17ab05f37..47ab5f897 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.cpp +++ b/Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include "flacmetadatablock.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.h b/Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.h index 1570b4ac5..d4d5ab98b 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.h +++ b/Frameworks/TagLib/taglib/taglib/flac/flacmetadatablock.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_FLACMETADATABLOCK_H #define TAGLIB_FLACMETADATABLOCK_H -#include -#include +#include +#include #include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacpicture.cpp b/Frameworks/TagLib/taglib/taglib/flac/flacpicture.cpp index ec07ad140..0761fc0c8 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacpicture.cpp +++ b/Frameworks/TagLib/taglib/taglib/flac/flacpicture.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include "flacpicture.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacpicture.h b/Frameworks/TagLib/taglib/taglib/flac/flacpicture.h index 270480d3e..7aa536403 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacpicture.h +++ b/Frameworks/TagLib/taglib/taglib/flac/flacpicture.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_FLACPICTURE_H #define TAGLIB_FLACPICTURE_H -#include -#include -#include +#include +#include +#include #include -#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacproperties.cpp b/Frameworks/TagLib/taglib/taglib/flac/flacproperties.cpp index b947f039b..331c7adeb 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/flac/flacproperties.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include "flacproperties.h" -#include "flacfile.h" +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacproperties.h b/Frameworks/TagLib/taglib/taglib/flac/flacproperties.h index 743e58722..db6c3ca70 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacproperties.h +++ b/Frameworks/TagLib/taglib/taglib/flac/flacproperties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_FLACPROPERTIES_H #define TAGLIB_FLACPROPERTIES_H -#include "taglib_export.h" -#include "audioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.cpp b/Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.cpp index f9cf6e658..57444e502 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.cpp +++ b/Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include "flacunknownmetadatablock.h" +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.h b/Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.h index 3030254e3..09139d772 100644 --- a/Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.h +++ b/Frameworks/TagLib/taglib/taglib/flac/flacunknownmetadatablock.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_FLACUNKNOWNMETADATABLOCK_H #define TAGLIB_FLACUNKNOWNMETADATABLOCK_H -#include "tlist.h" -#include "tbytevector.h" -#include "taglib_export.h" -#include "flacmetadatablock.h" +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/it/itfile.cpp b/Frameworks/TagLib/taglib/taglib/it/itfile.cpp index 3b35f0d8b..63b3b517d 100644 --- a/Frameworks/TagLib/taglib/taglib/it/itfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/it/itfile.cpp @@ -24,11 +24,11 @@ ***************************************************************************/ -#include "tstringlist.h" -#include "itfile.h" -#include "tdebug.h" -#include "modfileprivate.h" -#include "tpropertymap.h" +#include +#include +#include +#include +#include using namespace TagLib; using namespace IT; diff --git a/Frameworks/TagLib/taglib/taglib/it/itproperties.cpp b/Frameworks/TagLib/taglib/taglib/it/itproperties.cpp index c317b660e..4e0f4b1a6 100644 --- a/Frameworks/TagLib/taglib/taglib/it/itproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/it/itproperties.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ -#include "itproperties.h" +#include using namespace TagLib; using namespace IT; diff --git a/Frameworks/TagLib/taglib/taglib/mod/modfile.cpp b/Frameworks/TagLib/taglib/taglib/mod/modfile.cpp index 00d330ebd..cf034ac33 100644 --- a/Frameworks/TagLib/taglib/taglib/mod/modfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/mod/modfile.cpp @@ -24,11 +24,11 @@ ***************************************************************************/ -#include "modfile.h" -#include "tstringlist.h" -#include "tdebug.h" -#include "modfileprivate.h" -#include "tpropertymap.h" +#include +#include +#include +#include +#include using namespace TagLib; using namespace Mod; diff --git a/Frameworks/TagLib/taglib/taglib/mod/modfile.h b/Frameworks/TagLib/taglib/taglib/mod/modfile.h index b66452d79..1608d343a 100644 --- a/Frameworks/TagLib/taglib/taglib/mod/modfile.h +++ b/Frameworks/TagLib/taglib/taglib/mod/modfile.h @@ -26,12 +26,12 @@ #ifndef TAGLIB_MODFILE_H #define TAGLIB_MODFILE_H -#include "tfile.h" -#include "audioproperties.h" -#include "taglib_export.h" -#include "modfilebase.h" -#include "modtag.h" -#include "modproperties.h" +#include +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mod/modfilebase.cpp b/Frameworks/TagLib/taglib/taglib/mod/modfilebase.cpp index 142f669ff..edb25c606 100644 --- a/Frameworks/TagLib/taglib/taglib/mod/modfilebase.cpp +++ b/Frameworks/TagLib/taglib/taglib/mod/modfilebase.cpp @@ -24,8 +24,8 @@ ***************************************************************************/ -#include "tdebug.h" -#include "modfilebase.h" +#include +#include using namespace TagLib; using namespace Mod; diff --git a/Frameworks/TagLib/taglib/taglib/mod/modfilebase.h b/Frameworks/TagLib/taglib/taglib/mod/modfilebase.h index bae97167c..2bb516a45 100644 --- a/Frameworks/TagLib/taglib/taglib/mod/modfilebase.h +++ b/Frameworks/TagLib/taglib/taglib/mod/modfilebase.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_MODFILEBASE_H #define TAGLIB_MODFILEBASE_H -#include "taglib.h" -#include "tfile.h" -#include "tstring.h" -#include "tlist.h" -#include "taglib_export.h" +#include +#include +#include +#include +#include #include diff --git a/Frameworks/TagLib/taglib/taglib/mod/modproperties.cpp b/Frameworks/TagLib/taglib/taglib/mod/modproperties.cpp index c6bf39475..fca1813d7 100644 --- a/Frameworks/TagLib/taglib/taglib/mod/modproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/mod/modproperties.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ -#include "modproperties.h" +#include using namespace TagLib; using namespace Mod; diff --git a/Frameworks/TagLib/taglib/taglib/mod/modproperties.h b/Frameworks/TagLib/taglib/taglib/mod/modproperties.h index 471229431..591796848 100644 --- a/Frameworks/TagLib/taglib/taglib/mod/modproperties.h +++ b/Frameworks/TagLib/taglib/taglib/mod/modproperties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_MODPROPERTIES_H #define TAGLIB_MODPROPERTIES_H -#include "taglib.h" -#include "audioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mod/modtag.cpp b/Frameworks/TagLib/taglib/taglib/mod/modtag.cpp index 68bed9228..be8ae3cda 100644 --- a/Frameworks/TagLib/taglib/taglib/mod/modtag.cpp +++ b/Frameworks/TagLib/taglib/taglib/mod/modtag.cpp @@ -24,9 +24,9 @@ ***************************************************************************/ -#include "modtag.h" -#include "tstringlist.h" -#include "tpropertymap.h" +#include +#include +#include using namespace TagLib; using namespace Mod; diff --git a/Frameworks/TagLib/taglib/taglib/mod/modtag.h b/Frameworks/TagLib/taglib/taglib/mod/modtag.h index d65713e60..f6842902c 100644 --- a/Frameworks/TagLib/taglib/taglib/mod/modtag.h +++ b/Frameworks/TagLib/taglib/taglib/mod/modtag.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_MODTAG_H #define TAGLIB_MODTAG_H -#include "tag.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4atom.cpp b/Frameworks/TagLib/taglib/taglib/mp4/mp4atom.cpp index 20709212e..e0f7dd44d 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4atom.cpp +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4atom.cpp @@ -25,9 +25,9 @@ #include -#include -#include -#include "mp4atom.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4atom.h b/Frameworks/TagLib/taglib/taglib/mp4/mp4atom.h index cbb0d10ad..dd4981498 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4atom.h +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4atom.h @@ -30,8 +30,8 @@ #ifndef TAGLIB_MP4ATOM_H #define TAGLIB_MP4ATOM_H -#include "tfile.h" -#include "tlist.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.cpp b/Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.cpp index 69c9e685e..9fc11eb19 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.cpp +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include "trefcounter.h" -#include "mp4coverart.h" +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.h b/Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.h index ebfb3f949..e7f122683 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.h +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4coverart.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_MP4COVERART_H #define TAGLIB_MP4COVERART_H -#include "tlist.h" -#include "tbytevector.h" -#include "taglib_export.h" -#include "mp4atom.h" +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4file.cpp b/Frameworks/TagLib/taglib/taglib/mp4/mp4file.cpp index 5ad8396de..831e21e7f 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4file.cpp +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4file.cpp @@ -23,14 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include -#include "mp4atom.h" -#include "mp4tag.h" -#include "mp4file.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4file.h b/Frameworks/TagLib/taglib/taglib/mp4/mp4file.h index 8a46d17df..5e1d72f24 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4file.h +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4file.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_MP4FILE_H #define TAGLIB_MP4FILE_H -#include "tag.h" -#include "tfile.h" -#include "taglib_export.h" -#include "mp4properties.h" -#include "mp4tag.h" +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4item.cpp b/Frameworks/TagLib/taglib/taglib/mp4/mp4item.cpp index 787ed457c..cf5c9f047 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4item.cpp +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4item.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include "trefcounter.h" -#include "mp4item.h" +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4item.h b/Frameworks/TagLib/taglib/taglib/mp4/mp4item.h index 3821135bd..f6d2e4096 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4item.h +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4item.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_MP4ITEM_H #define TAGLIB_MP4ITEM_H -#include "tstringlist.h" -#include "mp4coverart.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4properties.cpp b/Frameworks/TagLib/taglib/taglib/mp4/mp4properties.cpp index 6c6976fab..85a3e1f4e 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4properties.cpp +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4properties.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include "mp4file.h" -#include "mp4atom.h" -#include "mp4properties.h" +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4properties.h b/Frameworks/TagLib/taglib/taglib/mp4/mp4properties.h index 492a48cce..a13e1b21d 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4properties.h +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4properties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_MP4PROPERTIES_H #define TAGLIB_MP4PROPERTIES_H -#include "taglib_export.h" -#include "audioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4tag.cpp b/Frameworks/TagLib/taglib/taglib/mp4/mp4tag.cpp index 13efe7ff8..729845fdc 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4tag.cpp +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4tag.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include "mp4atom.h" -#include "mp4tag.h" -#include "id3v1genres.h" +#include +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mp4/mp4tag.h b/Frameworks/TagLib/taglib/taglib/mp4/mp4tag.h index 7384a8ce9..71423ff36 100644 --- a/Frameworks/TagLib/taglib/taglib/mp4/mp4tag.h +++ b/Frameworks/TagLib/taglib/taglib/mp4/mp4tag.h @@ -26,14 +26,14 @@ #ifndef TAGLIB_MP4TAG_H #define TAGLIB_MP4TAG_H -#include "tag.h" -#include "tbytevectorlist.h" -#include "tfile.h" -#include "tmap.h" -#include "tstringlist.h" -#include "taglib_export.h" -#include "mp4atom.h" -#include "mp4item.h" +#include +#include +#include +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpc/mpcfile.cpp b/Frameworks/TagLib/taglib/taglib/mpc/mpcfile.cpp index 0ffaf8933..279fc3ac3 100644 --- a/Frameworks/TagLib/taglib/taglib/mpc/mpcfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpc/mpcfile.cpp @@ -23,18 +23,18 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include "mpcfile.h" -#include "id3v1tag.h" -#include "id3v2header.h" -#include "apetag.h" -#include "apefooter.h" +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mpc/mpcfile.h b/Frameworks/TagLib/taglib/taglib/mpc/mpcfile.h index eb3ec54a2..cffb60153 100644 --- a/Frameworks/TagLib/taglib/taglib/mpc/mpcfile.h +++ b/Frameworks/TagLib/taglib/taglib/mpc/mpcfile.h @@ -26,13 +26,13 @@ #ifndef TAGLIB_MPCFILE_H #define TAGLIB_MPCFILE_H -#include "taglib_export.h" -#include "tfile.h" -#include "tag.h" +#include +#include +#include -#include "mpcproperties.h" +#include -#include "tlist.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpc/mpcproperties.cpp b/Frameworks/TagLib/taglib/taglib/mpc/mpcproperties.cpp index 21de6d495..2bee5e812 100644 --- a/Frameworks/TagLib/taglib/taglib/mpc/mpcproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpc/mpcproperties.cpp @@ -23,13 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include #include #include -#include "mpcproperties.h" -#include "mpcfile.h" +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.cpp index d72a2a75d..7463100e7 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.cpp @@ -23,7 +23,7 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "id3v1genres.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.h index 0a0dd9700..d4e20d8f9 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1genres.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ID3V1GENRE_H #define TAGLIB_ID3V1GENRE_H -#include "tmap.h" -#include "tstringlist.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { namespace ID3v1 { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.cpp index 87f816b28..693b3875a 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include "id3v1tag.h" -#include "id3v1genres.h" +#include +#include using namespace TagLib; using namespace ID3v1; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.h index c57314fa8..831047f8c 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v1/id3v1tag.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ID3V1TAG_H #define TAGLIB_ID3V1TAG_H -#include "tag.h" -#include "tbytevector.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp index 8e2630cef..e1ad21b29 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "attachedpictureframe.h" +#include -#include -#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.h index 55067bd2d..7deb16dff 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/attachedpictureframe.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ATTACHEDPICTUREFRAME_H #define TAGLIB_ATTACHEDPICTUREFRAME_H -#include "id3v2frame.h" -#include "id3v2header.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.cpp index 049f947d8..e3fdfa8ea 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include +#include +#include +#include #include -#include "chapterframe.h" +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.h index 0eaa140f2..d897c4dd7 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/chapterframe.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_CHAPTERFRAME #define TAGLIB_CHAPTERFRAME -#include "id3v2tag.h" -#include "id3v2frame.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.cpp index 815e5e1a1..9b8b1e4af 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.cpp @@ -23,13 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include -#include "commentsframe.h" -#include "tpropertymap.h" +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.h index 4da9d5357..db0d6d3f4 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/commentsframe.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_COMMENTSFRAME_H #define TAGLIB_COMMENTSFRAME_H -#include "id3v2frame.h" -#include "taglib_export.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp index 930318123..f2c766204 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "eventtimingcodesframe.h" -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h index 3dcedb9eb..bc3b68b75 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_EVENTTIMINGCODESFRAME_H #define TAGLIB_EVENTTIMINGCODESFRAME_H -#include "id3v2frame.h" -#include "tlist.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp index c9b2f6dc4..9541b5b0a 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp @@ -26,10 +26,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include "generalencapsulatedobjectframe.h" +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h index 769dfb025..609d80782 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h @@ -29,9 +29,9 @@ #ifndef TAGLIB_GENERALENCAPSULATEDOBJECT_H #define TAGLIB_GENERALENCAPSULATEDOBJECT_H -#include "id3v2frame.h" -#include "id3v2header.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.cpp index 0b180dbf6..1ae40ea0a 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include +#include +#include +#include -#include "ownershipframe.h" +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.h index 06a1e2336..8553de916 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/ownershipframe.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_OWNERSHIPFRAME_H #define TAGLIB_OWNERSHIPFRAME_H -#include "id3v2frame.h" -#include "taglib_export.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.cpp index 7dfe471d1..207b29d27 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.cpp @@ -23,8 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "podcastframe.h" -#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.h index a71278c3f..c8991711a 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/podcastframe.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_PODCASTFRAME_H #define TAGLIB_PODCASTFRAME_H -#include "id3v2frame.h" -#include "taglib_export.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.cpp index 9106fabd5..2c2d1a46c 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include +#include -#include "popularimeterframe.h" +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.h index 405ca69e8..9e0f8bcdf 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/popularimeterframe.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_POPULARIMETERFRAME_H #define TAGLIB_POPULARIMETERFRAME_H -#include "id3v2frame.h" -#include "taglib_export.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.cpp index 4f55a3ca9..3baa4729c 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.cpp @@ -24,11 +24,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include +#include +#include +#include -#include "privateframe.h" +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.h index 06f82f32e..b8bc9a481 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/privateframe.h @@ -27,8 +27,8 @@ #ifndef TAGLIB_PRIVATEFRAME_H #define TAGLIB_PRIVATEFRAME_H -#include "id3v2frame.h" -#include "taglib_export.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp index 3398ada82..9e4e3d285 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include "relativevolumeframe.h" +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.h index 55f13fcee..77b1f8534 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/relativevolumeframe.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_RELATIVEVOLUMEFRAME_H #define TAGLIB_RELATIVEVOLUMEFRAME_H -#include "tlist.h" -#include "id3v2frame.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp index 6a62bb495..e51cee2ca 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "synchronizedlyricsframe.h" -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h index f520c5938..bd52cb433 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_SYNCHRONIZEDLYRICSFRAME_H #define TAGLIB_SYNCHRONIZEDLYRICSFRAME_H -#include "id3v2frame.h" -#include "tlist.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp index 36016c71e..1e875fee6 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include +#include +#include +#include -#include "tableofcontentsframe.h" +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.h index 2e5401e8a..3fdfb70f7 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/tableofcontentsframe.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_TABLEOFCONTENTSFRAME #define TAGLIB_TABLEOFCONTENTSFRAME -#include "id3v2tag.h" -#include "id3v2frame.h" +#include +#include -#include "tbytevectorlist.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.cpp index 39019e611..d6b791f78 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include "textidentificationframe.h" -#include "tpropertymap.h" -#include "id3v1genres.h" +#include +#include +#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.h index e49aa897b..b20fe0699 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/textidentificationframe.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_TEXTIDENTIFICATIONFRAME_H #define TAGLIB_TEXTIDENTIFICATIONFRAME_H -#include "tstringlist.h" -#include "tmap.h" -#include "taglib_export.h" +#include +#include +#include -#include "id3v2frame.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp index fcb855b2e..ce6458248 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include +#include +#include +#include -#include "id3v2tag.h" -#include "uniquefileidentifierframe.h" +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h index decf1b0d9..35499693d 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_UNIQUEFILEIDENTIFIERFRAME #define TAGLIB_UNIQUEFILEIDENTIFIERFRAME -#include "id3v2frame.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.cpp index edb30084a..2d27cbd2b 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.cpp @@ -23,7 +23,7 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "unknownframe.h" +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.h index 6559f4ed2..0512720df 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unknownframe.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_UNKNOWNFRAME_H #define TAGLIB_UNKNOWNFRAME_H -#include "id3v2frame.h" -#include "taglib_export.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp index eafae171c..4f33987ec 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp @@ -26,11 +26,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "unsynchronizedlyricsframe.h" -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h index dad67c7a3..c6873800d 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h @@ -28,7 +28,7 @@ #ifndef TAGLIB_UNSYNCHRONIZEDLYRICSFRAME_H #define TAGLIB_UNSYNCHRONIZEDLYRICSFRAME_H -#include "id3v2frame.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.cpp index 543b5184d..84ba9f8c7 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.cpp @@ -26,11 +26,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "urllinkframe.h" -#include "id3v2tag.h" -#include -#include -#include +#include +#include +#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.h index d9ac1093b..6124f7144 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/frames/urllinkframe.h @@ -29,7 +29,7 @@ #ifndef TAGLIB_URLLINKFRAME_H #define TAGLIB_URLLINKFRAME_H -#include "id3v2frame.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2extendedheader.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2extendedheader.cpp index 86eeee280..e005457a7 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2extendedheader.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2extendedheader.cpp @@ -23,8 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "id3v2extendedheader.h" -#include "id3v2synchdata.h" +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2extendedheader.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2extendedheader.h index 646623386..1c59573a7 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2extendedheader.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2extendedheader.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ID3V2EXTENDEDHEADER_H #define TAGLIB_ID3V2EXTENDEDHEADER_H -#include "taglib_export.h" -#include "tbytevector.h" -#include "taglib.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2footer.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2footer.cpp index 3622724a8..5ed739586 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2footer.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2footer.cpp @@ -23,8 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "id3v2footer.h" -#include "id3v2header.h" +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2footer.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2footer.h index 5eb380074..50e271888 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2footer.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2footer.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_ID3V2FOOTER_H #define TAGLIB_ID3V2FOOTER_H -#include "taglib_export.h" -#include "tbytevector.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2frame.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2frame.cpp index 81f351efd..5fdde9451 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2frame.cpp @@ -25,22 +25,22 @@ #include -#include -#include -#include +#include +#include +#include -#include "id3v2tag.h" -#include "id3v2frame.h" -#include "id3v2synchdata.h" +#include +#include +#include -#include "tpropertymap.h" -#include "frames/textidentificationframe.h" -#include "frames/urllinkframe.h" -#include "frames/unsynchronizedlyricsframe.h" -#include "frames/commentsframe.h" -#include "frames/uniquefileidentifierframe.h" -#include "frames/unknownframe.h" -#include "frames/podcastframe.h" +#include +#include +#include +#include +#include +#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2frame.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2frame.h index b14f6f422..01b29ed40 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2frame.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2frame.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ID3V2FRAME_H #define TAGLIB_ID3V2FRAME_H -#include "tstring.h" -#include "tbytevector.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp index cc276d448..6166757d5 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -23,30 +23,30 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include "id3v2framefactory.h" -#include "id3v2synchdata.h" -#include "id3v1genres.h" +#include +#include +#include -#include "frames/attachedpictureframe.h" -#include "frames/commentsframe.h" -#include "frames/relativevolumeframe.h" -#include "frames/textidentificationframe.h" -#include "frames/uniquefileidentifierframe.h" -#include "frames/unknownframe.h" -#include "frames/generalencapsulatedobjectframe.h" -#include "frames/urllinkframe.h" -#include "frames/unsynchronizedlyricsframe.h" -#include "frames/popularimeterframe.h" -#include "frames/privateframe.h" -#include "frames/ownershipframe.h" -#include "frames/synchronizedlyricsframe.h" -#include "frames/eventtimingcodesframe.h" -#include "frames/chapterframe.h" -#include "frames/tableofcontentsframe.h" -#include "frames/podcastframe.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2framefactory.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2framefactory.h index 9605c7885..ddd2ef5f6 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2framefactory.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2framefactory.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_ID3V2FRAMEFACTORY_H #define TAGLIB_ID3V2FRAMEFACTORY_H -#include "taglib_export.h" -#include "tbytevector.h" -#include "id3v2frame.h" -#include "id3v2header.h" +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2header.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2header.cpp index da4aba0a1..14ed05e01 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2header.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2header.cpp @@ -26,12 +26,12 @@ #include #include -#include -#include +#include +#include -#include "id3v2header.h" -#include "id3v2footer.h" -#include "id3v2synchdata.h" +#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2header.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2header.h index a1f2985e4..9e04153d2 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2header.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2header.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ID3V2HEADER_H #define TAGLIB_ID3V2HEADER_H -#include "tbytevector.h" -#include "taglib_export.h" -#include "id3v2.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2synchdata.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2synchdata.cpp index 2aa999993..981880b25 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2synchdata.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2synchdata.cpp @@ -25,7 +25,7 @@ #include -#include "id3v2synchdata.h" +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2synchdata.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2synchdata.h index 13e07161b..bf0765047 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2synchdata.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2synchdata.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_ID3V2SYNCHDATA_H #define TAGLIB_ID3V2SYNCHDATA_H -#include "tbytevector.h" -#include "taglib.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2tag.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2tag.cpp index 5eaa2d0dd..7bd21523e 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2tag.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2tag.cpp @@ -25,24 +25,24 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "id3v2tag.h" -#include "id3v2header.h" -#include "id3v2extendedheader.h" -#include "id3v2footer.h" -#include "id3v2synchdata.h" -#include "id3v1genres.h" +#include +#include +#include +#include +#include +#include -#include "frames/textidentificationframe.h" -#include "frames/commentsframe.h" -#include "frames/urllinkframe.h" -#include "frames/uniquefileidentifierframe.h" -#include "frames/unsynchronizedlyricsframe.h" -#include "frames/unknownframe.h" +#include +#include +#include +#include +#include +#include using namespace TagLib; using namespace ID3v2; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2tag.h b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2tag.h index 4cdccccf8..a176dbdda 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2tag.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/id3v2/id3v2tag.h @@ -26,15 +26,15 @@ #ifndef TAGLIB_ID3V2TAG_H #define TAGLIB_ID3V2TAG_H -#include "tag.h" -#include "tbytevector.h" -#include "tstring.h" -#include "tlist.h" -#include "tmap.h" -#include "taglib_export.h" +#include +#include +#include +#include +#include +#include -#include "id3v2.h" -#include "id3v2framefactory.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/mpegfile.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/mpegfile.cpp index a2ce02a7c..f344d771f 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/mpegfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/mpegfile.cpp @@ -23,19 +23,19 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "mpegfile.h" -#include "mpegheader.h" -#include "mpegutils.h" -#include "tpropertymap.h" +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/mpegfile.h b/Frameworks/TagLib/taglib/taglib/mpeg/mpegfile.h index 3fcb72722..3d70439ad 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/mpegfile.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/mpegfile.h @@ -26,13 +26,13 @@ #ifndef TAGLIB_MPEGFILE_H #define TAGLIB_MPEGFILE_H -#include "taglib_export.h" -#include "tfile.h" -#include "tag.h" +#include +#include +#include -#include "mpegproperties.h" +#include -#include "id3v2.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/mpegheader.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/mpegheader.cpp index 5a5015d61..e88fe9c71 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/mpegheader.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/mpegheader.cpp @@ -23,14 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include "mpegheader.h" -#include "mpegutils.h" +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/mpegheader.h b/Frameworks/TagLib/taglib/taglib/mpeg/mpegheader.h index ca51184cf..072dd5a0d 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/mpegheader.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/mpegheader.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_MPEGHEADER_H #define TAGLIB_MPEGHEADER_H -#include "taglib_export.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/mpegproperties.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/mpegproperties.cpp index 5eec84f7d..0c5f6a8a9 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/mpegproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/mpegproperties.cpp @@ -23,14 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include "mpegproperties.h" -#include "mpegfile.h" -#include "xingheader.h" -#include "apetag.h" -#include "apefooter.h" +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/mpegproperties.h b/Frameworks/TagLib/taglib/taglib/mpeg/mpegproperties.h index a1a1af4af..b16b690bf 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/mpegproperties.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/mpegproperties.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_MPEGPROPERTIES_H #define TAGLIB_MPEGPROPERTIES_H -#include "taglib_export.h" -#include "audioproperties.h" +#include +#include -#include "mpegheader.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/xingheader.cpp b/Frameworks/TagLib/taglib/taglib/mpeg/xingheader.cpp index 6c2b25dc5..56d4ad063 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/xingheader.cpp +++ b/Frameworks/TagLib/taglib/taglib/mpeg/xingheader.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include +#include +#include +#include -#include "xingheader.h" -#include "mpegfile.h" +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/mpeg/xingheader.h b/Frameworks/TagLib/taglib/taglib/mpeg/xingheader.h index ce7561909..db7b1b2f7 100644 --- a/Frameworks/TagLib/taglib/taglib/mpeg/xingheader.h +++ b/Frameworks/TagLib/taglib/taglib/mpeg/xingheader.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_XINGHEADER_H #define TAGLIB_XINGHEADER_H -#include "mpegheader.h" -#include "taglib_export.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/flac/oggflacfile.cpp b/Frameworks/TagLib/taglib/taglib/ogg/flac/oggflacfile.cpp index 07ea9dccc..5c56d96cc 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/flac/oggflacfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/flac/oggflacfile.cpp @@ -23,14 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include "oggflacfile.h" +#include +#include using namespace TagLib; using TagLib::FLAC::Properties; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/flac/oggflacfile.h b/Frameworks/TagLib/taglib/taglib/ogg/flac/oggflacfile.h index b2686e457..f40b4d0d2 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/flac/oggflacfile.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/flac/oggflacfile.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_OGGFLACFILE_H #define TAGLIB_OGGFLACFILE_H -#include "taglib_export.h" -#include "oggfile.h" -#include "xiphcomment.h" +#include +#include +#include -#include "flacproperties.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/oggfile.cpp b/Frameworks/TagLib/taglib/taglib/ogg/oggfile.cpp index c36e4d46c..0d2f929ba 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/oggfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/oggfile.cpp @@ -23,14 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include -#include "oggfile.h" -#include "oggpage.h" -#include "oggpageheader.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/oggfile.h b/Frameworks/TagLib/taglib/taglib/ogg/oggfile.h index 5076dcbfe..0ea9b5ccc 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/oggfile.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/oggfile.h @@ -24,8 +24,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #ifndef TAGLIB_OGGFILE_H #define TAGLIB_OGGFILE_H diff --git a/Frameworks/TagLib/taglib/taglib/ogg/oggpage.cpp b/Frameworks/TagLib/taglib/taglib/ogg/oggpage.cpp index 414d3d530..02a93ca68 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/oggpage.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/oggpage.cpp @@ -25,12 +25,12 @@ #include -#include -#include +#include +#include -#include "oggpage.h" -#include "oggpageheader.h" -#include "oggfile.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/oggpage.h b/Frameworks/TagLib/taglib/taglib/ogg/oggpage.h index af3fe2c9e..c900d78b2 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/oggpage.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/oggpage.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_OGGPAGE_H #define TAGLIB_OGGPAGE_H -#include "taglib_export.h" -#include "tbytevectorlist.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/oggpageheader.cpp b/Frameworks/TagLib/taglib/taglib/ogg/oggpageheader.cpp index b867567cb..bb4903c6e 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/oggpageheader.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/oggpageheader.cpp @@ -25,12 +25,12 @@ #include -#include -#include -#include +#include +#include +#include -#include "oggpageheader.h" -#include "oggfile.h" +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/oggpageheader.h b/Frameworks/TagLib/taglib/taglib/ogg/oggpageheader.h index 571155fca..0a3581134 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/oggpageheader.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/oggpageheader.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_OGGPAGEHEADER_H #define TAGLIB_OGGPAGEHEADER_H -#include "tlist.h" -#include "tbytevector.h" -#include "taglib_export.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/opus/opusfile.cpp b/Frameworks/TagLib/taglib/taglib/ogg/opus/opusfile.cpp index d4f191ad1..585dfd215 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/opus/opusfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/opus/opusfile.cpp @@ -27,12 +27,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include -#include "opusfile.h" +#include using namespace TagLib; using namespace TagLib::Ogg; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/opus/opusfile.h b/Frameworks/TagLib/taglib/taglib/ogg/opus/opusfile.h index 0e094eae8..02845e5b3 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/opus/opusfile.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/opus/opusfile.h @@ -30,10 +30,10 @@ #ifndef TAGLIB_OPUSFILE_H #define TAGLIB_OPUSFILE_H -#include "oggfile.h" -#include "xiphcomment.h" +#include +#include -#include "opusproperties.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/opus/opusproperties.cpp b/Frameworks/TagLib/taglib/taglib/ogg/opus/opusproperties.cpp index b60cc01d6..9a4419b29 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/opus/opusproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/opus/opusproperties.cpp @@ -27,13 +27,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include +#include -#include "opusproperties.h" -#include "opusfile.h" +#include +#include using namespace TagLib; using namespace TagLib::Ogg; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/opus/opusproperties.h b/Frameworks/TagLib/taglib/taglib/ogg/opus/opusproperties.h index 2e44dea5c..39b1b4e30 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/opus/opusproperties.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/opus/opusproperties.h @@ -30,7 +30,7 @@ #ifndef TAGLIB_OPUSPROPERTIES_H #define TAGLIB_OPUSPROPERTIES_H -#include "audioproperties.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/speex/speexfile.cpp b/Frameworks/TagLib/taglib/taglib/ogg/speex/speexfile.cpp index 394cb17be..18a05a23f 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/speex/speexfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/speex/speexfile.cpp @@ -27,12 +27,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include -#include "speexfile.h" +#include using namespace TagLib; using namespace TagLib::Ogg; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/speex/speexfile.h b/Frameworks/TagLib/taglib/taglib/ogg/speex/speexfile.h index 1be7113cb..8d5f2ea41 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/speex/speexfile.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/speex/speexfile.h @@ -30,10 +30,10 @@ #ifndef TAGLIB_SPEEXFILE_H #define TAGLIB_SPEEXFILE_H -#include "oggfile.h" -#include "xiphcomment.h" +#include +#include -#include "speexproperties.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/speex/speexproperties.cpp b/Frameworks/TagLib/taglib/taglib/ogg/speex/speexproperties.cpp index b7a11cc6e..079093116 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/speex/speexproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/speex/speexproperties.cpp @@ -27,13 +27,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include +#include -#include "speexproperties.h" -#include "speexfile.h" +#include +#include using namespace TagLib; using namespace TagLib::Ogg; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/speex/speexproperties.h b/Frameworks/TagLib/taglib/taglib/ogg/speex/speexproperties.h index 3f5a20f30..47ff5030a 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/speex/speexproperties.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/speex/speexproperties.h @@ -30,7 +30,7 @@ #ifndef TAGLIB_SPEEXPROPERTIES_H #define TAGLIB_SPEEXPROPERTIES_H -#include "audioproperties.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.cpp b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.cpp index b4f221ab1..f70e064ed 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.cpp @@ -25,12 +25,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "vorbisfile.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.h b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.h index 2615df5a5..922086ec4 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisfile.h @@ -27,10 +27,10 @@ #define TAGLIB_VORBISFILE_H #include -#include -#include +#include +#include -#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisproperties.cpp b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisproperties.cpp index 4000c254d..483f28ded 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/vorbis/vorbisproperties.cpp @@ -23,13 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include +#include -#include "vorbisproperties.h" -#include "vorbisfile.h" +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.cpp b/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.cpp index e371be314..c237cc1c1 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.cpp +++ b/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.h b/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.h index 335c68198..dec3c1b2f 100644 --- a/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.h +++ b/Frameworks/TagLib/taglib/taglib/ogg/xiphcomment.h @@ -27,12 +27,12 @@ #define TAGLIB_VORBISCOMMENT_H #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/riff/aiff/aifffile.cpp b/Frameworks/TagLib/taglib/taglib/riff/aiff/aifffile.cpp index 6ef4c9be5..7ede53809 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/aiff/aifffile.cpp +++ b/Frameworks/TagLib/taglib/taglib/riff/aiff/aifffile.cpp @@ -23,14 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include "aifffile.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/riff/aiff/aifffile.h b/Frameworks/TagLib/taglib/taglib/riff/aiff/aifffile.h index ceac5769e..9c3b7e338 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/aiff/aifffile.h +++ b/Frameworks/TagLib/taglib/taglib/riff/aiff/aifffile.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_AIFFFILE_H #define TAGLIB_AIFFFILE_H -#include "rifffile.h" -#include "id3v2tag.h" -#include "aiffproperties.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/riff/aiff/aiffproperties.cpp b/Frameworks/TagLib/taglib/taglib/riff/aiff/aiffproperties.cpp index e1d954feb..fb8293d7a 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/aiff/aiffproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/riff/aiff/aiffproperties.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include "aifffile.h" -#include "aiffproperties.h" +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/riff/aiff/aiffproperties.h b/Frameworks/TagLib/taglib/taglib/riff/aiff/aiffproperties.h index dbb4c2146..881f16cba 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/aiff/aiffproperties.h +++ b/Frameworks/TagLib/taglib/taglib/riff/aiff/aiffproperties.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_AIFFPROPERTIES_H #define TAGLIB_AIFFPROPERTIES_H -#include "audioproperties.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/riff/rifffile.cpp b/Frameworks/TagLib/taglib/taglib/riff/rifffile.cpp index 005551f49..b5f4bfb9f 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/rifffile.cpp +++ b/Frameworks/TagLib/taglib/taglib/riff/rifffile.cpp @@ -26,12 +26,12 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "rifffile.h" -#include "riffutils.h" +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/riff/rifffile.h b/Frameworks/TagLib/taglib/taglib/riff/rifffile.h index 5c606b4a7..48126f876 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/rifffile.h +++ b/Frameworks/TagLib/taglib/taglib/riff/rifffile.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_RIFFFILE_H #define TAGLIB_RIFFFILE_H -#include "taglib_export.h" -#include "tfile.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/riff/wav/infotag.cpp b/Frameworks/TagLib/taglib/taglib/riff/wav/infotag.cpp index 47009c9ab..0eac54c39 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/wav/infotag.cpp +++ b/Frameworks/TagLib/taglib/taglib/riff/wav/infotag.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include -#include "infotag.h" -#include "riffutils.h" +#include +#include using namespace TagLib; using namespace RIFF::Info; diff --git a/Frameworks/TagLib/taglib/taglib/riff/wav/infotag.h b/Frameworks/TagLib/taglib/taglib/riff/wav/infotag.h index b5e913377..857dcfc8e 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/wav/infotag.h +++ b/Frameworks/TagLib/taglib/taglib/riff/wav/infotag.h @@ -26,12 +26,12 @@ #ifndef TAGLIB_INFOTAG_H #define TAGLIB_INFOTAG_H -#include "tag.h" -#include "tmap.h" -#include "tstring.h" -#include "tstringlist.h" -#include "tbytevector.h" -#include "taglib_export.h" +#include +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/riff/wav/wavfile.cpp b/Frameworks/TagLib/taglib/taglib/riff/wav/wavfile.cpp index 3dce70b1c..4abc34b57 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/wav/wavfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/riff/wav/wavfile.cpp @@ -23,16 +23,16 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include "wavfile.h" -#include "id3v2tag.h" -#include "infotag.h" -#include "tagunion.h" +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/riff/wav/wavfile.h b/Frameworks/TagLib/taglib/taglib/riff/wav/wavfile.h index bc9ce3126..a308d19d5 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/wav/wavfile.h +++ b/Frameworks/TagLib/taglib/taglib/riff/wav/wavfile.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_WAVFILE_H #define TAGLIB_WAVFILE_H -#include "rifffile.h" -#include "id3v2tag.h" -#include "infotag.h" -#include "wavproperties.h" +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/riff/wav/wavproperties.cpp b/Frameworks/TagLib/taglib/taglib/riff/wav/wavproperties.cpp index 812da7d25..6e8170563 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/wav/wavproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/riff/wav/wavproperties.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include "wavfile.h" -#include "wavproperties.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/riff/wav/wavproperties.h b/Frameworks/TagLib/taglib/taglib/riff/wav/wavproperties.h index 1ca73100b..065ed257a 100644 --- a/Frameworks/TagLib/taglib/taglib/riff/wav/wavproperties.h +++ b/Frameworks/TagLib/taglib/taglib/riff/wav/wavproperties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_WAVPROPERTIES_H #define TAGLIB_WAVPROPERTIES_H -#include "taglib.h" -#include "audioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/s3m/s3mfile.cpp b/Frameworks/TagLib/taglib/taglib/s3m/s3mfile.cpp index b353f880a..9448bcfc3 100644 --- a/Frameworks/TagLib/taglib/taglib/s3m/s3mfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/s3m/s3mfile.cpp @@ -24,11 +24,11 @@ ***************************************************************************/ -#include "s3mfile.h" -#include "tstringlist.h" -#include "tdebug.h" -#include "modfileprivate.h" -#include "tpropertymap.h" +#include +#include +#include +#include +#include #include diff --git a/Frameworks/TagLib/taglib/taglib/s3m/s3mfile.h b/Frameworks/TagLib/taglib/taglib/s3m/s3mfile.h index 4011bd14a..46abe2a72 100644 --- a/Frameworks/TagLib/taglib/taglib/s3m/s3mfile.h +++ b/Frameworks/TagLib/taglib/taglib/s3m/s3mfile.h @@ -26,12 +26,12 @@ #ifndef TAGLIB_S3MFILE_H #define TAGLIB_S3MFILE_H -#include "tfile.h" -#include "audioproperties.h" -#include "taglib_export.h" -#include "modfilebase.h" -#include "modtag.h" -#include "s3mproperties.h" +#include +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/s3m/s3mproperties.cpp b/Frameworks/TagLib/taglib/taglib/s3m/s3mproperties.cpp index e3e443cb8..3404965a2 100644 --- a/Frameworks/TagLib/taglib/taglib/s3m/s3mproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/s3m/s3mproperties.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ -#include "s3mproperties.h" +#include using namespace TagLib; using namespace S3M; diff --git a/Frameworks/TagLib/taglib/taglib/s3m/s3mproperties.h b/Frameworks/TagLib/taglib/taglib/s3m/s3mproperties.h index 92b2a2746..b8a3332b9 100644 --- a/Frameworks/TagLib/taglib/taglib/s3m/s3mproperties.h +++ b/Frameworks/TagLib/taglib/taglib/s3m/s3mproperties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_S3MPROPERTIES_H #define TAGLIB_S3MPROPERTIES_H -#include "taglib.h" -#include "audioproperties.h" +#include +#include namespace TagLib { namespace S3M { diff --git a/Frameworks/TagLib/taglib/taglib/tag.cpp b/Frameworks/TagLib/taglib/taglib/tag.cpp index 9e01e3e80..5164de08b 100644 --- a/Frameworks/TagLib/taglib/taglib/tag.cpp +++ b/Frameworks/TagLib/taglib/taglib/tag.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tag.h" -#include "tstringlist.h" -#include "tpropertymap.h" +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/tag.h b/Frameworks/TagLib/taglib/taglib/tag.h index 3304e17d6..1fd763016 100644 --- a/Frameworks/TagLib/taglib/taglib/tag.h +++ b/Frameworks/TagLib/taglib/taglib/tag.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_TAG_H #define TAGLIB_TAG_H -#include "taglib_export.h" -#include "tstring.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/tagunion.cpp b/Frameworks/TagLib/taglib/taglib/tagunion.cpp index 2abc55fcd..1fe29f1e5 100644 --- a/Frameworks/TagLib/taglib/taglib/tagunion.cpp +++ b/Frameworks/TagLib/taglib/taglib/tagunion.cpp @@ -23,15 +23,15 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include +#include +#include +#include -#include "id3v1tag.h" -#include "id3v2tag.h" -#include "apetag.h" -#include "xiphcomment.h" -#include "infotag.h" +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/tagunion.h b/Frameworks/TagLib/taglib/taglib/tagunion.h index a6a03f44f..3da454692 100644 --- a/Frameworks/TagLib/taglib/taglib/tagunion.h +++ b/Frameworks/TagLib/taglib/taglib/tagunion.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_TAGUNION_H #define TAGLIB_TAGUNION_H -#include "tag.h" +#include #ifndef DO_NOT_DOCUMENT diff --git a/Frameworks/TagLib/taglib/taglib/tagutils.cpp b/Frameworks/TagLib/taglib/taglib/tagutils.cpp index d6d924064..11b5e9053 100644 --- a/Frameworks/TagLib/taglib/taglib/tagutils.cpp +++ b/Frameworks/TagLib/taglib/taglib/tagutils.cpp @@ -23,13 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include +#include -#include "id3v1tag.h" -#include "id3v2header.h" -#include "apetag.h" +#include +#include +#include -#include "tagutils.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/tagutils.h b/Frameworks/TagLib/taglib/taglib/tagutils.h index 4488a32ba..aae8c0460 100644 --- a/Frameworks/TagLib/taglib/taglib/tagutils.h +++ b/Frameworks/TagLib/taglib/taglib/tagutils.h @@ -30,7 +30,7 @@ #ifndef DO_NOT_DOCUMENT // tell Doxygen not to document this header -#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevector.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevector.cpp index d272057f6..505084a45 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevector.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevector.cpp @@ -30,12 +30,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "tbytevector.h" +#include // This is a bit ugly to keep writing over and over again. diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevector.h b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevector.h index 41373c720..0e6073bcb 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevector.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevector.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_BYTEVECTOR_H #define TAGLIB_BYTEVECTOR_H -#include "taglib.h" -#include "taglib_export.h" +#include +#include #include #include diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorlist.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorlist.cpp index c4fdf5933..eb88e2965 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorlist.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorlist.cpp @@ -23,7 +23,7 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tbytevectorlist.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorlist.h b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorlist.h index 5852583a0..873c9e438 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorlist.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorlist.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_BYTEVECTORLIST_H #define TAGLIB_BYTEVECTORLIST_H -#include "taglib_export.h" -#include "tbytevector.h" -#include "tlist.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorstream.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorstream.cpp index 333f528c1..5427a7c7a 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorstream.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorstream.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tbytevectorstream.h" -#include "tstring.h" -#include "tdebug.h" +#include +#include +#include #include #include diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorstream.h b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorstream.h index 84327c46d..7bab6103a 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorstream.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tbytevectorstream.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_BYTEVECTORSTREAM_H #define TAGLIB_BYTEVECTORSTREAM_H -#include "taglib_export.h" -#include "taglib.h" -#include "tbytevector.h" -#include "tiostream.h" +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tdebug.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tdebug.cpp index b2efc4cb5..ef6bab9b2 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tdebug.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tdebug.cpp @@ -24,15 +24,15 @@ ***************************************************************************/ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #if !defined(NDEBUG) || defined(TRACE_IN_RELEASE) -#include "tdebug.h" -#include "tstring.h" -#include "tdebuglistener.h" -#include "tutils.h" +#include +#include +#include +#include #include #include diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tdebuglistener.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tdebuglistener.cpp index 48912222d..2d5b43177 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tdebuglistener.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tdebuglistener.cpp @@ -23,7 +23,7 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tdebuglistener.h" +#include #include #include diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tdebuglistener.h b/Frameworks/TagLib/taglib/taglib/toolkit/tdebuglistener.h index 3c8e1185c..e1b76f51e 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tdebuglistener.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tdebuglistener.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_DEBUGLISTENER_H #define TAGLIB_DEBUGLISTENER_H -#include "taglib_export.h" -#include "tstring.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tfile.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tfile.cpp index 43bb0d28f..90eb040ce 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tfile.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tfile.h" -#include "tfilestream.h" -#include "tstring.h" -#include "tdebug.h" -#include "tpropertymap.h" +#include +#include +#include +#include +#include #ifdef _WIN32 # include @@ -44,26 +44,25 @@ # define W_OK 2 #endif -#include "asffile.h" -#include "mpegfile.h" -#include "vorbisfile.h" -#include "flacfile.h" -#include "oggflacfile.h" -#include "mpcfile.h" -#include "mp4file.h" -#include "wavpackfile.h" -#include "speexfile.h" -#include "opusfile.h" -#include "trueaudiofile.h" -#include "aifffile.h" -#include "wavfile.h" -#include "apefile.h" -#include "apegenfile.h" -#include "modfile.h" -#include "s3mfile.h" -#include "itfile.h" -#include "xmfile.h" -#include "mp4file.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tfile.h b/Frameworks/TagLib/taglib/taglib/toolkit/tfile.h index bdc4f1241..48774f9f2 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tfile.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tfile.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_FILE_H #define TAGLIB_FILE_H -#include "taglib_export.h" -#include "taglib.h" -#include "tag.h" -#include "tbytevector.h" -#include "tiostream.h" +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tfilestream.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tfilestream.cpp index 0ea3be5b1..b1bbc9383 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tfilestream.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tfilestream.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tfilestream.h" -#include "tstring.h" -#include "tdebug.h" +#include +#include +#include #ifdef _WIN32 # include diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tfilestream.h b/Frameworks/TagLib/taglib/taglib/toolkit/tfilestream.h index aa4d71b30..4420bc938 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tfilestream.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tfilestream.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_FILESTREAM_H #define TAGLIB_FILESTREAM_H -#include "taglib_export.h" -#include "taglib.h" -#include "tbytevector.h" -#include "tiostream.h" +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tiostream.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tiostream.cpp index de0bd5053..35f160b28 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tiostream.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tiostream.cpp @@ -28,7 +28,7 @@ # include #endif -#include "tiostream.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tiostream.h b/Frameworks/TagLib/taglib/taglib/toolkit/tiostream.h index 110531644..82f49caf6 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tiostream.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tiostream.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_IOSTREAM_H #define TAGLIB_IOSTREAM_H -#include "taglib_export.h" -#include "taglib.h" -#include "tbytevector.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tlist.h b/Frameworks/TagLib/taglib/taglib/toolkit/tlist.h index 377b82481..8f13618e8 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tlist.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tlist.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_LIST_H #define TAGLIB_LIST_H -#include "taglib.h" +#include #include @@ -265,6 +265,6 @@ namespace TagLib { // Since GCC doesn't support the "export" keyword, we have to include the // implementation. -#include "tlist.tcc" +#include #endif diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tlist.tcc b/Frameworks/TagLib/taglib/taglib/toolkit/tlist.tcc index 478f09834..2e75e76de 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tlist.tcc +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tlist.tcc @@ -24,7 +24,7 @@ ***************************************************************************/ #include -#include "trefcounter.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tmap.h b/Frameworks/TagLib/taglib/taglib/toolkit/tmap.h index f54e5a2a9..28d80e656 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tmap.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tmap.h @@ -28,7 +28,7 @@ #include -#include "taglib.h" +#include namespace TagLib { @@ -199,6 +199,6 @@ namespace TagLib { // Since GCC doesn't support the "export" keyword, we have to include the // implementation. -#include "tmap.tcc" +#include #endif diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tmap.tcc b/Frameworks/TagLib/taglib/taglib/toolkit/tmap.tcc index 2e4ed5ebf..703d94a9d 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tmap.tcc +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tmap.tcc @@ -23,7 +23,7 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "trefcounter.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tpropertymap.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tpropertymap.cpp index b3e1ec3ad..c1e333372 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tpropertymap.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tpropertymap.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ -#include "tpropertymap.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tpropertymap.h b/Frameworks/TagLib/taglib/taglib/toolkit/tpropertymap.h index d491efe8c..ab6d512b5 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tpropertymap.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tpropertymap.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_PROPERTYMAP_H_ #define TAGLIB_PROPERTYMAP_H_ -#include "tmap.h" -#include "tstringlist.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.cpp index 18cb596c0..31e84200e 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.cpp @@ -24,10 +24,10 @@ ***************************************************************************/ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif -#include "trefcounter.h" +#include #if defined(HAVE_GCC_ATOMIC) # define ATOMIC_INT int diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.h b/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.h index 96b54d409..bc4061bec 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/trefcounter.h @@ -27,7 +27,7 @@ #define TAGLIB_REFCOUNTER_H #include -#include +#include #ifdef __APPLE__ # include diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tstring.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tstring.cpp index 96c107500..c5e17ed4a 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tstring.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tstring.cpp @@ -29,12 +29,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "tstring.h" +#include namespace { diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tstring.h b/Frameworks/TagLib/taglib/taglib/toolkit/tstring.h index 5e6caf35e..8fb8ef750 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tstring.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tstring.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_STRING_H #define TAGLIB_STRING_H -#include "taglib_export.h" -#include "taglib.h" -#include "tbytevector.h" +#include +#include +#include #include #include diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tstringlist.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tstringlist.cpp index 655fe6c4b..a2ac880fb 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tstringlist.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tstringlist.cpp @@ -23,7 +23,7 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tstringlist.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tstringlist.h b/Frameworks/TagLib/taglib/taglib/toolkit/tstringlist.h index 41b7f6ecd..630db99e8 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tstringlist.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tstringlist.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_STRINGLIST_H #define TAGLIB_STRINGLIST_H -#include "tstring.h" -#include "tlist.h" -#include "tbytevectorlist.h" -#include "taglib_export.h" +#include +#include +#include +#include #include diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tutils.h b/Frameworks/TagLib/taglib/taglib/toolkit/tutils.h index 6d96cd12d..0ebd08c39 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tutils.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tutils.h @@ -44,7 +44,7 @@ # include #endif -#include +#include #include #include #include diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tzlib.cpp b/Frameworks/TagLib/taglib/taglib/toolkit/tzlib.cpp index 4b348df5d..5b0b9e49b 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tzlib.cpp +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tzlib.cpp @@ -33,7 +33,7 @@ # include #endif -#include "tzlib.h" +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/toolkit/tzlib.h b/Frameworks/TagLib/taglib/taglib/toolkit/tzlib.h index b1f1fcaf8..7a849028b 100644 --- a/Frameworks/TagLib/taglib/taglib/toolkit/tzlib.h +++ b/Frameworks/TagLib/taglib/taglib/toolkit/tzlib.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_TZLIB_H #define TAGLIB_TZLIB_H -#include +#include // THIS FILE IS NOT A PART OF THE TAGLIB API diff --git a/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudiofile.cpp b/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudiofile.cpp index b3e136e98..708825aa2 100644 --- a/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudiofile.cpp +++ b/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudiofile.cpp @@ -27,20 +27,20 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include "trueaudiofile.h" -#include "id3v1tag.h" -#include "id3v2tag.h" -#include "id3v2header.h" -#include "apefooter.h" -#include "apetag.h" +#include +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudiofile.h b/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudiofile.h index dea1f20f2..6d10017da 100644 --- a/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudiofile.h +++ b/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudiofile.h @@ -30,8 +30,8 @@ #ifndef TAGLIB_TRUEAUDIOFILE_H #define TAGLIB_TRUEAUDIOFILE_H -#include "tfile.h" -#include "trueaudioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudioproperties.cpp b/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudioproperties.cpp index 0aab24193..30dd43b6b 100644 --- a/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudioproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudioproperties.cpp @@ -27,12 +27,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include +#include +#include #include -#include "trueaudioproperties.h" -#include "trueaudiofile.h" +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudioproperties.h b/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudioproperties.h index d25c7a775..d9fdcba8e 100644 --- a/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudioproperties.h +++ b/Frameworks/TagLib/taglib/taglib/trueaudio/trueaudioproperties.h @@ -30,7 +30,7 @@ #ifndef TAGLIB_TRUEAUDIOPROPERTIES_H #define TAGLIB_TRUEAUDIOPROPERTIES_H -#include "audioproperties.h" +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/wavpack/wavpackfile.cpp b/Frameworks/TagLib/taglib/taglib/wavpack/wavpackfile.cpp index 56b993934..902aa9ff6 100644 --- a/Frameworks/TagLib/taglib/taglib/wavpack/wavpackfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/wavpack/wavpackfile.cpp @@ -27,18 +27,18 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include "wavpackfile.h" -#include "id3v1tag.h" -#include "id3v2header.h" -#include "apetag.h" -#include "apefooter.h" +#include +#include +#include +#include +#include using namespace TagLib; diff --git a/Frameworks/TagLib/taglib/taglib/wavpack/wavpackfile.h b/Frameworks/TagLib/taglib/taglib/wavpack/wavpackfile.h index ccc4ef6e8..83953993b 100644 --- a/Frameworks/TagLib/taglib/taglib/wavpack/wavpackfile.h +++ b/Frameworks/TagLib/taglib/taglib/wavpack/wavpackfile.h @@ -30,9 +30,9 @@ #ifndef TAGLIB_WVFILE_H #define TAGLIB_WVFILE_H -#include "tfile.h" -#include "taglib_export.h" -#include "wavpackproperties.h" +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/wavpack/wavpackproperties.cpp b/Frameworks/TagLib/taglib/taglib/wavpack/wavpackproperties.cpp index d5808be56..37c8b47c9 100644 --- a/Frameworks/TagLib/taglib/taglib/wavpack/wavpackproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/wavpack/wavpackproperties.cpp @@ -28,11 +28,11 @@ ***************************************************************************/ #include -#include -#include +#include +#include -#include "wavpackproperties.h" -#include "wavpackfile.h" +#include +#include // Implementation of this class is based on the information at: // http://www.wavpack.com/file_format.txt diff --git a/Frameworks/TagLib/taglib/taglib/wavpack/wavpackproperties.h b/Frameworks/TagLib/taglib/taglib/wavpack/wavpackproperties.h index e6acdcc3c..3e372ba89 100644 --- a/Frameworks/TagLib/taglib/taglib/wavpack/wavpackproperties.h +++ b/Frameworks/TagLib/taglib/taglib/wavpack/wavpackproperties.h @@ -30,8 +30,8 @@ #ifndef TAGLIB_WVPROPERTIES_H #define TAGLIB_WVPROPERTIES_H -#include "taglib_export.h" -#include "audioproperties.h" +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/xm/xmfile.cpp b/Frameworks/TagLib/taglib/taglib/xm/xmfile.cpp index 0455338d9..17cea265b 100644 --- a/Frameworks/TagLib/taglib/taglib/xm/xmfile.cpp +++ b/Frameworks/TagLib/taglib/taglib/xm/xmfile.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tstringlist.h" -#include "tdebug.h" -#include "xmfile.h" -#include "modfileprivate.h" -#include "tpropertymap.h" +#include +#include +#include +#include +#include #include #include diff --git a/Frameworks/TagLib/taglib/taglib/xm/xmfile.h b/Frameworks/TagLib/taglib/taglib/xm/xmfile.h index 9211078ad..14d485c81 100644 --- a/Frameworks/TagLib/taglib/taglib/xm/xmfile.h +++ b/Frameworks/TagLib/taglib/taglib/xm/xmfile.h @@ -26,12 +26,12 @@ #ifndef TAGLIB_XMFILE_H #define TAGLIB_XMFILE_H -#include "tfile.h" -#include "audioproperties.h" -#include "taglib_export.h" -#include "modfilebase.h" -#include "modtag.h" -#include "xmproperties.h" +#include +#include +#include +#include +#include +#include namespace TagLib { diff --git a/Frameworks/TagLib/taglib/taglib/xm/xmproperties.cpp b/Frameworks/TagLib/taglib/taglib/xm/xmproperties.cpp index 93d849868..6fbce1b85 100644 --- a/Frameworks/TagLib/taglib/taglib/xm/xmproperties.cpp +++ b/Frameworks/TagLib/taglib/taglib/xm/xmproperties.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ -#include "xmproperties.h" +#include using namespace TagLib; using namespace XM; diff --git a/Frameworks/TagLib/taglib/taglib/xm/xmproperties.h b/Frameworks/TagLib/taglib/taglib/xm/xmproperties.h index 24a52217a..94d742101 100644 --- a/Frameworks/TagLib/taglib/taglib/xm/xmproperties.h +++ b/Frameworks/TagLib/taglib/taglib/xm/xmproperties.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_XMPROPERTIES_H #define TAGLIB_XMPROPERTIES_H -#include "taglib.h" -#include "tstring.h" -#include "audioproperties.h" +#include +#include +#include namespace TagLib { namespace XM { diff --git a/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj b/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj index fca173f13..3640e2593 100644 --- a/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj +++ b/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj @@ -300,7 +300,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "../../Frameworks/TagLib/taglib/**", + ../../Frameworks/TagLib/taglib, ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; @@ -330,7 +330,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "../../Frameworks/TagLib/taglib/**", + ../../Frameworks/TagLib/taglib, ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles";