From 7646184d6bfffc04b7bb737b037fe729c82f0aa9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 15 Sep 2023 23:22:36 -0700 Subject: [PATCH] unused includes (#1133) * unused includes Signed-off-by: Rosen Penev * Use consistent order of includes Always include in the following order: - Own header files - Standard header files - System header files - Project header files (toolkit first) Exceptions: - cppunit/extensions/HelperMacros.h must be included after header files declaring stream operators - config.h must be included before its definitions are used --------- Signed-off-by: Rosen Penev Co-authored-by: Urs Fleisch --- bindings/c/tag_c.cpp | 18 +++++----- examples/framelist.cpp | 4 --- examples/strip-id3v1.cpp | 3 +- examples/tagreader.cpp | 2 +- examples/tagreader_c.c | 1 + examples/tagwriter.cpp | 7 ++-- taglib/ape/apefile.cpp | 7 ++-- taglib/ape/apefooter.cpp | 4 --- taglib/ape/apeitem.cpp | 5 ++- taglib/ape/apeproperties.cpp | 6 ++-- taglib/ape/apetag.cpp | 16 ++++----- taglib/ape/apetag.h | 3 +- taglib/asf/asfattribute.cpp | 1 - taglib/asf/asffile.cpp | 12 +++---- taglib/asf/asffile.h | 2 +- taglib/asf/asfpicture.cpp | 4 --- taglib/asf/asfproperties.cpp | 2 -- taglib/asf/asfproperties.h | 2 +- taglib/asf/asftag.cpp | 3 +- taglib/asf/asftag.h | 2 +- taglib/audioproperties.h | 4 +-- taglib/fileref.cpp | 33 +++++++++---------- taglib/flac/flacfile.cpp | 16 +++------ taglib/flac/flacfile.h | 3 +- taglib/flac/flacmetadatablock.cpp | 2 -- taglib/flac/flacpicture.cpp | 2 +- taglib/flac/flacunknownmetadatablock.cpp | 3 -- taglib/it/itfile.cpp | 4 +-- taglib/it/itfile.h | 2 +- taglib/it/itproperties.cpp | 1 - taglib/mod/modfile.cpp | 4 +-- taglib/mod/modfile.h | 2 +- taglib/mod/modfilebase.cpp | 2 -- taglib/mod/modproperties.cpp | 1 - taglib/mod/modtag.cpp | 6 ++-- taglib/mp4/mp4atom.cpp | 1 - taglib/mp4/mp4atom.h | 4 +-- taglib/mp4/mp4coverart.cpp | 2 -- taglib/mp4/mp4file.cpp | 1 - taglib/mp4/mp4file.h | 4 +-- taglib/mp4/mp4item.cpp | 2 -- taglib/mp4/mp4item.h | 2 +- taglib/mp4/mp4properties.cpp | 1 + taglib/mp4/mp4tag.cpp | 10 +++--- taglib/mp4/mp4tag.h | 2 +- taglib/mpc/mpcfile.cpp | 5 +-- taglib/mpc/mpcfile.h | 8 ++--- taglib/mpc/mpcproperties.cpp | 5 ++- taglib/mpeg/id3v1/id3v1tag.cpp | 1 - taglib/mpeg/id3v1/id3v1tag.h | 2 +- .../mpeg/id3v2/frames/attachedpictureframe.h | 2 +- taglib/mpeg/id3v2/frames/chapterframe.cpp | 4 +-- taglib/mpeg/id3v2/frames/chapterframe.h | 2 +- taglib/mpeg/id3v2/frames/commentsframe.cpp | 3 +- taglib/mpeg/id3v2/frames/commentsframe.h | 2 +- .../id3v2/frames/eventtimingcodesframe.cpp | 9 ++--- .../mpeg/id3v2/frames/eventtimingcodesframe.h | 2 +- .../frames/generalencapsulatedobjectframe.h | 2 +- taglib/mpeg/id3v2/frames/ownershipframe.cpp | 1 - taglib/mpeg/id3v2/frames/ownershipframe.h | 2 +- taglib/mpeg/id3v2/frames/podcastframe.cpp | 1 + taglib/mpeg/id3v2/frames/podcastframe.h | 2 +- .../mpeg/id3v2/frames/popularimeterframe.cpp | 2 -- taglib/mpeg/id3v2/frames/popularimeterframe.h | 2 +- taglib/mpeg/id3v2/frames/privateframe.cpp | 2 +- taglib/mpeg/id3v2/frames/privateframe.h | 2 +- .../mpeg/id3v2/frames/relativevolumeframe.cpp | 5 ++- .../mpeg/id3v2/frames/relativevolumeframe.h | 2 +- .../id3v2/frames/synchronizedlyricsframe.cpp | 9 ++--- .../id3v2/frames/synchronizedlyricsframe.h | 2 +- .../id3v2/frames/tableofcontentsframe.cpp | 3 -- .../mpeg/id3v2/frames/tableofcontentsframe.h | 3 +- .../id3v2/frames/textidentificationframe.cpp | 8 ++--- .../id3v2/frames/textidentificationframe.h | 1 - .../frames/uniquefileidentifierframe.cpp | 1 - taglib/mpeg/id3v2/frames/unknownframe.h | 2 +- .../frames/unsynchronizedlyricsframe.cpp | 4 ++- taglib/mpeg/id3v2/frames/urllinkframe.cpp | 4 ++- taglib/mpeg/id3v2/id3v2extendedheader.cpp | 1 + taglib/mpeg/id3v2/id3v2extendedheader.h | 2 +- taglib/mpeg/id3v2/id3v2footer.cpp | 1 + taglib/mpeg/id3v2/id3v2footer.h | 2 +- taglib/mpeg/id3v2/id3v2frame.cpp | 4 +-- taglib/mpeg/id3v2/id3v2framefactory.cpp | 8 ++--- taglib/mpeg/id3v2/id3v2framefactory.h | 2 +- taglib/mpeg/id3v2/id3v2header.cpp | 2 -- taglib/mpeg/id3v2/id3v2tag.cpp | 7 ++-- taglib/mpeg/id3v2/id3v2tag.h | 3 +- taglib/mpeg/mpegfile.cpp | 14 ++++---- taglib/mpeg/mpegfile.h | 4 +-- taglib/mpeg/mpegheader.cpp | 6 ++-- taglib/mpeg/mpegheader.h | 4 +-- taglib/mpeg/mpegproperties.cpp | 2 -- taglib/mpeg/mpegproperties.h | 1 - taglib/mpeg/xingheader.cpp | 2 -- taglib/mpeg/xingheader.h | 6 ++-- taglib/ogg/flac/oggflacfile.cpp | 4 --- taglib/ogg/flac/oggflacfile.h | 1 - taglib/ogg/oggfile.cpp | 9 ++--- taglib/ogg/oggfile.h | 2 +- taglib/ogg/oggpage.cpp | 1 - taglib/ogg/oggpage.h | 2 +- taglib/ogg/oggpageheader.cpp | 4 +-- taglib/ogg/opus/opusfile.cpp | 1 - taglib/ogg/opus/opusfile.h | 1 - taglib/ogg/opus/opusproperties.cpp | 2 -- taglib/ogg/speex/speexfile.cpp | 1 - taglib/ogg/speex/speexfile.h | 1 - taglib/ogg/speex/speexproperties.cpp | 2 -- taglib/ogg/vorbis/vorbisfile.cpp | 3 -- taglib/ogg/vorbis/vorbisfile.h | 1 - taglib/ogg/vorbis/vorbisproperties.cpp | 2 -- taglib/ogg/xiphcomment.cpp | 9 ++--- taglib/ogg/xiphcomment.h | 4 +-- taglib/riff/aiff/aifffile.cpp | 3 -- taglib/riff/aiff/aiffproperties.h | 2 +- taglib/riff/rifffile.cpp | 3 -- taglib/riff/rifffile.h | 2 +- taglib/riff/wav/infotag.cpp | 5 +-- taglib/riff/wav/infotag.h | 2 +- taglib/riff/wav/wavfile.cpp | 4 --- taglib/riff/wav/wavproperties.cpp | 1 + taglib/s3m/s3mfile.cpp | 5 ++- taglib/s3m/s3mfile.h | 2 +- taglib/s3m/s3mproperties.cpp | 1 - taglib/tag.cpp | 5 +-- taglib/tagunion.cpp | 11 ++----- taglib/toolkit/tbytevector.cpp | 3 -- taglib/toolkit/tbytevector.h | 6 ++-- taglib/toolkit/tbytevectorlist.h | 2 +- taglib/toolkit/tbytevectorstream.cpp | 5 +-- taglib/toolkit/tbytevectorstream.h | 4 +-- taglib/toolkit/tdebug.cpp | 6 ++-- taglib/toolkit/tdebuglistener.cpp | 1 - taglib/toolkit/tdebuglistener.h | 2 +- taglib/toolkit/tfile.cpp | 24 ++------------ taglib/toolkit/tfile.h | 4 +-- taglib/toolkit/tfilestream.cpp | 5 +-- taglib/toolkit/tfilestream.h | 4 +-- taglib/toolkit/tiostream.h | 2 +- taglib/toolkit/tlist.h | 4 +-- taglib/toolkit/tpropertymap.cpp | 4 +-- taglib/toolkit/tstring.cpp | 1 - taglib/toolkit/tstring.h | 8 ++--- taglib/toolkit/tstringlist.h | 4 +-- taglib/toolkit/tutils.h | 7 ++-- taglib/trueaudio/trueaudiofile.cpp | 7 +--- taglib/trueaudio/trueaudioproperties.cpp | 5 +-- taglib/wavpack/wavpackfile.cpp | 10 ++---- taglib/wavpack/wavpackproperties.cpp | 5 ++- taglib/xm/xmfile.cpp | 9 +++-- taglib/xm/xmfile.h | 2 +- taglib/xm/xmproperties.cpp | 1 - taglib/xm/xmproperties.h | 2 +- tests/test_aiff.cpp | 3 +- tests/test_ape.cpp | 5 +-- tests/test_apetag.cpp | 5 +-- tests/test_asf.cpp | 3 +- tests/test_bytevector.cpp | 1 + tests/test_file.cpp | 2 +- tests/test_fileref.cpp | 5 +-- tests/test_flac.cpp | 5 +-- tests/test_flacpicture.cpp | 3 +- tests/test_flacunknownmetadatablock.cpp | 3 +- tests/test_id3v1.cpp | 1 + tests/test_id3v2.cpp | 9 ++--- tests/test_info.cpp | 1 + tests/test_it.cpp | 2 +- tests/test_mod.cpp | 2 +- tests/test_mp4.cpp | 7 ++-- tests/test_mp4coverart.cpp | 1 + tests/test_mp4item.cpp | 1 + tests/test_mpc.cpp | 5 +-- tests/test_mpeg.cpp | 1 + tests/test_ogg.cpp | 1 + tests/test_oggflac.cpp | 3 +- tests/test_opus.cpp | 3 +- tests/test_riff.cpp | 3 +- tests/test_sizes.cpp | 3 +- tests/test_string.cpp | 3 +- tests/test_synchdata.cpp | 1 - tests/test_trueaudio.cpp | 3 +- tests/test_wav.cpp | 3 +- tests/test_wavpack.cpp | 5 +-- tests/test_xiphcomment.cpp | 5 +-- 185 files changed, 292 insertions(+), 433 deletions(-) diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp index bc7ad014..f5adbd51 100644 --- a/bindings/c/tag_c.cpp +++ b/bindings/c/tag_c.cpp @@ -19,13 +19,18 @@ * USA * ***************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "tag_c.h" #include -#include "fileref.h" +#include +#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "tfile.h" +#include "tpropertymap.h" +#include "fileref.h" #include "asffile.h" #include "vorbisfile.h" #include "mpegfile.h" @@ -37,12 +42,7 @@ #include "trueaudiofile.h" #include "mp4file.h" #include "tag.h" -#include -#include #include "id3v2framefactory.h" -#include "tpropertymap.h" - -#include "tag_c.h" using namespace TagLib; diff --git a/examples/framelist.cpp b/examples/framelist.cpp index e176b604..1452f7cb 100644 --- a/examples/framelist.cpp +++ b/examples/framelist.cpp @@ -26,16 +26,12 @@ #include #include "tbytevector.h" - #include "mpegfile.h" - #include "id3v2tag.h" #include "id3v2frame.h" #include "id3v2header.h" #include "commentsframe.h" - #include "id3v1tag.h" - #include "apetag.h" using namespace std; diff --git a/examples/strip-id3v1.cpp b/examples/strip-id3v1.cpp index 36171cdd..5a70e07f 100644 --- a/examples/strip-id3v1.cpp +++ b/examples/strip-id3v1.cpp @@ -23,8 +23,9 @@ */ #include -#include "mpegfile.h" + #include "tstring.h" +#include "mpegfile.h" using namespace TagLib; diff --git a/examples/tagreader.cpp b/examples/tagreader.cpp index 7ba0220e..3d18f4d5 100644 --- a/examples/tagreader.cpp +++ b/examples/tagreader.cpp @@ -26,9 +26,9 @@ #include #include +#include "tpropertymap.h" #include "fileref.h" #include "tag.h" -#include "tpropertymap.h" using namespace std; diff --git a/examples/tagreader_c.c b/examples/tagreader_c.c index 546652d9..668de994 100644 --- a/examples/tagreader_c.c +++ b/examples/tagreader_c.c @@ -24,6 +24,7 @@ #include #include + #include "tag_c.h" #ifndef FALSE diff --git a/examples/tagwriter.cpp b/examples/tagwriter.cpp index 9810b720..85885c0c 100644 --- a/examples/tagwriter.cpp +++ b/examples/tagwriter.cpp @@ -25,17 +25,16 @@ #include #include #include - #include +#include #include #include -#include #include "tlist.h" -#include "fileref.h" #include "tfile.h" -#include "tag.h" #include "tpropertymap.h" +#include "fileref.h" +#include "tag.h" using namespace std; diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp index ef1f6838..80468661 100644 --- a/taglib/ape/apefile.cpp +++ b/taglib/ape/apefile.cpp @@ -33,15 +33,12 @@ #include "apefile.h" -#include "tbytevector.h" -#include "tstring.h" #include "tdebug.h" -#include "tagunion.h" +#include "tpropertymap.h" #include "id3v1tag.h" #include "id3v2header.h" -#include "tpropertymap.h" +#include "tagunion.h" #include "tagutils.h" - #include "apetag.h" #include "apefooter.h" diff --git a/taglib/ape/apefooter.cpp b/taglib/ape/apefooter.cpp index 4042804a..92676b38 100644 --- a/taglib/ape/apefooter.cpp +++ b/taglib/ape/apefooter.cpp @@ -26,12 +26,8 @@ #include "apefooter.h" -#include #include -#include "tstring.h" -#include "tdebug.h" - using namespace TagLib; using namespace APE; diff --git a/taglib/ape/apeitem.cpp b/taglib/ape/apeitem.cpp index 36dca067..c009a82e 100644 --- a/taglib/ape/apeitem.cpp +++ b/taglib/ape/apeitem.cpp @@ -25,11 +25,10 @@ #include "apeitem.h" -#include "tbytevectorlist.h" -#include "tdebug.h" - #include +#include "tdebug.h" + using namespace TagLib; using namespace APE; diff --git a/taglib/ape/apeproperties.cpp b/taglib/ape/apeproperties.cpp index 0f947b9d..60cdd5a8 100644 --- a/taglib/ape/apeproperties.cpp +++ b/taglib/ape/apeproperties.cpp @@ -28,13 +28,11 @@ ***************************************************************************/ #include "apeproperties.h" -#include "tstring.h" + #include "tdebug.h" -#include -#include "id3v2tag.h" #include "apefile.h" -#include "apetag.h" #include "apefooter.h" +#include "apetag.h" using namespace TagLib; diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp index 9ca5cb13..a7b77c09 100644 --- a/taglib/ape/apetag.cpp +++ b/taglib/ape/apetag.cpp @@ -33,19 +33,15 @@ #include "apetag.h" -#include "tfile.h" -#include "tstring.h" -#include "tmap.h" -#include "tpropertymap.h" -#include "tdebug.h" -#include "tutils.h" - -#include "apefooter.h" -#include "apeitem.h" - #include #include +#include "tdebug.h" +#include "tfile.h" +#include "tpropertymap.h" +#include "apefooter.h" +#include "apeitem.h" + using namespace TagLib; using namespace APE; diff --git a/taglib/ape/apetag.h b/taglib/ape/apetag.h index 179a1cd4..6bf019f0 100644 --- a/taglib/ape/apetag.h +++ b/taglib/ape/apetag.h @@ -26,12 +26,11 @@ #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 "tag.h" #include "apeitem.h" namespace TagLib { diff --git a/taglib/asf/asfattribute.cpp b/taglib/asf/asfattribute.cpp index 2e58b854..6a2a1114 100644 --- a/taglib/asf/asfattribute.cpp +++ b/taglib/asf/asfattribute.cpp @@ -25,7 +25,6 @@ #include "asfattribute.h" -#include "taglib.h" #include "tdebug.h" #include "asffile.h" diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp index 55d80539..361389f2 100644 --- a/taglib/asf/asffile.cpp +++ b/taglib/asf/asffile.cpp @@ -25,18 +25,16 @@ #include "asffile.h" -#include "tdebug.h" -#include "tbytevectorlist.h" -#include "tpropertymap.h" -#include "tstring.h" -#include "tagutils.h" +#include +#include "tdebug.h" +#include "tpropertymap.h" +#include "tbytevectorlist.h" +#include "tagutils.h" #include "asftag.h" #include "asfproperties.h" #include "asfutils.h" -#include - using namespace TagLib; class ASF::File::FilePrivate diff --git a/taglib/asf/asffile.h b/taglib/asf/asffile.h index ee241dc2..4bba13dd 100644 --- a/taglib/asf/asffile.h +++ b/taglib/asf/asffile.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ASFFILE_H #define TAGLIB_ASFFILE_H -#include "tag.h" #include "tfile.h" #include "taglib_export.h" +#include "tag.h" #include "asfproperties.h" #include "asftag.h" diff --git a/taglib/asf/asfpicture.cpp b/taglib/asf/asfpicture.cpp index 435eac91..c99ec924 100644 --- a/taglib/asf/asfpicture.cpp +++ b/taglib/asf/asfpicture.cpp @@ -25,10 +25,6 @@ #include "asfpicture.h" -#include "taglib.h" -#include "tdebug.h" - -#include "asfattribute.h" #include "asffile.h" #include "asfutils.h" diff --git a/taglib/asf/asfproperties.cpp b/taglib/asf/asfproperties.cpp index e399ffac..ccbcd06a 100644 --- a/taglib/asf/asfproperties.cpp +++ b/taglib/asf/asfproperties.cpp @@ -24,8 +24,6 @@ ***************************************************************************/ #include "asfproperties.h" -#include "tdebug.h" -#include "tstring.h" using namespace TagLib; diff --git a/taglib/asf/asfproperties.h b/taglib/asf/asfproperties.h index 17467a04..95b88fee 100644 --- a/taglib/asf/asfproperties.h +++ b/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 "audioproperties.h" namespace TagLib { namespace ASF { diff --git a/taglib/asf/asftag.cpp b/taglib/asf/asftag.cpp index 891e66dd..f2a1648e 100644 --- a/taglib/asf/asftag.cpp +++ b/taglib/asf/asftag.cpp @@ -24,11 +24,12 @@ ***************************************************************************/ #include "asftag.h" -#include "tpropertymap.h" #include #include +#include "tpropertymap.h" + using namespace TagLib; class ASF::Tag::TagPrivate diff --git a/taglib/asf/asftag.h b/taglib/asf/asftag.h index 8ad87af0..7c8bd03c 100644 --- a/taglib/asf/asftag.h +++ b/taglib/asf/asftag.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_ASFTAG_H #define TAGLIB_ASFTAG_H -#include "tag.h" #include "tlist.h" #include "tmap.h" #include "taglib_export.h" +#include "tag.h" #include "asfattribute.h" namespace TagLib { diff --git a/taglib/audioproperties.h b/taglib/audioproperties.h index d0684d17..ee2b5de4 100644 --- a/taglib/audioproperties.h +++ b/taglib/audioproperties.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_AUDIOPROPERTIES_H #define TAGLIB_AUDIOPROPERTIES_H +#include + #include "taglib.h" #include "taglib_export.h" -#include - namespace TagLib { //! A simple, abstract interface to common audio properties diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp index 65a546db..ac64406b 100644 --- a/taglib/fileref.cpp +++ b/taglib/fileref.cpp @@ -32,28 +32,25 @@ #include #include -#include "tdebug.h" -#include "tfile.h" #include "tfilestream.h" -#include "tstring.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 "tdebug.h" #include "aifffile.h" -#include "wavfile.h" #include "apefile.h" -#include "modfile.h" -#include "s3mfile.h" +#include "asffile.h" +#include "flacfile.h" #include "itfile.h" +#include "modfile.h" +#include "mp4file.h" +#include "mpcfile.h" +#include "mpegfile.h" +#include "oggflacfile.h" +#include "opusfile.h" +#include "s3mfile.h" +#include "speexfile.h" +#include "trueaudiofile.h" +#include "vorbisfile.h" +#include "wavfile.h" +#include "wavpackfile.h" #include "xmfile.h" using namespace TagLib; diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp index b71c3a4b..e6a6bd83 100644 --- a/taglib/flac/flacfile.cpp +++ b/taglib/flac/flacfile.cpp @@ -25,25 +25,19 @@ #include "flacfile.h" -#include "tbytevector.h" -#include "tstring.h" -#include "tlist.h" -#include "tdebug.h" -#include "tagunion.h" -#include "tpropertymap.h" -#include "tagutils.h" +#include -#include "id3v2header.h" +#include "tdebug.h" +#include "tpropertymap.h" +#include "tagunion.h" +#include "tagutils.h" #include "id3v2tag.h" #include "id3v1tag.h" #include "xiphcomment.h" - #include "flacpicture.h" #include "flacmetadatablock.h" #include "flacunknownmetadatablock.h" -#include - using namespace TagLib; namespace diff --git a/taglib/flac/flacfile.h b/taglib/flac/flacfile.h index 7cb568f8..22586d45 100644 --- a/taglib/flac/flacfile.h +++ b/taglib/flac/flacfile.h @@ -26,11 +26,10 @@ #ifndef TAGLIB_FLACFILE_H #define TAGLIB_FLACFILE_H -#include "taglib_export.h" #include "tfile.h" #include "tlist.h" +#include "taglib_export.h" #include "tag.h" - #include "flacpicture.h" #include "flacproperties.h" diff --git a/taglib/flac/flacmetadatablock.cpp b/taglib/flac/flacmetadatablock.cpp index 58a734aa..64829c82 100644 --- a/taglib/flac/flacmetadatablock.cpp +++ b/taglib/flac/flacmetadatablock.cpp @@ -24,8 +24,6 @@ ***************************************************************************/ #include "flacmetadatablock.h" -#include "taglib.h" -#include "tdebug.h" using namespace TagLib; diff --git a/taglib/flac/flacpicture.cpp b/taglib/flac/flacpicture.cpp index f995cb5a..af3cfaa4 100644 --- a/taglib/flac/flacpicture.cpp +++ b/taglib/flac/flacpicture.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ #include "flacpicture.h" -#include "taglib.h" + #include "tdebug.h" using namespace TagLib; diff --git a/taglib/flac/flacunknownmetadatablock.cpp b/taglib/flac/flacunknownmetadatablock.cpp index a3252572..3ac8fda5 100644 --- a/taglib/flac/flacunknownmetadatablock.cpp +++ b/taglib/flac/flacunknownmetadatablock.cpp @@ -24,9 +24,6 @@ ***************************************************************************/ #include "flacunknownmetadatablock.h" -#include "taglib.h" -#include "tdebug.h" -#include "tstring.h" using namespace TagLib; diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp index b1349a04..60defa45 100644 --- a/taglib/it/itfile.cpp +++ b/taglib/it/itfile.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "itfile.h" + #include "tstringlist.h" #include "tdebug.h" -#include "modfileprivate.h" #include "tpropertymap.h" +#include "modfileprivate.h" using namespace TagLib; using namespace IT; diff --git a/taglib/it/itfile.h b/taglib/it/itfile.h index 48094121..b4821dcd 100644 --- a/taglib/it/itfile.h +++ b/taglib/it/itfile.h @@ -23,8 +23,8 @@ #define TAGLIB_ITFILE_H #include "tfile.h" -#include "audioproperties.h" #include "taglib_export.h" +#include "audioproperties.h" #include "modfilebase.h" #include "modtag.h" #include "itproperties.h" diff --git a/taglib/it/itproperties.cpp b/taglib/it/itproperties.cpp index 5d121a7a..7413c317 100644 --- a/taglib/it/itproperties.cpp +++ b/taglib/it/itproperties.cpp @@ -23,7 +23,6 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "itproperties.h" using namespace TagLib; diff --git a/taglib/mod/modfile.cpp b/taglib/mod/modfile.cpp index 4af7952a..d73077a0 100644 --- a/taglib/mod/modfile.cpp +++ b/taglib/mod/modfile.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "modfile.h" + #include "tstringlist.h" #include "tdebug.h" -#include "modfileprivate.h" #include "tpropertymap.h" +#include "modfileprivate.h" using namespace TagLib; using namespace Mod; diff --git a/taglib/mod/modfile.h b/taglib/mod/modfile.h index 7ed87eb3..860cfcaa 100644 --- a/taglib/mod/modfile.h +++ b/taglib/mod/modfile.h @@ -27,8 +27,8 @@ #define TAGLIB_MODFILE_H #include "tfile.h" -#include "audioproperties.h" #include "taglib_export.h" +#include "audioproperties.h" #include "modfilebase.h" #include "modtag.h" #include "modproperties.h" diff --git a/taglib/mod/modfilebase.cpp b/taglib/mod/modfilebase.cpp index 708f85fc..aa6a3a0a 100644 --- a/taglib/mod/modfilebase.cpp +++ b/taglib/mod/modfilebase.cpp @@ -23,9 +23,7 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "modfilebase.h" -#include "tdebug.h" using namespace TagLib; using namespace Mod; diff --git a/taglib/mod/modproperties.cpp b/taglib/mod/modproperties.cpp index 9ee285c4..33037a27 100644 --- a/taglib/mod/modproperties.cpp +++ b/taglib/mod/modproperties.cpp @@ -23,7 +23,6 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "modproperties.h" using namespace TagLib; diff --git a/taglib/mod/modtag.cpp b/taglib/mod/modtag.cpp index 9c648153..3d5677b8 100644 --- a/taglib/mod/modtag.cpp +++ b/taglib/mod/modtag.cpp @@ -23,13 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "modtag.h" -#include "tstringlist.h" -#include "tpropertymap.h" #include +#include "tstringlist.h" +#include "tpropertymap.h" + using namespace TagLib; using namespace Mod; diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp index eae79613..0974b88e 100644 --- a/taglib/mp4/mp4atom.cpp +++ b/taglib/mp4/mp4atom.cpp @@ -29,7 +29,6 @@ #include #include "tdebug.h" -#include "tstring.h" using namespace TagLib; diff --git a/taglib/mp4/mp4atom.h b/taglib/mp4/mp4atom.h index b3e4ad44..48e80a8e 100644 --- a/taglib/mp4/mp4atom.h +++ b/taglib/mp4/mp4atom.h @@ -28,11 +28,11 @@ #ifndef TAGLIB_MP4ATOM_H #define TAGLIB_MP4ATOM_H +#include + #include "tfile.h" #include "tlist.h" -#include - #ifndef DO_NOT_DOCUMENT namespace TagLib { diff --git a/taglib/mp4/mp4coverart.cpp b/taglib/mp4/mp4coverart.cpp index a563b182..c4c8039a 100644 --- a/taglib/mp4/mp4coverart.cpp +++ b/taglib/mp4/mp4coverart.cpp @@ -24,8 +24,6 @@ ***************************************************************************/ #include "mp4coverart.h" -#include "taglib.h" -#include "tdebug.h" using namespace TagLib; diff --git a/taglib/mp4/mp4file.cpp b/taglib/mp4/mp4file.cpp index cf42694f..9ed8a197 100644 --- a/taglib/mp4/mp4file.cpp +++ b/taglib/mp4/mp4file.cpp @@ -26,7 +26,6 @@ #include "mp4file.h" #include "tdebug.h" -#include "tstring.h" #include "tpropertymap.h" #include "tagutils.h" diff --git a/taglib/mp4/mp4file.h b/taglib/mp4/mp4file.h index 4af06941..76cd95cf 100644 --- a/taglib/mp4/mp4file.h +++ b/taglib/mp4/mp4file.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_MP4FILE_H #define TAGLIB_MP4FILE_H -#include "mp4tag.h" -#include "tag.h" #include "tfile.h" #include "taglib_export.h" +#include "mp4tag.h" +#include "tag.h" #include "mp4properties.h" namespace TagLib { diff --git a/taglib/mp4/mp4item.cpp b/taglib/mp4/mp4item.cpp index a2061776..2e14fba8 100644 --- a/taglib/mp4/mp4item.cpp +++ b/taglib/mp4/mp4item.cpp @@ -24,8 +24,6 @@ ***************************************************************************/ #include "mp4item.h" -#include "taglib.h" -#include "tdebug.h" using namespace TagLib; diff --git a/taglib/mp4/mp4item.h b/taglib/mp4/mp4item.h index 28492bb4..b54985be 100644 --- a/taglib/mp4/mp4item.h +++ b/taglib/mp4/mp4item.h @@ -27,8 +27,8 @@ #define TAGLIB_MP4ITEM_H #include "tstringlist.h" -#include "mp4coverart.h" #include "taglib_export.h" +#include "mp4coverart.h" namespace TagLib { namespace MP4 { diff --git a/taglib/mp4/mp4properties.cpp b/taglib/mp4/mp4properties.cpp index 53a25740..6aa80d2c 100644 --- a/taglib/mp4/mp4properties.cpp +++ b/taglib/mp4/mp4properties.cpp @@ -24,6 +24,7 @@ ***************************************************************************/ #include "mp4properties.h" + #include "tdebug.h" #include "tstring.h" #include "mp4file.h" diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp index f6f927f5..1cfbbacb 100644 --- a/taglib/mp4/mp4tag.cpp +++ b/taglib/mp4/mp4tag.cpp @@ -24,15 +24,15 @@ ***************************************************************************/ #include "mp4tag.h" -#include "tdebug.h" -#include "tstring.h" -#include "tpropertymap.h" -#include "mp4atom.h" -#include "id3v1genres.h" #include #include +#include "tdebug.h" +#include "tpropertymap.h" +#include "id3v1genres.h" +#include "mp4atom.h" + using namespace TagLib; class MP4::Tag::TagPrivate diff --git a/taglib/mp4/mp4tag.h b/taglib/mp4/mp4tag.h index aeba05f4..7e3112d4 100644 --- a/taglib/mp4/mp4tag.h +++ b/taglib/mp4/mp4tag.h @@ -26,12 +26,12 @@ #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 "tag.h" #include "mp4atom.h" #include "mp4item.h" diff --git a/taglib/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp index f7d61218..75e8b82c 100644 --- a/taglib/mpc/mpcfile.cpp +++ b/taglib/mpc/mpcfile.cpp @@ -25,13 +25,10 @@ #include "mpcfile.h" -#include "tbytevector.h" -#include "tstring.h" -#include "tagunion.h" #include "tdebug.h" #include "tpropertymap.h" +#include "tagunion.h" #include "tagutils.h" - #include "id3v1tag.h" #include "id3v2header.h" #include "apetag.h" diff --git a/taglib/mpc/mpcfile.h b/taglib/mpc/mpcfile.h index 59810adb..a7de62c5 100644 --- a/taglib/mpc/mpcfile.h +++ b/taglib/mpc/mpcfile.h @@ -26,13 +26,11 @@ #ifndef TAGLIB_MPCFILE_H #define TAGLIB_MPCFILE_H -#include "taglib_export.h" #include "tfile.h" -#include "tag.h" - -#include "mpcproperties.h" - #include "tlist.h" +#include "taglib_export.h" +#include "tag.h" +#include "mpcproperties.h" namespace TagLib { diff --git a/taglib/mpc/mpcproperties.cpp b/taglib/mpc/mpcproperties.cpp index a1d45a57..b90b24c4 100644 --- a/taglib/mpc/mpcproperties.cpp +++ b/taglib/mpc/mpcproperties.cpp @@ -25,12 +25,11 @@ #include "mpcproperties.h" -#include "tdebug.h" -#include "tstring.h" #include -#include #include +#include "tdebug.h" +#include "tstring.h" #include "mpcfile.h" using namespace TagLib; diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp index ce18a185..7cc107a2 100644 --- a/taglib/mpeg/id3v1/id3v1tag.cpp +++ b/taglib/mpeg/id3v1/id3v1tag.cpp @@ -27,7 +27,6 @@ #include "tdebug.h" #include "tfile.h" - #include "id3v1genres.h" using namespace TagLib; diff --git a/taglib/mpeg/id3v1/id3v1tag.h b/taglib/mpeg/id3v1/id3v1tag.h index fd478a9b..56cdbedd 100644 --- a/taglib/mpeg/id3v1/id3v1tag.h +++ b/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 "tag.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/attachedpictureframe.h b/taglib/mpeg/id3v2/frames/attachedpictureframe.h index caaf07a7..3d062e76 100644 --- a/taglib/mpeg/id3v2/frames/attachedpictureframe.h +++ b/taglib/mpeg/id3v2/frames/attachedpictureframe.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ATTACHEDPICTUREFRAME_H #define TAGLIB_ATTACHEDPICTUREFRAME_H +#include "taglib_export.h" #include "id3v2frame.h" #include "id3v2header.h" -#include "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/chapterframe.cpp b/taglib/mpeg/id3v2/frames/chapterframe.cpp index ea311844..22a90f06 100644 --- a/taglib/mpeg/id3v2/frames/chapterframe.cpp +++ b/taglib/mpeg/id3v2/frames/chapterframe.cpp @@ -25,11 +25,11 @@ #include "chapterframe.h" +#include + #include "tbytevectorlist.h" #include "tdebug.h" #include "tpropertymap.h" -#include -#include using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/chapterframe.h b/taglib/mpeg/id3v2/frames/chapterframe.h index a229e319..2e659f12 100644 --- a/taglib/mpeg/id3v2/frames/chapterframe.h +++ b/taglib/mpeg/id3v2/frames/chapterframe.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_CHAPTERFRAME #define TAGLIB_CHAPTERFRAME +#include "taglib_export.h" #include "id3v2tag.h" #include "id3v2frame.h" -#include "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/commentsframe.cpp b/taglib/mpeg/id3v2/frames/commentsframe.cpp index f700705d..326c0f15 100644 --- a/taglib/mpeg/id3v2/frames/commentsframe.cpp +++ b/taglib/mpeg/id3v2/frames/commentsframe.cpp @@ -28,11 +28,10 @@ #include #include "tbytevectorlist.h" -#include "id3v2tag.h" #include "tdebug.h" #include "tstringlist.h" - #include "tpropertymap.h" +#include "id3v2tag.h" using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/commentsframe.h b/taglib/mpeg/id3v2/frames/commentsframe.h index 9119a683..2c8741e6 100644 --- a/taglib/mpeg/id3v2/frames/commentsframe.h +++ b/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 "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp index 4f7dcce1..0970d569 100644 --- a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp +++ b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp @@ -24,13 +24,14 @@ ***************************************************************************/ #include "eventtimingcodesframe.h" -#include "tbytevectorlist.h" -#include "id3v2tag.h" -#include "tdebug.h" -#include "tpropertymap.h" #include +#include "tbytevectorlist.h" +#include "tdebug.h" +#include "tpropertymap.h" +#include "id3v2tag.h" + using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h b/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h index 9a20b476..458eeee2 100644 --- a/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h +++ b/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 "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h index 01e44f77..38566cbe 100644 --- a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h +++ b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h @@ -29,9 +29,9 @@ #ifndef TAGLIB_GENERALENCAPSULATEDOBJECT_H #define TAGLIB_GENERALENCAPSULATEDOBJECT_H +#include "taglib_export.h" #include "id3v2frame.h" #include "id3v2header.h" -#include "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/ownershipframe.cpp b/taglib/mpeg/id3v2/frames/ownershipframe.cpp index 0af4b5fc..77f73739 100644 --- a/taglib/mpeg/id3v2/frames/ownershipframe.cpp +++ b/taglib/mpeg/id3v2/frames/ownershipframe.cpp @@ -25,7 +25,6 @@ #include "ownershipframe.h" -#include "tdebug.h" #include "tstringlist.h" #include "id3v2tag.h" diff --git a/taglib/mpeg/id3v2/frames/ownershipframe.h b/taglib/mpeg/id3v2/frames/ownershipframe.h index 12211c75..8188fade 100644 --- a/taglib/mpeg/id3v2/frames/ownershipframe.h +++ b/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 "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/podcastframe.cpp b/taglib/mpeg/id3v2/frames/podcastframe.cpp index b45653e1..be668a04 100644 --- a/taglib/mpeg/id3v2/frames/podcastframe.cpp +++ b/taglib/mpeg/id3v2/frames/podcastframe.cpp @@ -24,6 +24,7 @@ ***************************************************************************/ #include "podcastframe.h" + #include "tpropertymap.h" using namespace TagLib; diff --git a/taglib/mpeg/id3v2/frames/podcastframe.h b/taglib/mpeg/id3v2/frames/podcastframe.h index 4fdc8e21..293e61b9 100644 --- a/taglib/mpeg/id3v2/frames/podcastframe.h +++ b/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 "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/popularimeterframe.cpp b/taglib/mpeg/id3v2/frames/popularimeterframe.cpp index abef8c6b..924ba5b9 100644 --- a/taglib/mpeg/id3v2/frames/popularimeterframe.cpp +++ b/taglib/mpeg/id3v2/frames/popularimeterframe.cpp @@ -25,8 +25,6 @@ #include "popularimeterframe.h" -#include "tdebug.h" - using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/popularimeterframe.h b/taglib/mpeg/id3v2/frames/popularimeterframe.h index a52f6036..84d49982 100644 --- a/taglib/mpeg/id3v2/frames/popularimeterframe.h +++ b/taglib/mpeg/id3v2/frames/popularimeterframe.h @@ -27,8 +27,8 @@ #ifndef TAGLIB_POPULARIMETERFRAME_H #define TAGLIB_POPULARIMETERFRAME_H -#include "id3v2frame.h" #include "taglib_export.h" +#include "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/privateframe.cpp b/taglib/mpeg/id3v2/frames/privateframe.cpp index cbff9d57..3f56c378 100644 --- a/taglib/mpeg/id3v2/frames/privateframe.cpp +++ b/taglib/mpeg/id3v2/frames/privateframe.cpp @@ -27,8 +27,8 @@ #include "privateframe.h" #include "tbytevectorlist.h" -#include "id3v2tag.h" #include "tdebug.h" +#include "id3v2tag.h" using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/privateframe.h b/taglib/mpeg/id3v2/frames/privateframe.h index fc57c562..c04b8200 100644 --- a/taglib/mpeg/id3v2/frames/privateframe.h +++ b/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 "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp b/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp index 7af54ce2..52a31ec3 100644 --- a/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp +++ b/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp @@ -25,11 +25,10 @@ #include "relativevolumeframe.h" -#include "tdebug.h" -#include "tmap.h" - #include +#include "tmap.h" + using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/relativevolumeframe.h b/taglib/mpeg/id3v2/frames/relativevolumeframe.h index 40d7a6ae..a8eb3289 100644 --- a/taglib/mpeg/id3v2/frames/relativevolumeframe.h +++ b/taglib/mpeg/id3v2/frames/relativevolumeframe.h @@ -27,8 +27,8 @@ #define TAGLIB_RELATIVEVOLUMEFRAME_H #include "tlist.h" -#include "id3v2frame.h" #include "taglib_export.h" +#include "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp b/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp index 7c4adef4..3a8b6f08 100644 --- a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp +++ b/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp @@ -24,13 +24,14 @@ ***************************************************************************/ #include "synchronizedlyricsframe.h" -#include "tbytevectorlist.h" -#include "id3v2tag.h" -#include "tdebug.h" -#include "tpropertymap.h" #include +#include "tbytevectorlist.h" +#include "tdebug.h" +#include "tpropertymap.h" +#include "id3v2tag.h" + using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h b/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h index c0034254..5fe8b7f3 100644 --- a/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h +++ b/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 "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp index befcebda..831f7ca5 100644 --- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp +++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp @@ -27,12 +27,9 @@ #include -#include "tbytevectorlist.h" #include "tpropertymap.h" #include "tdebug.h" -#include - using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.h b/taglib/mpeg/id3v2/frames/tableofcontentsframe.h index eb3a95e6..5ed2b86f 100644 --- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.h +++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.h @@ -26,11 +26,10 @@ #ifndef TAGLIB_TABLEOFCONTENTSFRAME #define TAGLIB_TABLEOFCONTENTSFRAME +#include "tbytevectorlist.h" #include "id3v2tag.h" #include "id3v2frame.h" -#include "tbytevectorlist.h" - namespace TagLib { namespace ID3v2 { diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp index d37eea4a..409cbbdd 100644 --- a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp +++ b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp @@ -24,14 +24,14 @@ ***************************************************************************/ #include "textidentificationframe.h" -#include "tbytevectorlist.h" -#include "id3v2tag.h" -#include "tpropertymap.h" -#include "id3v1genres.h" #include #include +#include "tpropertymap.h" +#include "id3v1genres.h" +#include "id3v2tag.h" + using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.h b/taglib/mpeg/id3v2/frames/textidentificationframe.h index 5314a7c5..2746105f 100644 --- a/taglib/mpeg/id3v2/frames/textidentificationframe.h +++ b/taglib/mpeg/id3v2/frames/textidentificationframe.h @@ -29,7 +29,6 @@ #include "tstringlist.h" #include "tmap.h" #include "taglib_export.h" - #include "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp index ad9b19b5..1d5591a3 100644 --- a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp +++ b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp @@ -30,7 +30,6 @@ #include "tbytevectorlist.h" #include "tpropertymap.h" #include "tdebug.h" - #include "id3v2tag.h" using namespace TagLib; diff --git a/taglib/mpeg/id3v2/frames/unknownframe.h b/taglib/mpeg/id3v2/frames/unknownframe.h index 7d8e2e15..05b9c9e2 100644 --- a/taglib/mpeg/id3v2/frames/unknownframe.h +++ b/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 "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp index f8129e9f..ec7d425b 100644 --- a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp +++ b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp @@ -27,11 +27,13 @@ ***************************************************************************/ #include "unsynchronizedlyricsframe.h" + #include + #include "tbytevectorlist.h" -#include "id3v2tag.h" #include "tdebug.h" #include "tpropertymap.h" +#include "id3v2tag.h" using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/urllinkframe.cpp b/taglib/mpeg/id3v2/frames/urllinkframe.cpp index 65189d87..c5a3f7fd 100644 --- a/taglib/mpeg/id3v2/frames/urllinkframe.cpp +++ b/taglib/mpeg/id3v2/frames/urllinkframe.cpp @@ -27,11 +27,13 @@ ***************************************************************************/ #include "urllinkframe.h" + #include -#include "id3v2tag.h" + #include "tdebug.h" #include "tstringlist.h" #include "tpropertymap.h" +#include "id3v2tag.h" using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/id3v2extendedheader.cpp b/taglib/mpeg/id3v2/id3v2extendedheader.cpp index 39b0563f..01999818 100644 --- a/taglib/mpeg/id3v2/id3v2extendedheader.cpp +++ b/taglib/mpeg/id3v2/id3v2extendedheader.cpp @@ -24,6 +24,7 @@ ***************************************************************************/ #include "id3v2extendedheader.h" + #include "id3v2synchdata.h" using namespace TagLib; diff --git a/taglib/mpeg/id3v2/id3v2extendedheader.h b/taglib/mpeg/id3v2/id3v2extendedheader.h index 6d075f35..9d5bd102 100644 --- a/taglib/mpeg/id3v2/id3v2extendedheader.h +++ b/taglib/mpeg/id3v2/id3v2extendedheader.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_ID3V2EXTENDEDHEADER_H #define TAGLIB_ID3V2EXTENDEDHEADER_H -#include "taglib_export.h" #include "tbytevector.h" +#include "taglib_export.h" #include "taglib.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/id3v2footer.cpp b/taglib/mpeg/id3v2/id3v2footer.cpp index 2eb14807..a7a312c2 100644 --- a/taglib/mpeg/id3v2/id3v2footer.cpp +++ b/taglib/mpeg/id3v2/id3v2footer.cpp @@ -24,6 +24,7 @@ ***************************************************************************/ #include "id3v2footer.h" + #include "id3v2header.h" using namespace TagLib; diff --git a/taglib/mpeg/id3v2/id3v2footer.h b/taglib/mpeg/id3v2/id3v2footer.h index a36ba107..94dc434b 100644 --- a/taglib/mpeg/id3v2/id3v2footer.h +++ b/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 "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp index af7db1b5..267dd67d 100644 --- a/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/taglib/mpeg/id3v2/id3v2frame.cpp @@ -31,11 +31,9 @@ #include "tdebug.h" #include "tstringlist.h" #include "tzlib.h" - +#include "tpropertymap.h" #include "id3v2tag.h" #include "id3v2synchdata.h" - -#include "tpropertymap.h" #include "frames/textidentificationframe.h" #include "frames/urllinkframe.h" #include "frames/unsynchronizedlyricsframe.h" diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index 6431d0e4..ac14750e 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -25,12 +25,13 @@ #include "id3v2framefactory.h" +#include +#include + #include "tdebug.h" #include "tzlib.h" - #include "id3v2synchdata.h" #include "id3v1genres.h" - #include "frames/attachedpictureframe.h" #include "frames/commentsframe.h" #include "frames/relativevolumeframe.h" @@ -49,9 +50,6 @@ #include "frames/tableofcontentsframe.h" #include "frames/podcastframe.h" -#include -#include - using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/id3v2framefactory.h b/taglib/mpeg/id3v2/id3v2framefactory.h index 39db8c4e..17bdc2a1 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.h +++ b/taglib/mpeg/id3v2/id3v2framefactory.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_ID3V2FRAMEFACTORY_H #define TAGLIB_ID3V2FRAMEFACTORY_H -#include "taglib_export.h" #include "tbytevector.h" +#include "taglib_export.h" #include "id3v2frame.h" #include "id3v2header.h" diff --git a/taglib/mpeg/id3v2/id3v2header.cpp b/taglib/mpeg/id3v2/id3v2header.cpp index a210268c..827a6630 100644 --- a/taglib/mpeg/id3v2/id3v2header.cpp +++ b/taglib/mpeg/id3v2/id3v2header.cpp @@ -25,12 +25,10 @@ #include "id3v2header.h" -#include #include #include "tstring.h" #include "tdebug.h" - #include "id3v2footer.h" #include "id3v2synchdata.h" diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp index 81b5428a..ca38ac55 100644 --- a/taglib/mpeg/id3v2/id3v2tag.cpp +++ b/taglib/mpeg/id3v2/id3v2tag.cpp @@ -28,17 +28,14 @@ #include #include -#include "tfile.h" -#include "tbytevector.h" -#include "tpropertymap.h" #include "tdebug.h" - +#include "tfile.h" +#include "tpropertymap.h" #include "id3v2header.h" #include "id3v2extendedheader.h" #include "id3v2footer.h" #include "id3v2synchdata.h" #include "id3v1genres.h" - #include "frames/textidentificationframe.h" #include "frames/commentsframe.h" #include "frames/urllinkframe.h" diff --git a/taglib/mpeg/id3v2/id3v2tag.h b/taglib/mpeg/id3v2/id3v2tag.h index e50bef35..d1e1f1bd 100644 --- a/taglib/mpeg/id3v2/id3v2tag.h +++ b/taglib/mpeg/id3v2/id3v2tag.h @@ -26,13 +26,12 @@ #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 "tag.h" #include "id3v2.h" #include "id3v2framefactory.h" diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp index e0cfe0a0..3ec6c771 100644 --- a/taglib/mpeg/mpegfile.cpp +++ b/taglib/mpeg/mpegfile.cpp @@ -25,18 +25,16 @@ #include "mpegfile.h" -#include "tagunion.h" -#include "tagutils.h" -#include "id3v2tag.h" -#include "id3v2header.h" -#include "id3v1tag.h" +#include "tdebug.h" +#include "tpropertymap.h" #include "apefooter.h" #include "apetag.h" -#include "tdebug.h" - +#include "id3v1tag.h" +#include "id3v2tag.h" +#include "tagunion.h" +#include "tagutils.h" #include "mpegheader.h" #include "mpegutils.h" -#include "tpropertymap.h" using namespace TagLib; diff --git a/taglib/mpeg/mpegfile.h b/taglib/mpeg/mpegfile.h index cf26a3bf..02f3e8ad 100644 --- a/taglib/mpeg/mpegfile.h +++ b/taglib/mpeg/mpegfile.h @@ -26,12 +26,10 @@ #ifndef TAGLIB_MPEGFILE_H #define TAGLIB_MPEGFILE_H -#include "taglib_export.h" #include "tfile.h" +#include "taglib_export.h" #include "tag.h" - #include "mpegproperties.h" - #include "id3v2.h" namespace TagLib { diff --git a/taglib/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp index b87826fa..4a4d25cb 100644 --- a/taglib/mpeg/mpegheader.cpp +++ b/taglib/mpeg/mpegheader.cpp @@ -25,15 +25,13 @@ #include "mpegheader.h" +#include + #include "tbytevector.h" #include "tdebug.h" #include "tfile.h" -#include "tstring.h" - #include "mpegutils.h" -#include - using namespace TagLib; class MPEG::Header::HeaderPrivate diff --git a/taglib/mpeg/mpegheader.h b/taglib/mpeg/mpegheader.h index 45156f47..bba706a3 100644 --- a/taglib/mpeg/mpegheader.h +++ b/taglib/mpeg/mpegheader.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_MPEGHEADER_H #define TAGLIB_MPEGHEADER_H +#include + #include "taglib.h" #include "taglib_export.h" -#include - namespace TagLib { class ByteVector; diff --git a/taglib/mpeg/mpegproperties.cpp b/taglib/mpeg/mpegproperties.cpp index 0424ee8d..be7da4de 100644 --- a/taglib/mpeg/mpegproperties.cpp +++ b/taglib/mpeg/mpegproperties.cpp @@ -26,8 +26,6 @@ #include "mpegproperties.h" #include "tdebug.h" -#include "tstring.h" - #include "mpegfile.h" #include "xingheader.h" #include "apetag.h" diff --git a/taglib/mpeg/mpegproperties.h b/taglib/mpeg/mpegproperties.h index dbd9c56f..d22df33b 100644 --- a/taglib/mpeg/mpegproperties.h +++ b/taglib/mpeg/mpegproperties.h @@ -28,7 +28,6 @@ #include "taglib_export.h" #include "audioproperties.h" - #include "mpegheader.h" namespace TagLib { diff --git a/taglib/mpeg/xingheader.cpp b/taglib/mpeg/xingheader.cpp index c016c14a..72914345 100644 --- a/taglib/mpeg/xingheader.cpp +++ b/taglib/mpeg/xingheader.cpp @@ -29,8 +29,6 @@ #include "tstring.h" #include "tdebug.h" -#include "mpegfile.h" - using namespace TagLib; class MPEG::XingHeader::XingHeaderPrivate diff --git a/taglib/mpeg/xingheader.h b/taglib/mpeg/xingheader.h index 0488600c..83a4f665 100644 --- a/taglib/mpeg/xingheader.h +++ b/taglib/mpeg/xingheader.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_XINGHEADER_H #define TAGLIB_XINGHEADER_H -#include "mpegheader.h" -#include "taglib_export.h" - #include +#include "taglib_export.h" +#include "mpegheader.h" + namespace TagLib { class ByteVector; diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp index 66671dc0..6eaa0e9e 100644 --- a/taglib/ogg/flac/oggflacfile.cpp +++ b/taglib/ogg/flac/oggflacfile.cpp @@ -25,14 +25,10 @@ #include "oggflacfile.h" -#include "tbytevector.h" -#include "tstring.h" #include "tdebug.h" #include "tpropertymap.h" #include "tagutils.h" -#include "xiphcomment.h" - using namespace TagLib; using TagLib::FLAC::Properties; diff --git a/taglib/ogg/flac/oggflacfile.h b/taglib/ogg/flac/oggflacfile.h index f543ea6c..4d40f4ff 100644 --- a/taglib/ogg/flac/oggflacfile.h +++ b/taglib/ogg/flac/oggflacfile.h @@ -29,7 +29,6 @@ #include "taglib_export.h" #include "oggfile.h" #include "xiphcomment.h" - #include "flacproperties.h" namespace TagLib { diff --git a/taglib/ogg/oggfile.cpp b/taglib/ogg/oggfile.cpp index e36b355f..73019513 100644 --- a/taglib/ogg/oggfile.cpp +++ b/taglib/ogg/oggfile.cpp @@ -25,16 +25,13 @@ #include "oggfile.h" -#include "tbytevectorlist.h" -#include "tmap.h" -#include "tstring.h" -#include "tdebug.h" +#include +#include "tdebug.h" +#include "tmap.h" #include "oggpage.h" #include "oggpageheader.h" -#include - using namespace TagLib; namespace diff --git a/taglib/ogg/oggfile.h b/taglib/ogg/oggfile.h index 3e5d717d..f7773bf5 100644 --- a/taglib/ogg/oggfile.h +++ b/taglib/ogg/oggfile.h @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "taglib_export.h" #include "tfile.h" #include "tbytevectorlist.h" +#include "taglib_export.h" #ifndef TAGLIB_OGGFILE_H #define TAGLIB_OGGFILE_H diff --git a/taglib/ogg/oggpage.cpp b/taglib/ogg/oggpage.cpp index e6e1f6e6..5727253d 100644 --- a/taglib/ogg/oggpage.cpp +++ b/taglib/ogg/oggpage.cpp @@ -31,7 +31,6 @@ #include "tstring.h" #include "tdebug.h" - #include "oggpageheader.h" #include "oggfile.h" diff --git a/taglib/ogg/oggpage.h b/taglib/ogg/oggpage.h index b72d59ec..e9b9499b 100644 --- a/taglib/ogg/oggpage.h +++ b/taglib/ogg/oggpage.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_OGGPAGE_H #define TAGLIB_OGGPAGE_H -#include "taglib_export.h" #include "tbytevectorlist.h" +#include "taglib_export.h" namespace TagLib { diff --git a/taglib/ogg/oggpageheader.cpp b/taglib/ogg/oggpageheader.cpp index 03121547..32564e61 100644 --- a/taglib/ogg/oggpageheader.cpp +++ b/taglib/ogg/oggpageheader.cpp @@ -27,10 +27,8 @@ #include -#include "tstring.h" #include "tdebug.h" -#include "taglib.h" - +#include "tstring.h" #include "oggfile.h" using namespace TagLib; diff --git a/taglib/ogg/opus/opusfile.cpp b/taglib/ogg/opus/opusfile.cpp index 261dd7ea..f953eaa0 100644 --- a/taglib/ogg/opus/opusfile.cpp +++ b/taglib/ogg/opus/opusfile.cpp @@ -29,7 +29,6 @@ #include "opusfile.h" -#include "tstring.h" #include "tdebug.h" #include "tpropertymap.h" #include "tagutils.h" diff --git a/taglib/ogg/opus/opusfile.h b/taglib/ogg/opus/opusfile.h index 0156f1d7..a209bef8 100644 --- a/taglib/ogg/opus/opusfile.h +++ b/taglib/ogg/opus/opusfile.h @@ -32,7 +32,6 @@ #include "oggfile.h" #include "xiphcomment.h" - #include "opusproperties.h" namespace TagLib { diff --git a/taglib/ogg/opus/opusproperties.cpp b/taglib/ogg/opus/opusproperties.cpp index 01ba4a69..88b080a7 100644 --- a/taglib/ogg/opus/opusproperties.cpp +++ b/taglib/ogg/opus/opusproperties.cpp @@ -31,9 +31,7 @@ #include "tstring.h" #include "tdebug.h" - #include "oggpageheader.h" - #include "opusfile.h" using namespace TagLib; diff --git a/taglib/ogg/speex/speexfile.cpp b/taglib/ogg/speex/speexfile.cpp index 337665d4..6346147d 100644 --- a/taglib/ogg/speex/speexfile.cpp +++ b/taglib/ogg/speex/speexfile.cpp @@ -29,7 +29,6 @@ #include "speexfile.h" -#include "tstring.h" #include "tdebug.h" #include "tpropertymap.h" #include "tagutils.h" diff --git a/taglib/ogg/speex/speexfile.h b/taglib/ogg/speex/speexfile.h index 919f6233..e3176fe2 100644 --- a/taglib/ogg/speex/speexfile.h +++ b/taglib/ogg/speex/speexfile.h @@ -32,7 +32,6 @@ #include "oggfile.h" #include "xiphcomment.h" - #include "speexproperties.h" namespace TagLib { diff --git a/taglib/ogg/speex/speexproperties.cpp b/taglib/ogg/speex/speexproperties.cpp index 20983a37..2521ecbf 100644 --- a/taglib/ogg/speex/speexproperties.cpp +++ b/taglib/ogg/speex/speexproperties.cpp @@ -31,9 +31,7 @@ #include "tstring.h" #include "tdebug.h" - #include "oggpageheader.h" - #include "speexfile.h" using namespace TagLib; diff --git a/taglib/ogg/vorbis/vorbisfile.cpp b/taglib/ogg/vorbis/vorbisfile.cpp index 7bbc50cf..ba10be31 100644 --- a/taglib/ogg/vorbis/vorbisfile.cpp +++ b/taglib/ogg/vorbis/vorbisfile.cpp @@ -25,9 +25,6 @@ #include "vorbisfile.h" -#include - -#include "tstring.h" #include "tdebug.h" #include "tpropertymap.h" #include "tagutils.h" diff --git a/taglib/ogg/vorbis/vorbisfile.h b/taglib/ogg/vorbis/vorbisfile.h index 40279de2..adf1c46f 100644 --- a/taglib/ogg/vorbis/vorbisfile.h +++ b/taglib/ogg/vorbis/vorbisfile.h @@ -29,7 +29,6 @@ #include "taglib_export.h" #include "oggfile.h" #include "xiphcomment.h" - #include "vorbisproperties.h" namespace TagLib { diff --git a/taglib/ogg/vorbis/vorbisproperties.cpp b/taglib/ogg/vorbis/vorbisproperties.cpp index 794cf665..7e34b101 100644 --- a/taglib/ogg/vorbis/vorbisproperties.cpp +++ b/taglib/ogg/vorbis/vorbisproperties.cpp @@ -27,9 +27,7 @@ #include "tstring.h" #include "tdebug.h" - #include "oggpageheader.h" - #include "vorbisfile.h" using namespace TagLib; diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp index d1ea5a82..e1ccb129 100644 --- a/taglib/ogg/xiphcomment.cpp +++ b/taglib/ogg/xiphcomment.cpp @@ -25,14 +25,11 @@ #include "xiphcomment.h" -#include "tbytevector.h" -#include "tdebug.h" - -#include "flacpicture.h" -#include "tpropertymap.h" - #include +#include "tdebug.h" +#include "tpropertymap.h" + using namespace TagLib; class Ogg::XiphComment::XiphCommentPrivate diff --git a/taglib/ogg/xiphcomment.h b/taglib/ogg/xiphcomment.h index eb1a8dab..1aac1650 100644 --- a/taglib/ogg/xiphcomment.h +++ b/taglib/ogg/xiphcomment.h @@ -26,14 +26,14 @@ #ifndef TAGLIB_VORBISCOMMENT_H #define TAGLIB_VORBISCOMMENT_H -#include "tag.h" #include "tlist.h" #include "tmap.h" #include "tstring.h" #include "tstringlist.h" #include "tbytevector.h" -#include "flacpicture.h" #include "taglib_export.h" +#include "tag.h" +#include "flacpicture.h" #ifdef _MSC_VER // Explained at end of tpropertymap.cpp diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp index 963f1580..7dbae1d5 100644 --- a/taglib/riff/aiff/aifffile.cpp +++ b/taglib/riff/aiff/aifffile.cpp @@ -25,10 +25,7 @@ #include "aifffile.h" -#include "tbytevector.h" #include "tdebug.h" -#include "id3v2tag.h" -#include "tstringlist.h" #include "tpropertymap.h" #include "tagutils.h" diff --git a/taglib/riff/aiff/aiffproperties.h b/taglib/riff/aiff/aiffproperties.h index 28983144..a81236ab 100644 --- a/taglib/riff/aiff/aiffproperties.h +++ b/taglib/riff/aiff/aiffproperties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_AIFFPROPERTIES_H #define TAGLIB_AIFFPROPERTIES_H -#include "audioproperties.h" #include "tstring.h" +#include "audioproperties.h" namespace TagLib { diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp index 9572901d..f24a1ec6 100644 --- a/taglib/riff/rifffile.cpp +++ b/taglib/riff/rifffile.cpp @@ -28,10 +28,7 @@ #include #include -#include "tbytevector.h" #include "tdebug.h" -#include "tstring.h" - #include "riffutils.h" using namespace TagLib; diff --git a/taglib/riff/rifffile.h b/taglib/riff/rifffile.h index 6d8a6bf5..b68be4a6 100644 --- a/taglib/riff/rifffile.h +++ b/taglib/riff/rifffile.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_RIFFFILE_H #define TAGLIB_RIFFFILE_H -#include "taglib_export.h" #include "tfile.h" +#include "taglib_export.h" namespace TagLib { diff --git a/taglib/riff/wav/infotag.cpp b/taglib/riff/wav/infotag.cpp index 5f5aa9ef..6caedc29 100644 --- a/taglib/riff/wav/infotag.cpp +++ b/taglib/riff/wav/infotag.cpp @@ -25,13 +25,10 @@ #include "infotag.h" -#include "tdebug.h" -#include "tfile.h" +#include #include "riffutils.h" -#include - using namespace TagLib; using namespace RIFF::Info; diff --git a/taglib/riff/wav/infotag.h b/taglib/riff/wav/infotag.h index e25236d5..78f9bd05 100644 --- a/taglib/riff/wav/infotag.h +++ b/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 "tag.h" namespace TagLib { diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp index fdffb17a..e9211ff9 100644 --- a/taglib/riff/wav/wavfile.cpp +++ b/taglib/riff/wav/wavfile.cpp @@ -25,13 +25,9 @@ #include "wavfile.h" -#include "tbytevector.h" #include "tdebug.h" -#include "tstringlist.h" #include "tpropertymap.h" #include "tagutils.h" - -#include "id3v2tag.h" #include "infotag.h" #include "tagunion.h" diff --git a/taglib/riff/wav/wavproperties.cpp b/taglib/riff/wav/wavproperties.cpp index 71f8ca63..82f9c9e0 100644 --- a/taglib/riff/wav/wavproperties.cpp +++ b/taglib/riff/wav/wavproperties.cpp @@ -24,6 +24,7 @@ ***************************************************************************/ #include "wavproperties.h" + #include "tdebug.h" #include "wavfile.h" diff --git a/taglib/s3m/s3mfile.cpp b/taglib/s3m/s3mfile.cpp index 7ab3ea16..c02bca6a 100644 --- a/taglib/s3m/s3mfile.cpp +++ b/taglib/s3m/s3mfile.cpp @@ -25,12 +25,11 @@ #include "s3mfile.h" + #include "tstringlist.h" #include "tdebug.h" -#include "modfileprivate.h" #include "tpropertymap.h" - -#include +#include "modfileprivate.h" using namespace TagLib; using namespace S3M; diff --git a/taglib/s3m/s3mfile.h b/taglib/s3m/s3mfile.h index 2eaa723f..6dfa14b2 100644 --- a/taglib/s3m/s3mfile.h +++ b/taglib/s3m/s3mfile.h @@ -27,8 +27,8 @@ #define TAGLIB_S3MFILE_H #include "tfile.h" -#include "audioproperties.h" #include "taglib_export.h" +#include "audioproperties.h" #include "modfilebase.h" #include "modtag.h" #include "s3mproperties.h" diff --git a/taglib/s3m/s3mproperties.cpp b/taglib/s3m/s3mproperties.cpp index 3594c93e..81524518 100644 --- a/taglib/s3m/s3mproperties.cpp +++ b/taglib/s3m/s3mproperties.cpp @@ -23,7 +23,6 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "s3mproperties.h" using namespace TagLib; diff --git a/taglib/tag.cpp b/taglib/tag.cpp index 19a4fd59..394715fc 100644 --- a/taglib/tag.cpp +++ b/taglib/tag.cpp @@ -24,11 +24,12 @@ ***************************************************************************/ #include "tag.h" -#include "tstringlist.h" -#include "tpropertymap.h" #include +#include "tstringlist.h" +#include "tpropertymap.h" + using namespace TagLib; class Tag::TagPrivate diff --git a/taglib/tagunion.cpp b/taglib/tagunion.cpp index 0222e867..b3e46b16 100644 --- a/taglib/tagunion.cpp +++ b/taglib/tagunion.cpp @@ -24,17 +24,12 @@ ***************************************************************************/ #include "tagunion.h" -#include "tstringlist.h" -#include "tpropertymap.h" - -#include "id3v1tag.h" -#include "id3v2tag.h" -#include "apetag.h" -#include "xiphcomment.h" -#include "infotag.h" #include +#include "tstringlist.h" +#include "tpropertymap.h" + using namespace TagLib; #define stringUnion(method) \ diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp index fb486bd8..ea8fec5c 100644 --- a/taglib/toolkit/tbytevector.cpp +++ b/taglib/toolkit/tbytevector.cpp @@ -28,13 +28,10 @@ #include #include #include -#include #include #include -#include #include "tdebug.h" -#include "tstring.h" #include "tutils.h" // This is a bit ugly to keep writing over and over again. diff --git a/taglib/toolkit/tbytevector.h b/taglib/toolkit/tbytevector.h index ea8ef750..61973c3a 100644 --- a/taglib/toolkit/tbytevector.h +++ b/taglib/toolkit/tbytevector.h @@ -26,13 +26,13 @@ #ifndef TAGLIB_BYTEVECTOR_H #define TAGLIB_BYTEVECTOR_H -#include "taglib.h" -#include "taglib_export.h" - #include #include #include +#include "taglib.h" +#include "taglib_export.h" + namespace TagLib { //! A byte vector diff --git a/taglib/toolkit/tbytevectorlist.h b/taglib/toolkit/tbytevectorlist.h index ef1fae9d..f899f11c 100644 --- a/taglib/toolkit/tbytevectorlist.h +++ b/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 "taglib_export.h" namespace TagLib { diff --git a/taglib/toolkit/tbytevectorstream.cpp b/taglib/toolkit/tbytevectorstream.cpp index 11def596..7a142f57 100644 --- a/taglib/toolkit/tbytevectorstream.cpp +++ b/taglib/toolkit/tbytevectorstream.cpp @@ -24,13 +24,10 @@ ***************************************************************************/ #include "tbytevectorstream.h" -#include "tstring.h" -#include "tdebug.h" -#include #include -#include +#include "tstring.h" using namespace TagLib; diff --git a/taglib/toolkit/tbytevectorstream.h b/taglib/toolkit/tbytevectorstream.h index 3a29d718..4a2893d3 100644 --- a/taglib/toolkit/tbytevectorstream.h +++ b/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 "taglib_export.h" +#include "taglib.h" namespace TagLib { diff --git a/taglib/toolkit/tdebug.cpp b/taglib/toolkit/tdebug.cpp index 62ff0b9e..d9dddb13 100644 --- a/taglib/toolkit/tdebug.cpp +++ b/taglib/toolkit/tdebug.cpp @@ -29,15 +29,13 @@ #if !defined(NDEBUG) || defined(TRACE_IN_RELEASE) +#include + #include "tdebug.h" #include "tstring.h" #include "tdebuglistener.h" #include "tutils.h" -#include -#include -#include - namespace TagLib { // The instance is defined in tdebuglistener.cpp. diff --git a/taglib/toolkit/tdebuglistener.cpp b/taglib/toolkit/tdebuglistener.cpp index bc2f6c28..9a9bcd7c 100644 --- a/taglib/toolkit/tdebuglistener.cpp +++ b/taglib/toolkit/tdebuglistener.cpp @@ -26,7 +26,6 @@ #include "tdebuglistener.h" #include -#include #ifdef _WIN32 # include diff --git a/taglib/toolkit/tdebuglistener.h b/taglib/toolkit/tdebuglistener.h index ca12298a..96220106 100644 --- a/taglib/toolkit/tdebuglistener.h +++ b/taglib/toolkit/tdebuglistener.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_DEBUGLISTENER_H #define TAGLIB_DEBUGLISTENER_H -#include "taglib_export.h" #include "tstring.h" +#include "taglib_export.h" namespace TagLib { diff --git a/taglib/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp index fb885119..2cf13690 100644 --- a/taglib/toolkit/tfile.cpp +++ b/taglib/toolkit/tfile.cpp @@ -24,17 +24,16 @@ ***************************************************************************/ #include "tfile.h" + #include "tfilestream.h" -#include "tstring.h" -#include "tdebug.h" #include "tpropertymap.h" +#include "tstring.h" #ifdef _WIN32 # include # include #else -# include -# include +# include #endif #ifndef R_OK @@ -44,24 +43,7 @@ # 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 "modfile.h" -#include "s3mfile.h" -#include "itfile.h" -#include "xmfile.h" using namespace TagLib; diff --git a/taglib/toolkit/tfile.h b/taglib/toolkit/tfile.h index 2fb1d5ca..f6e7a8f9 100644 --- a/taglib/toolkit/tfile.h +++ b/taglib/toolkit/tfile.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_FILE_H #define TAGLIB_FILE_H +#include "tbytevector.h" +#include "tiostream.h" #include "taglib_export.h" #include "taglib.h" #include "tag.h" -#include "tbytevector.h" -#include "tiostream.h" namespace TagLib { diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp index a00b20be..7fe6acf4 100644 --- a/taglib/toolkit/tfilestream.cpp +++ b/taglib/toolkit/tfilestream.cpp @@ -24,8 +24,6 @@ ***************************************************************************/ #include "tfilestream.h" -#include "tstring.h" -#include "tdebug.h" #ifdef _WIN32 # include @@ -34,6 +32,9 @@ # include #endif +#include "tstring.h" +#include "tdebug.h" + using namespace TagLib; namespace diff --git a/taglib/toolkit/tfilestream.h b/taglib/toolkit/tfilestream.h index 36c02f71..1c2b7077 100644 --- a/taglib/toolkit/tfilestream.h +++ b/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 "taglib_export.h" +#include "taglib.h" namespace TagLib { diff --git a/taglib/toolkit/tiostream.h b/taglib/toolkit/tiostream.h index eae0279f..f99fcbd3 100644 --- a/taglib/toolkit/tiostream.h +++ b/taglib/toolkit/tiostream.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_IOSTREAM_H #define TAGLIB_IOSTREAM_H +#include "tbytevector.h" #include "taglib_export.h" #include "taglib.h" -#include "tbytevector.h" namespace TagLib { diff --git a/taglib/toolkit/tlist.h b/taglib/toolkit/tlist.h index d33966c5..6a6cce8a 100644 --- a/taglib/toolkit/tlist.h +++ b/taglib/toolkit/tlist.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_LIST_H #define TAGLIB_LIST_H -#include "taglib.h" - #include #include +#include "taglib.h" + namespace TagLib { //! A generic, implicitly shared list. diff --git a/taglib/toolkit/tpropertymap.cpp b/taglib/toolkit/tpropertymap.cpp index f6dce83e..f01da2b5 100644 --- a/taglib/toolkit/tpropertymap.cpp +++ b/taglib/toolkit/tpropertymap.cpp @@ -25,10 +25,10 @@ #include "tpropertymap.h" -using namespace TagLib; - #include +using namespace TagLib; + class PropertyMap::PropertyMapPrivate { public: diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp index 7e647561..f5d7caea 100644 --- a/taglib/toolkit/tstring.cpp +++ b/taglib/toolkit/tstring.cpp @@ -27,7 +27,6 @@ #include #include - #include #include "tdebug.h" diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h index 7f329344..a39df2c2 100644 --- a/taglib/toolkit/tstring.h +++ b/taglib/toolkit/tstring.h @@ -26,13 +26,13 @@ #ifndef TAGLIB_STRING_H #define TAGLIB_STRING_H -#include "taglib_export.h" -#include "taglib.h" -#include "tbytevector.h" - #include #include +#include "tbytevector.h" +#include "taglib_export.h" +#include "taglib.h" + /*! * \relates TagLib::String * diff --git a/taglib/toolkit/tstringlist.h b/taglib/toolkit/tstringlist.h index 004c20e3..820b0af7 100644 --- a/taglib/toolkit/tstringlist.h +++ b/taglib/toolkit/tstringlist.h @@ -26,13 +26,13 @@ #ifndef TAGLIB_STRINGLIST_H #define TAGLIB_STRINGLIST_H +#include + #include "tstring.h" #include "tlist.h" #include "tbytevectorlist.h" #include "taglib_export.h" -#include - namespace TagLib { //! A list of strings diff --git a/taglib/toolkit/tutils.h b/taglib/toolkit/tutils.h index 8cd376dd..121c24f6 100644 --- a/taglib/toolkit/tutils.h +++ b/taglib/toolkit/tutils.h @@ -30,6 +30,10 @@ #ifndef DO_NOT_DOCUMENT // tell Doxygen not to document this header +#include +#include +#include + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -45,9 +49,6 @@ #endif #include "tstring.h" -#include -#include -#include namespace TagLib { diff --git a/taglib/trueaudio/trueaudiofile.cpp b/taglib/trueaudio/trueaudiofile.cpp index 515608fb..a3057a39 100644 --- a/taglib/trueaudio/trueaudiofile.cpp +++ b/taglib/trueaudio/trueaudiofile.cpp @@ -29,17 +29,12 @@ #include "trueaudiofile.h" -#include "tbytevector.h" -#include "tstring.h" #include "tdebug.h" -#include "tagunion.h" -#include "tstringlist.h" #include "tpropertymap.h" +#include "tagunion.h" #include "tagutils.h" - #include "id3v1tag.h" #include "id3v2tag.h" -#include "id3v2header.h" using namespace TagLib; diff --git a/taglib/trueaudio/trueaudioproperties.cpp b/taglib/trueaudio/trueaudioproperties.cpp index e67536cd..93fc5846 100644 --- a/taglib/trueaudio/trueaudioproperties.cpp +++ b/taglib/trueaudio/trueaudioproperties.cpp @@ -29,11 +29,8 @@ #include "trueaudioproperties.h" -#include "tstring.h" #include "tdebug.h" -#include - -#include "trueaudiofile.h" +#include "tstring.h" using namespace TagLib; diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp index f1831dd6..7fbb1c09 100644 --- a/taglib/wavpack/wavpackfile.cpp +++ b/taglib/wavpack/wavpackfile.cpp @@ -29,17 +29,13 @@ #include "wavpackfile.h" -#include "tbytevector.h" -#include "tstring.h" #include "tdebug.h" -#include "tagunion.h" #include "tpropertymap.h" +#include "tagunion.h" #include "tagutils.h" - -#include "id3v1tag.h" -#include "id3v2header.h" -#include "apetag.h" #include "apefooter.h" +#include "apetag.h" +#include "id3v1tag.h" using namespace TagLib; diff --git a/taglib/wavpack/wavpackproperties.cpp b/taglib/wavpack/wavpackproperties.cpp index ee881beb..d96d912c 100644 --- a/taglib/wavpack/wavpackproperties.cpp +++ b/taglib/wavpack/wavpackproperties.cpp @@ -30,13 +30,12 @@ #include "wavpackproperties.h" #include +#include + #include "tstring.h" #include "tdebug.h" - #include "wavpackfile.h" -#include - // Implementation of this class is based on the information at: // http://www.wavpack.com/file_format.txt diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp index f29d4100..9eaf8cdc 100644 --- a/taglib/xm/xmfile.cpp +++ b/taglib/xm/xmfile.cpp @@ -25,14 +25,13 @@ #include "xmfile.h" +#include +#include + #include "tstringlist.h" #include "tdebug.h" -#include "modfileprivate.h" #include "tpropertymap.h" - -#include -#include -#include +#include "modfileprivate.h" using namespace TagLib; using namespace XM; diff --git a/taglib/xm/xmfile.h b/taglib/xm/xmfile.h index ccba537a..e1c487ca 100644 --- a/taglib/xm/xmfile.h +++ b/taglib/xm/xmfile.h @@ -27,8 +27,8 @@ #define TAGLIB_XMFILE_H #include "tfile.h" -#include "audioproperties.h" #include "taglib_export.h" +#include "audioproperties.h" #include "modfilebase.h" #include "modtag.h" #include "xmproperties.h" diff --git a/taglib/xm/xmproperties.cpp b/taglib/xm/xmproperties.cpp index c36e8532..452f9b7e 100644 --- a/taglib/xm/xmproperties.cpp +++ b/taglib/xm/xmproperties.cpp @@ -23,7 +23,6 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "xmproperties.h" using namespace TagLib; diff --git a/taglib/xm/xmproperties.h b/taglib/xm/xmproperties.h index e9c44779..a9d7ee7e 100644 --- a/taglib/xm/xmproperties.h +++ b/taglib/xm/xmproperties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_XMPROPERTIES_H #define TAGLIB_XMPROPERTIES_H -#include "taglib.h" #include "tstring.h" +#include "taglib.h" #include "audioproperties.h" namespace TagLib { diff --git a/tests/test_aiff.cpp b/tests/test_aiff.cpp index 49538387..d719bb0f 100644 --- a/tests/test_aiff.cpp +++ b/tests/test_aiff.cpp @@ -25,8 +25,9 @@ #include #include -#include "tag.h" + #include "tbytevectorlist.h" +#include "tag.h" #include "aifffile.h" #include #include "utils.h" diff --git a/tests/test_ape.cpp b/tests/test_ape.cpp index a4ceb02d..bccca18d 100644 --- a/tests/test_ape.cpp +++ b/tests/test_ape.cpp @@ -25,11 +25,12 @@ #include #include -#include "apetag.h" -#include "id3v1tag.h" + #include "tstringlist.h" #include "tbytevectorlist.h" #include "tpropertymap.h" +#include "apetag.h" +#include "id3v1tag.h" #include "apefile.h" #include #include "utils.h" diff --git a/tests/test_apetag.cpp b/tests/test_apetag.cpp index 7095a072..18344c92 100644 --- a/tests/test_apetag.cpp +++ b/tests/test_apetag.cpp @@ -25,13 +25,14 @@ #include #include -#include "tag.h" + #include "tstringlist.h" #include "tbytevectorlist.h" #include "tpropertymap.h" +#include "tdebug.h" +#include "tag.h" #include "apefile.h" #include "apetag.h" -#include "tdebug.h" #include #include "utils.h" diff --git a/tests/test_asf.cpp b/tests/test_asf.cpp index 7a2cabed..25c7cd94 100644 --- a/tests/test_asf.cpp +++ b/tests/test_asf.cpp @@ -25,10 +25,11 @@ #include #include -#include "tag.h" + #include "tstringlist.h" #include "tbytevectorlist.h" #include "tpropertymap.h" +#include "tag.h" #include "asffile.h" #include #include "utils.h" diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp index 0d0d5f6c..a993524e 100644 --- a/tests/test_bytevector.cpp +++ b/tests/test_bytevector.cpp @@ -25,6 +25,7 @@ #define _USE_MATH_DEFINES #include + #include "tbytevector.h" #include "tbytevectorlist.h" #include diff --git a/tests/test_file.cpp b/tests/test_file.cpp index 8a5a358e..8a479e51 100644 --- a/tests/test_file.cpp +++ b/tests/test_file.cpp @@ -24,8 +24,8 @@ ***************************************************************************/ #include "tfile.h" -#include #include "plainfile.h" +#include #include "utils.h" using namespace TagLib; diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp index ccfeaf68..8b62459f 100644 --- a/tests/test_fileref.cpp +++ b/tests/test_fileref.cpp @@ -25,6 +25,9 @@ #include #include + +#include "tfilestream.h" +#include "tbytevectorstream.h" #include "tag.h" #include "fileref.h" #include "oggflacfile.h" @@ -42,8 +45,6 @@ #include "wavpackfile.h" #include "opusfile.h" #include "xmfile.h" -#include "tfilestream.h" -#include "tbytevectorstream.h" #include #include "utils.h" diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp index 467c447c..3add7515 100644 --- a/tests/test_flac.cpp +++ b/tests/test_flac.cpp @@ -25,16 +25,17 @@ #include #include -#include "tag.h" + #include "tstringlist.h" #include "tbytevectorlist.h" #include "tpropertymap.h" +#include "tag.h" #include "flacfile.h" #include "xiphcomment.h" #include "id3v1tag.h" #include "id3v2tag.h" -#include #include "plainfile.h" +#include #include "utils.h" using namespace std; diff --git a/tests/test_flacpicture.cpp b/tests/test_flacpicture.cpp index ce49dcc0..8cfb7b91 100644 --- a/tests/test_flacpicture.cpp +++ b/tests/test_flacpicture.cpp @@ -25,9 +25,10 @@ #include #include -#include "tag.h" + #include "tstringlist.h" #include "tbytevectorlist.h" +#include "tag.h" #include "flacfile.h" #include "flacmetadatablock.h" #include diff --git a/tests/test_flacunknownmetadatablock.cpp b/tests/test_flacunknownmetadatablock.cpp index 0c7162d5..1715ed79 100644 --- a/tests/test_flacunknownmetadatablock.cpp +++ b/tests/test_flacunknownmetadatablock.cpp @@ -25,9 +25,10 @@ #include #include -#include "tag.h" + #include "tstringlist.h" #include "tbytevectorlist.h" +#include "tag.h" #include "flacunknownmetadatablock.h" #include #include "utils.h" diff --git a/tests/test_id3v1.cpp b/tests/test_id3v1.cpp index fac48385..a99add2a 100644 --- a/tests/test_id3v1.cpp +++ b/tests/test_id3v1.cpp @@ -25,6 +25,7 @@ #include #include + #include "tstring.h" #include "mpegfile.h" #include "id3v1tag.h" diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp index 72dcbda1..50a04ea5 100644 --- a/tests/test_id3v2.cpp +++ b/tests/test_id3v2.cpp @@ -26,6 +26,10 @@ #include #include #include + +#include "tdebug.h" +#include "tpropertymap.h" +#include "tzlib.h" #include "id3v2tag.h" #include "mpegfile.h" #include "id3v2frame.h" @@ -46,11 +50,8 @@ #include "commentsframe.h" #include "podcastframe.h" #include "privateframe.h" -#include "tdebug.h" -#include "tpropertymap.h" -#include "tzlib.h" -#include #include "plainfile.h" +#include #include "utils.h" using namespace std; diff --git a/tests/test_info.cpp b/tests/test_info.cpp index cb1e958b..c5b91f97 100644 --- a/tests/test_info.cpp +++ b/tests/test_info.cpp @@ -25,6 +25,7 @@ #include #include + #include "infotag.h" #include #include "utils.h" diff --git a/tests/test_it.cpp b/tests/test_it.cpp index d4bba70e..75b6370a 100644 --- a/tests/test_it.cpp +++ b/tests/test_it.cpp @@ -23,8 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "itfile.h" #include "tstringlist.h" +#include "itfile.h" #include #include "utils.h" diff --git a/tests/test_mod.cpp b/tests/test_mod.cpp index 2e20b391..e1423124 100644 --- a/tests/test_mod.cpp +++ b/tests/test_mod.cpp @@ -23,8 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "modfile.h" #include "tpropertymap.h" +#include "modfile.h" #include #include "utils.h" diff --git a/tests/test_mp4.cpp b/tests/test_mp4.cpp index 12ddd262..d9fd7e7e 100644 --- a/tests/test_mp4.cpp +++ b/tests/test_mp4.cpp @@ -25,15 +25,16 @@ #include #include -#include "tag.h" -#include "mp4tag.h" + #include "tbytevectorlist.h" #include "tbytevectorstream.h" #include "tpropertymap.h" +#include "tag.h" +#include "mp4tag.h" #include "mp4atom.h" #include "mp4file.h" -#include #include "plainfile.h" +#include #include "utils.h" using namespace std; diff --git a/tests/test_mp4coverart.cpp b/tests/test_mp4coverart.cpp index de65c861..6310931f 100644 --- a/tests/test_mp4coverart.cpp +++ b/tests/test_mp4coverart.cpp @@ -25,6 +25,7 @@ #include #include + #include "tag.h" #include "mp4coverart.h" #include diff --git a/tests/test_mp4item.cpp b/tests/test_mp4item.cpp index b518bf88..d5a49ca3 100644 --- a/tests/test_mp4item.cpp +++ b/tests/test_mp4item.cpp @@ -25,6 +25,7 @@ #include #include + #include "tag.h" #include "mp4coverart.h" #include "mp4item.h" diff --git a/tests/test_mpc.cpp b/tests/test_mpc.cpp index aa94aa73..d6560b74 100644 --- a/tests/test_mpc.cpp +++ b/tests/test_mpc.cpp @@ -25,11 +25,12 @@ #include #include -#include "apetag.h" -#include "id3v1tag.h" + #include "tstringlist.h" #include "tbytevectorlist.h" #include "tpropertymap.h" +#include "apetag.h" +#include "id3v1tag.h" #include "mpcfile.h" #include #include "utils.h" diff --git a/tests/test_mpeg.cpp b/tests/test_mpeg.cpp index fdfd9c8a..1036f514 100644 --- a/tests/test_mpeg.cpp +++ b/tests/test_mpeg.cpp @@ -25,6 +25,7 @@ #include #include + #include "tstring.h" #include "tpropertymap.h" #include "mpegfile.h" diff --git a/tests/test_ogg.cpp b/tests/test_ogg.cpp index ba8ff0fe..94ac9d15 100644 --- a/tests/test_ogg.cpp +++ b/tests/test_ogg.cpp @@ -25,6 +25,7 @@ #include #include + #include "tag.h" #include "tstringlist.h" #include "tbytevectorlist.h" diff --git a/tests/test_oggflac.cpp b/tests/test_oggflac.cpp index becccfea..5390222b 100644 --- a/tests/test_oggflac.cpp +++ b/tests/test_oggflac.cpp @@ -25,9 +25,10 @@ #include #include -#include "tag.h" + #include "tstringlist.h" #include "tbytevectorlist.h" +#include "tag.h" #include "oggfile.h" #include "oggflacfile.h" #include "oggpageheader.h" diff --git a/tests/test_opus.cpp b/tests/test_opus.cpp index e12b1459..9f6bcc91 100644 --- a/tests/test_opus.cpp +++ b/tests/test_opus.cpp @@ -25,8 +25,9 @@ #include #include -#include "tag.h" + #include "tbytevectorlist.h" +#include "tag.h" #include "opusfile.h" #include "oggpageheader.h" #include diff --git a/tests/test_riff.cpp b/tests/test_riff.cpp index b559a4ac..c2a2b420 100644 --- a/tests/test_riff.cpp +++ b/tests/test_riff.cpp @@ -25,8 +25,9 @@ #include #include -#include "tag.h" + #include "tbytevectorlist.h" +#include "tag.h" #include "rifffile.h" #include #include "utils.h" diff --git a/tests/test_sizes.cpp b/tests/test_sizes.cpp index 18313b64..2598cea3 100644 --- a/tests/test_sizes.cpp +++ b/tests/test_sizes.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include + #include "aifffile.h" #include "aiffproperties.h" #include "apefile.h" @@ -124,7 +126,6 @@ #include "xmfile.h" #include "xmproperties.h" -#include #include using namespace std; diff --git a/tests/test_string.cpp b/tests/test_string.cpp index 98b1b531..9638c769 100644 --- a/tests/test_string.cpp +++ b/tests/test_string.cpp @@ -23,8 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tstring.h" #include + +#include "tstring.h" #include using namespace std; diff --git a/tests/test_synchdata.cpp b/tests/test_synchdata.cpp index 9747e8c8..34ff9651 100644 --- a/tests/test_synchdata.cpp +++ b/tests/test_synchdata.cpp @@ -23,7 +23,6 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "id3v2synchdata.h" #include diff --git a/tests/test_trueaudio.cpp b/tests/test_trueaudio.cpp index dba6d8f4..20b36328 100644 --- a/tests/test_trueaudio.cpp +++ b/tests/test_trueaudio.cpp @@ -25,9 +25,10 @@ #include #include + +#include "tpropertymap.h" #include "id3v1tag.h" #include "id3v2tag.h" -#include "tpropertymap.h" #include "trueaudiofile.h" #include #include "utils.h" diff --git a/tests/test_wav.cpp b/tests/test_wav.cpp index ab50145e..8c81a2bb 100644 --- a/tests/test_wav.cpp +++ b/tests/test_wav.cpp @@ -25,6 +25,7 @@ #include #include + #include "id3v2tag.h" #include "infotag.h" #include "tbytevectorlist.h" @@ -32,8 +33,8 @@ #include "tfilestream.h" #include "tpropertymap.h" #include "wavfile.h" -#include #include "plainfile.h" +#include #include "utils.h" using namespace std; diff --git a/tests/test_wavpack.cpp b/tests/test_wavpack.cpp index 80a3f1e6..9cafc35b 100644 --- a/tests/test_wavpack.cpp +++ b/tests/test_wavpack.cpp @@ -25,10 +25,11 @@ #include #include -#include "apetag.h" -#include "id3v1tag.h" + #include "tbytevectorlist.h" #include "tpropertymap.h" +#include "apetag.h" +#include "id3v1tag.h" #include "wavpackfile.h" #include #include "utils.h" diff --git a/tests/test_xiphcomment.cpp b/tests/test_xiphcomment.cpp index 7ccd052e..64f4b586 100644 --- a/tests/test_xiphcomment.cpp +++ b/tests/test_xiphcomment.cpp @@ -25,10 +25,11 @@ #include #include -#include "xiphcomment.h" -#include "vorbisfile.h" + #include "tpropertymap.h" #include "tdebug.h" +#include "xiphcomment.h" +#include "vorbisfile.h" #include #include "utils.h"