From d314bfa06a4a39becef08120b564ec3d1975f400 Mon Sep 17 00:00:00 2001 From: Urs Fleisch Date: Sun, 16 Jul 2023 08:33:35 +0200 Subject: [PATCH] Make sure that own header file is included first Each header corresponding to a .cpp file must be self-contained, and can be #included without prerequisites. --- taglib/ape/apefile.cpp | 3 ++- taglib/ape/apefooter.cpp | 4 ++-- taglib/ape/apeitem.cpp | 4 ++-- taglib/ape/apeproperties.cpp | 2 +- taglib/ape/apetag.cpp | 3 ++- taglib/asf/asfattribute.cpp | 3 ++- taglib/asf/asffile.cpp | 3 ++- taglib/asf/asfpicture.cpp | 3 ++- taglib/asf/asfproperties.cpp | 2 +- taglib/asf/asftag.cpp | 2 +- taglib/fileref.cpp | 3 ++- taglib/flac/flacfile.cpp | 3 ++- taglib/flac/flacmetadatablock.cpp | 2 +- taglib/flac/flacpicture.cpp | 2 +- taglib/flac/flacproperties.cpp | 3 ++- taglib/flac/flacunknownmetadatablock.cpp | 2 +- taglib/it/itfile.cpp | 2 +- taglib/mod/modfilebase.cpp | 2 +- taglib/mp4/mp4atom.cpp | 3 ++- taglib/mp4/mp4coverart.cpp | 2 +- taglib/mp4/mp4file.cpp | 6 ++---- taglib/mp4/mp4file.h | 2 +- taglib/mp4/mp4item.cpp | 2 +- taglib/mp4/mp4properties.cpp | 2 +- taglib/mp4/mp4tag.cpp | 2 +- taglib/mpc/mpcfile.cpp | 3 ++- taglib/mpc/mpcproperties.cpp | 3 ++- taglib/mpeg/id3v1/id3v1tag.cpp | 3 ++- taglib/mpeg/id3v2/frames/chapterframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/commentsframe.cpp | 3 ++- taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/ownershipframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/popularimeterframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/privateframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/relativevolumeframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp | 4 ++-- taglib/mpeg/id3v2/frames/textidentificationframe.cpp | 2 +- taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp | 3 ++- taglib/mpeg/id3v2/id3v2frame.cpp | 3 ++- taglib/mpeg/id3v2/id3v2framefactory.cpp | 3 ++- taglib/mpeg/id3v2/id3v2header.cpp | 3 ++- taglib/mpeg/id3v2/id3v2synchdata.cpp | 4 ++-- taglib/mpeg/id3v2/id3v2tag.cpp | 3 ++- taglib/mpeg/mpegfile.cpp | 3 ++- taglib/mpeg/mpegheader.cpp | 3 ++- taglib/mpeg/mpegproperties.cpp | 3 ++- taglib/mpeg/xingheader.cpp | 3 ++- taglib/ogg/flac/oggflacfile.cpp | 3 ++- taglib/ogg/oggfile.cpp | 3 ++- taglib/ogg/oggpage.cpp | 3 ++- taglib/ogg/oggpageheader.cpp | 3 ++- taglib/ogg/opus/opusfile.cpp | 4 ++-- taglib/ogg/opus/opusproperties.cpp | 3 ++- taglib/ogg/speex/speexfile.cpp | 4 ++-- taglib/ogg/speex/speexproperties.cpp | 3 ++- taglib/ogg/vorbis/vorbisfile.cpp | 4 ++-- taglib/ogg/vorbis/vorbisproperties.cpp | 3 ++- taglib/ogg/xiphcomment.cpp | 3 ++- taglib/riff/aiff/aifffile.cpp | 4 ++-- taglib/riff/aiff/aiffproperties.cpp | 4 ++-- taglib/riff/aiff/aiffproperties.h | 1 + taglib/riff/rifffile.cpp | 3 ++- taglib/riff/wav/infotag.cpp | 3 ++- taglib/riff/wav/wavfile.cpp | 3 ++- taglib/riff/wav/wavproperties.cpp | 2 +- taglib/tagutils.cpp | 4 ++-- taglib/toolkit/tbytevector.cpp | 4 ++-- taglib/toolkit/tiostream.cpp | 4 ++-- taglib/toolkit/tpropertymap.cpp | 3 +-- taglib/toolkit/trefcounter.cpp | 4 ++-- taglib/toolkit/tstring.cpp | 4 ++-- taglib/toolkit/tzlib.cpp | 4 ++-- taglib/trueaudio/trueaudiofile.cpp | 3 ++- taglib/trueaudio/trueaudioproperties.cpp | 3 ++- taglib/wavpack/wavpackfile.cpp | 3 ++- taglib/wavpack/wavpackproperties.cpp | 3 ++- taglib/xm/xmfile.cpp | 3 ++- 77 files changed, 137 insertions(+), 101 deletions(-) diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp index 532521c5..77389c42 100644 --- a/taglib/ape/apefile.cpp +++ b/taglib/ape/apefile.cpp @@ -31,6 +31,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "apefile.h" + #include "tbytevector.h" #include "tstring.h" #include "tdebug.h" @@ -40,7 +42,6 @@ #include "tpropertymap.h" #include "tagutils.h" -#include "apefile.h" #include "apetag.h" #include "apefooter.h" diff --git a/taglib/ape/apefooter.cpp b/taglib/ape/apefooter.cpp index f0eeab82..76834566 100644 --- a/taglib/ape/apefooter.cpp +++ b/taglib/ape/apefooter.cpp @@ -24,14 +24,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "apefooter.h" + #include #include #include "tstring.h" #include "tdebug.h" -#include "apefooter.h" - using namespace TagLib; using namespace APE; diff --git a/taglib/ape/apeitem.cpp b/taglib/ape/apeitem.cpp index 697c7f78..92468be2 100644 --- a/taglib/ape/apeitem.cpp +++ b/taglib/ape/apeitem.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "apeitem.h" + #include "tbytevectorlist.h" #include "tdebug.h" -#include "apeitem.h" - using namespace TagLib; using namespace APE; diff --git a/taglib/ape/apeproperties.cpp b/taglib/ape/apeproperties.cpp index 4607cfa2..ad1a8640 100644 --- a/taglib/ape/apeproperties.cpp +++ b/taglib/ape/apeproperties.cpp @@ -27,11 +27,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "apeproperties.h" #include "tstring.h" #include "tdebug.h" #include #include "id3v2tag.h" -#include "apeproperties.h" #include "apefile.h" #include "apetag.h" #include "apefooter.h" diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp index 509bae36..97671bf8 100644 --- a/taglib/ape/apetag.cpp +++ b/taglib/ape/apetag.cpp @@ -31,6 +31,8 @@ #define WANT_CLASS_INSTANTIATION_OF_MAP (1) #endif +#include "apetag.h" + #include "tfile.h" #include "tstring.h" #include "tmap.h" @@ -38,7 +40,6 @@ #include "tdebug.h" #include "tutils.h" -#include "apetag.h" #include "apefooter.h" #include "apeitem.h" diff --git a/taglib/asf/asfattribute.cpp b/taglib/asf/asfattribute.cpp index 37c584d3..bfac5068 100644 --- a/taglib/asf/asfattribute.cpp +++ b/taglib/asf/asfattribute.cpp @@ -23,11 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "asfattribute.h" + #include "taglib.h" #include "tdebug.h" #include "trefcounter.h" -#include "asfattribute.h" #include "asffile.h" #include "asfutils.h" diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp index ef5ce41e..9184b5b4 100644 --- a/taglib/asf/asffile.cpp +++ b/taglib/asf/asffile.cpp @@ -23,13 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "asffile.h" + #include "tdebug.h" #include "tbytevectorlist.h" #include "tpropertymap.h" #include "tstring.h" #include "tagutils.h" -#include "asffile.h" #include "asftag.h" #include "asfproperties.h" #include "asfutils.h" diff --git a/taglib/asf/asfpicture.cpp b/taglib/asf/asfpicture.cpp index 1677b7f5..fb1b97ae 100644 --- a/taglib/asf/asfpicture.cpp +++ b/taglib/asf/asfpicture.cpp @@ -23,13 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "asfpicture.h" + #include "taglib.h" #include "tdebug.h" #include "trefcounter.h" #include "asfattribute.h" #include "asffile.h" -#include "asfpicture.h" #include "asfutils.h" using namespace TagLib; diff --git a/taglib/asf/asfproperties.cpp b/taglib/asf/asfproperties.cpp index 70ffa6c5..4ad525ad 100644 --- a/taglib/asf/asfproperties.cpp +++ b/taglib/asf/asfproperties.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "asfproperties.h" #include "tdebug.h" #include "tstring.h" -#include "asfproperties.h" using namespace TagLib; diff --git a/taglib/asf/asftag.cpp b/taglib/asf/asftag.cpp index c6fed1be..9473a351 100644 --- a/taglib/asf/asftag.cpp +++ b/taglib/asf/asftag.cpp @@ -23,8 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tpropertymap.h" #include "asftag.h" +#include "tpropertymap.h" using namespace TagLib; diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp index d116feed..2efd2586 100644 --- a/taglib/fileref.cpp +++ b/taglib/fileref.cpp @@ -27,6 +27,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "fileref.h" + #include #include "tfile.h" @@ -35,7 +37,6 @@ #include "tdebug.h" #include "trefcounter.h" -#include "fileref.h" #include "asffile.h" #include "mpegfile.h" #include "vorbisfile.h" diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp index f2b7fe96..678fcfe2 100644 --- a/taglib/flac/flacfile.cpp +++ b/taglib/flac/flacfile.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "flacfile.h" + #include "tbytevector.h" #include "tstring.h" #include "tlist.h" @@ -37,7 +39,6 @@ #include "xiphcomment.h" #include "flacpicture.h" -#include "flacfile.h" #include "flacmetadatablock.h" #include "flacunknownmetadatablock.h" diff --git a/taglib/flac/flacmetadatablock.cpp b/taglib/flac/flacmetadatablock.cpp index 62fc0d5a..574e2948 100644 --- a/taglib/flac/flacmetadatablock.cpp +++ b/taglib/flac/flacmetadatablock.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "flacmetadatablock.h" #include "taglib.h" #include "tdebug.h" -#include "flacmetadatablock.h" using namespace TagLib; diff --git a/taglib/flac/flacpicture.cpp b/taglib/flac/flacpicture.cpp index b4c0989a..251640b6 100644 --- a/taglib/flac/flacpicture.cpp +++ b/taglib/flac/flacpicture.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "flacpicture.h" #include "taglib.h" #include "tdebug.h" -#include "flacpicture.h" using namespace TagLib; diff --git a/taglib/flac/flacproperties.cpp b/taglib/flac/flacproperties.cpp index 6da59350..37eace58 100644 --- a/taglib/flac/flacproperties.cpp +++ b/taglib/flac/flacproperties.cpp @@ -23,10 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "flacproperties.h" + #include "tstring.h" #include "tdebug.h" -#include "flacproperties.h" #include "flacfile.h" using namespace TagLib; diff --git a/taglib/flac/flacunknownmetadatablock.cpp b/taglib/flac/flacunknownmetadatablock.cpp index c9295d74..2ec00239 100644 --- a/taglib/flac/flacunknownmetadatablock.cpp +++ b/taglib/flac/flacunknownmetadatablock.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "flacunknownmetadatablock.h" #include "taglib.h" #include "tdebug.h" #include "tstring.h" -#include "flacunknownmetadatablock.h" using namespace TagLib; diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp index 4b84fa46..db5f5b29 100644 --- a/taglib/it/itfile.cpp +++ b/taglib/it/itfile.cpp @@ -24,8 +24,8 @@ ***************************************************************************/ -#include "tstringlist.h" #include "itfile.h" +#include "tstringlist.h" #include "tdebug.h" #include "modfileprivate.h" #include "tpropertymap.h" diff --git a/taglib/mod/modfilebase.cpp b/taglib/mod/modfilebase.cpp index 46da18a7..daa9eb8f 100644 --- a/taglib/mod/modfilebase.cpp +++ b/taglib/mod/modfilebase.cpp @@ -24,8 +24,8 @@ ***************************************************************************/ -#include "tdebug.h" #include "modfilebase.h" +#include "tdebug.h" using namespace TagLib; using namespace Mod; diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp index 5d8c3702..b75e9313 100644 --- a/taglib/mp4/mp4atom.cpp +++ b/taglib/mp4/mp4atom.cpp @@ -23,11 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mp4atom.h" + #include #include "tdebug.h" #include "tstring.h" -#include "mp4atom.h" using namespace TagLib; diff --git a/taglib/mp4/mp4coverart.cpp b/taglib/mp4/mp4coverart.cpp index 055183b1..e6865264 100644 --- a/taglib/mp4/mp4coverart.cpp +++ b/taglib/mp4/mp4coverart.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mp4coverart.h" #include "taglib.h" #include "tdebug.h" #include "trefcounter.h" -#include "mp4coverart.h" using namespace TagLib; diff --git a/taglib/mp4/mp4file.cpp b/taglib/mp4/mp4file.cpp index c6efe3a5..04b00947 100644 --- a/taglib/mp4/mp4file.cpp +++ b/taglib/mp4/mp4file.cpp @@ -23,15 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mp4file.h" + #include "tdebug.h" #include "tstring.h" #include "tpropertymap.h" #include "tagutils.h" -#include "mp4atom.h" -#include "mp4tag.h" -#include "mp4file.h" - using namespace TagLib; namespace diff --git a/taglib/mp4/mp4file.h b/taglib/mp4/mp4file.h index d00f5bb3..6337e9bf 100644 --- a/taglib/mp4/mp4file.h +++ b/taglib/mp4/mp4file.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_MP4FILE_H #define TAGLIB_MP4FILE_H +#include "mp4tag.h" #include "tag.h" #include "tfile.h" #include "taglib_export.h" #include "mp4properties.h" -#include "mp4tag.h" namespace TagLib { //! An implementation of MP4 (AAC, ALAC, ...) metadata diff --git a/taglib/mp4/mp4item.cpp b/taglib/mp4/mp4item.cpp index 65fa20f9..39cffb13 100644 --- a/taglib/mp4/mp4item.cpp +++ b/taglib/mp4/mp4item.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mp4item.h" #include "taglib.h" #include "tdebug.h" #include "trefcounter.h" -#include "mp4item.h" using namespace TagLib; diff --git a/taglib/mp4/mp4properties.cpp b/taglib/mp4/mp4properties.cpp index 6cbb9f66..900cbf1d 100644 --- a/taglib/mp4/mp4properties.cpp +++ b/taglib/mp4/mp4properties.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mp4properties.h" #include "tdebug.h" #include "tstring.h" #include "mp4file.h" #include "mp4atom.h" -#include "mp4properties.h" using namespace TagLib; diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp index 32f6b9b3..0c0f3854 100644 --- a/taglib/mp4/mp4tag.cpp +++ b/taglib/mp4/mp4tag.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mp4tag.h" #include "tdebug.h" #include "tstring.h" #include "tpropertymap.h" #include "mp4atom.h" -#include "mp4tag.h" #include "id3v1genres.h" using namespace TagLib; diff --git a/taglib/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp index 512d273c..462888e8 100644 --- a/taglib/mpc/mpcfile.cpp +++ b/taglib/mpc/mpcfile.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mpcfile.h" + #include "tbytevector.h" #include "tstring.h" #include "tagunion.h" @@ -30,7 +32,6 @@ #include "tpropertymap.h" #include "tagutils.h" -#include "mpcfile.h" #include "id3v1tag.h" #include "id3v2header.h" #include "apetag.h" diff --git a/taglib/mpc/mpcproperties.cpp b/taglib/mpc/mpcproperties.cpp index 774e4790..766175f8 100644 --- a/taglib/mpc/mpcproperties.cpp +++ b/taglib/mpc/mpcproperties.cpp @@ -23,12 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mpcproperties.h" + #include "tstring.h" #include "tdebug.h" #include #include -#include "mpcproperties.h" #include "mpcfile.h" using namespace TagLib; diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp index ed2610f2..b6fe5acd 100644 --- a/taglib/mpeg/id3v1/id3v1tag.cpp +++ b/taglib/mpeg/id3v1/id3v1tag.cpp @@ -23,10 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "id3v1tag.h" + #include "tdebug.h" #include "tfile.h" -#include "id3v1tag.h" #include "id3v1genres.h" using namespace TagLib; diff --git a/taglib/mpeg/id3v2/frames/chapterframe.cpp b/taglib/mpeg/id3v2/frames/chapterframe.cpp index f98c695b..d5ffd149 100644 --- a/taglib/mpeg/id3v2/frames/chapterframe.cpp +++ b/taglib/mpeg/id3v2/frames/chapterframe.cpp @@ -23,13 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "chapterframe.h" + #include "tbytevectorlist.h" #include "tpropertymap.h" #include "tdebug.h" #include -#include "chapterframe.h" - using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/commentsframe.cpp b/taglib/mpeg/id3v2/frames/commentsframe.cpp index 1ca81566..462e8bf3 100644 --- a/taglib/mpeg/id3v2/frames/commentsframe.cpp +++ b/taglib/mpeg/id3v2/frames/commentsframe.cpp @@ -23,12 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "commentsframe.h" + #include "tbytevectorlist.h" #include "id3v2tag.h" #include "tdebug.h" #include "tstringlist.h" -#include "commentsframe.h" #include "tpropertymap.h" using namespace TagLib; diff --git a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp index 1ae6fc09..90fc89c9 100644 --- a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp +++ b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp @@ -26,11 +26,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "generalencapsulatedobjectframe.h" + #include "tdebug.h" #include "tstringlist.h" -#include "generalencapsulatedobjectframe.h" - using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/ownershipframe.cpp b/taglib/mpeg/id3v2/frames/ownershipframe.cpp index 7b585b78..adba5319 100644 --- a/taglib/mpeg/id3v2/frames/ownershipframe.cpp +++ b/taglib/mpeg/id3v2/frames/ownershipframe.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "ownershipframe.h" + #include "tdebug.h" #include "tstringlist.h" #include "id3v2tag.h" -#include "ownershipframe.h" - using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/popularimeterframe.cpp b/taglib/mpeg/id3v2/frames/popularimeterframe.cpp index 9fd2d0b4..32ec7a41 100644 --- a/taglib/mpeg/id3v2/frames/popularimeterframe.cpp +++ b/taglib/mpeg/id3v2/frames/popularimeterframe.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tdebug.h" - #include "popularimeterframe.h" +#include "tdebug.h" + using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/privateframe.cpp b/taglib/mpeg/id3v2/frames/privateframe.cpp index 32d04332..5339d1cc 100644 --- a/taglib/mpeg/id3v2/frames/privateframe.cpp +++ b/taglib/mpeg/id3v2/frames/privateframe.cpp @@ -24,12 +24,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "privateframe.h" + #include "tbytevectorlist.h" #include "id3v2tag.h" #include "tdebug.h" -#include "privateframe.h" - using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp b/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp index 2f70ed92..34317851 100644 --- a/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp +++ b/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp @@ -23,11 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "relativevolumeframe.h" + #include "tdebug.h" #include "tmap.h" -#include "relativevolumeframe.h" - using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp index 8d5efdec..1de2969d 100644 --- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp +++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "tableofcontentsframe.h" + #include "tbytevectorlist.h" #include "tpropertymap.h" #include "tdebug.h" -#include "tableofcontentsframe.h" - using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp index 4a8c11e4..47822c4b 100644 --- a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp +++ b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "textidentificationframe.h" #include "tbytevectorlist.h" #include "id3v2tag.h" -#include "textidentificationframe.h" #include "tpropertymap.h" #include "id3v1genres.h" diff --git a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp index d09496ad..dff16539 100644 --- a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp +++ b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp @@ -23,12 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "uniquefileidentifierframe.h" + #include "tbytevectorlist.h" #include "tpropertymap.h" #include "tdebug.h" #include "id3v2tag.h" -#include "uniquefileidentifierframe.h" using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp index 574b941f..775e43db 100644 --- a/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/taglib/mpeg/id3v2/id3v2frame.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "id3v2frame.h" + #include #include "tdebug.h" @@ -30,7 +32,6 @@ #include "tzlib.h" #include "id3v2tag.h" -#include "id3v2frame.h" #include "id3v2synchdata.h" #include "tpropertymap.h" diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index a241e859..74f0d179 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -23,10 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "id3v2framefactory.h" + #include "tdebug.h" #include "tzlib.h" -#include "id3v2framefactory.h" #include "id3v2synchdata.h" #include "id3v1genres.h" diff --git a/taglib/mpeg/id3v2/id3v2header.cpp b/taglib/mpeg/id3v2/id3v2header.cpp index b8e80e88..46574ef3 100644 --- a/taglib/mpeg/id3v2/id3v2header.cpp +++ b/taglib/mpeg/id3v2/id3v2header.cpp @@ -23,13 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "id3v2header.h" + #include #include #include "tstring.h" #include "tdebug.h" -#include "id3v2header.h" #include "id3v2footer.h" #include "id3v2synchdata.h" diff --git a/taglib/mpeg/id3v2/id3v2synchdata.cpp b/taglib/mpeg/id3v2/id3v2synchdata.cpp index 54080cb5..f538baf6 100644 --- a/taglib/mpeg/id3v2/id3v2synchdata.cpp +++ b/taglib/mpeg/id3v2/id3v2synchdata.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include - #include "id3v2synchdata.h" +#include + using namespace TagLib; using namespace ID3v2; diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp index 0b222f1b..e8a48c36 100644 --- a/taglib/mpeg/id3v2/id3v2tag.cpp +++ b/taglib/mpeg/id3v2/id3v2tag.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "id3v2tag.h" + #include #include "tfile.h" @@ -30,7 +32,6 @@ #include "tpropertymap.h" #include "tdebug.h" -#include "id3v2tag.h" #include "id3v2header.h" #include "id3v2extendedheader.h" #include "id3v2footer.h" diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp index 7510f446..bf45bb42 100644 --- a/taglib/mpeg/mpegfile.cpp +++ b/taglib/mpeg/mpegfile.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mpegfile.h" + #include "tagunion.h" #include "tagutils.h" #include "id3v2tag.h" @@ -32,7 +34,6 @@ #include "apetag.h" #include "tdebug.h" -#include "mpegfile.h" #include "mpegheader.h" #include "mpegutils.h" #include "tpropertymap.h" diff --git a/taglib/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp index 276a8f30..584a2e25 100644 --- a/taglib/mpeg/mpegheader.cpp +++ b/taglib/mpeg/mpegheader.cpp @@ -23,13 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mpegheader.h" + #include "tbytevector.h" #include "tstring.h" #include "tfile.h" #include "tdebug.h" #include "trefcounter.h" -#include "mpegheader.h" #include "mpegutils.h" using namespace TagLib; diff --git a/taglib/mpeg/mpegproperties.cpp b/taglib/mpeg/mpegproperties.cpp index 7701f219..f81e0cbc 100644 --- a/taglib/mpeg/mpegproperties.cpp +++ b/taglib/mpeg/mpegproperties.cpp @@ -23,10 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "mpegproperties.h" + #include "tdebug.h" #include "tstring.h" -#include "mpegproperties.h" #include "mpegfile.h" #include "xingheader.h" #include "apetag.h" diff --git a/taglib/mpeg/xingheader.cpp b/taglib/mpeg/xingheader.cpp index 31578250..629425f6 100644 --- a/taglib/mpeg/xingheader.cpp +++ b/taglib/mpeg/xingheader.cpp @@ -23,11 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "xingheader.h" + #include "tbytevector.h" #include "tstring.h" #include "tdebug.h" -#include "xingheader.h" #include "mpegfile.h" using namespace TagLib; diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp index 8f95ff50..9b2625ca 100644 --- a/taglib/ogg/flac/oggflacfile.cpp +++ b/taglib/ogg/flac/oggflacfile.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "oggflacfile.h" + #include "tbytevector.h" #include "tstring.h" #include "tdebug.h" @@ -30,7 +32,6 @@ #include "tagutils.h" #include "xiphcomment.h" -#include "oggflacfile.h" using namespace TagLib; using TagLib::FLAC::Properties; diff --git a/taglib/ogg/oggfile.cpp b/taglib/ogg/oggfile.cpp index 9da999cf..320e42b0 100644 --- a/taglib/ogg/oggfile.cpp +++ b/taglib/ogg/oggfile.cpp @@ -23,12 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "oggfile.h" + #include "tbytevectorlist.h" #include "tmap.h" #include "tstring.h" #include "tdebug.h" -#include "oggfile.h" #include "oggpage.h" #include "oggpageheader.h" diff --git a/taglib/ogg/oggpage.cpp b/taglib/ogg/oggpage.cpp index 28482cb0..bf663a86 100644 --- a/taglib/ogg/oggpage.cpp +++ b/taglib/ogg/oggpage.cpp @@ -23,12 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "oggpage.h" + #include #include "tstring.h" #include "tdebug.h" -#include "oggpage.h" #include "oggpageheader.h" #include "oggfile.h" diff --git a/taglib/ogg/oggpageheader.cpp b/taglib/ogg/oggpageheader.cpp index d93ca86a..a0aa7193 100644 --- a/taglib/ogg/oggpageheader.cpp +++ b/taglib/ogg/oggpageheader.cpp @@ -23,13 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "oggpageheader.h" + #include #include "tstring.h" #include "tdebug.h" #include "taglib.h" -#include "oggpageheader.h" #include "oggfile.h" using namespace TagLib; diff --git a/taglib/ogg/opus/opusfile.cpp b/taglib/ogg/opus/opusfile.cpp index b8a80ade..eb2c3a1a 100644 --- a/taglib/ogg/opus/opusfile.cpp +++ b/taglib/ogg/opus/opusfile.cpp @@ -27,13 +27,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "opusfile.h" + #include "tstring.h" #include "tdebug.h" #include "tpropertymap.h" #include "tagutils.h" -#include "opusfile.h" - using namespace TagLib; using namespace TagLib::Ogg; diff --git a/taglib/ogg/opus/opusproperties.cpp b/taglib/ogg/opus/opusproperties.cpp index 1d237053..d0a6ceaa 100644 --- a/taglib/ogg/opus/opusproperties.cpp +++ b/taglib/ogg/opus/opusproperties.cpp @@ -27,12 +27,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "opusproperties.h" + #include "tstring.h" #include "tdebug.h" #include "oggpageheader.h" -#include "opusproperties.h" #include "opusfile.h" using namespace TagLib; diff --git a/taglib/ogg/speex/speexfile.cpp b/taglib/ogg/speex/speexfile.cpp index ad0b8aca..fc7551d0 100644 --- a/taglib/ogg/speex/speexfile.cpp +++ b/taglib/ogg/speex/speexfile.cpp @@ -27,13 +27,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "speexfile.h" + #include "tstring.h" #include "tdebug.h" #include "tpropertymap.h" #include "tagutils.h" -#include "speexfile.h" - using namespace TagLib; using namespace TagLib::Ogg; diff --git a/taglib/ogg/speex/speexproperties.cpp b/taglib/ogg/speex/speexproperties.cpp index cc01767c..f7daa2c0 100644 --- a/taglib/ogg/speex/speexproperties.cpp +++ b/taglib/ogg/speex/speexproperties.cpp @@ -27,12 +27,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "speexproperties.h" + #include "tstring.h" #include "tdebug.h" #include "oggpageheader.h" -#include "speexproperties.h" #include "speexfile.h" using namespace TagLib; diff --git a/taglib/ogg/vorbis/vorbisfile.cpp b/taglib/ogg/vorbis/vorbisfile.cpp index eaaf9852..bce42462 100644 --- a/taglib/ogg/vorbis/vorbisfile.cpp +++ b/taglib/ogg/vorbis/vorbisfile.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "vorbisfile.h" + #include #include "tstring.h" @@ -30,8 +32,6 @@ #include "tpropertymap.h" #include "tagutils.h" -#include "vorbisfile.h" - using namespace TagLib; class Vorbis::File::FilePrivate diff --git a/taglib/ogg/vorbis/vorbisproperties.cpp b/taglib/ogg/vorbis/vorbisproperties.cpp index 8cfa5340..d4b993d2 100644 --- a/taglib/ogg/vorbis/vorbisproperties.cpp +++ b/taglib/ogg/vorbis/vorbisproperties.cpp @@ -23,12 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "vorbisproperties.h" + #include "tstring.h" #include "tdebug.h" #include "oggpageheader.h" -#include "vorbisproperties.h" #include "vorbisfile.h" using namespace TagLib; diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp index b5d1c438..bf7d0da5 100644 --- a/taglib/ogg/xiphcomment.cpp +++ b/taglib/ogg/xiphcomment.cpp @@ -23,11 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "xiphcomment.h" + #include "tbytevector.h" #include "tdebug.h" #include "flacpicture.h" -#include "xiphcomment.h" #include "tpropertymap.h" using namespace TagLib; diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp index 395b1c5f..78e509cd 100644 --- a/taglib/riff/aiff/aifffile.cpp +++ b/taglib/riff/aiff/aifffile.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "aifffile.h" + #include "tbytevector.h" #include "tdebug.h" #include "id3v2tag.h" @@ -30,8 +32,6 @@ #include "tpropertymap.h" #include "tagutils.h" -#include "aifffile.h" - using namespace TagLib; class RIFF::AIFF::File::FilePrivate diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp index ac040ecd..70900c55 100644 --- a/taglib/riff/aiff/aiffproperties.cpp +++ b/taglib/riff/aiff/aiffproperties.cpp @@ -23,10 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ -#include "tstring.h" +#include "aiffproperties.h" + #include "tdebug.h" #include "aifffile.h" -#include "aiffproperties.h" using namespace TagLib; diff --git a/taglib/riff/aiff/aiffproperties.h b/taglib/riff/aiff/aiffproperties.h index 2592ca96..8e175d87 100644 --- a/taglib/riff/aiff/aiffproperties.h +++ b/taglib/riff/aiff/aiffproperties.h @@ -27,6 +27,7 @@ #define TAGLIB_AIFFPROPERTIES_H #include "audioproperties.h" +#include "tstring.h" namespace TagLib { diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp index 7e44ac34..f50d00f3 100644 --- a/taglib/riff/rifffile.cpp +++ b/taglib/riff/rifffile.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "rifffile.h" + #include #include @@ -30,7 +32,6 @@ #include "tdebug.h" #include "tstring.h" -#include "rifffile.h" #include "riffutils.h" using namespace TagLib; diff --git a/taglib/riff/wav/infotag.cpp b/taglib/riff/wav/infotag.cpp index a78c670a..b6e9a563 100644 --- a/taglib/riff/wav/infotag.cpp +++ b/taglib/riff/wav/infotag.cpp @@ -23,10 +23,11 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "infotag.h" + #include "tdebug.h" #include "tfile.h" -#include "infotag.h" #include "riffutils.h" using namespace TagLib; diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp index a5ecad3c..740c9d57 100644 --- a/taglib/riff/wav/wavfile.cpp +++ b/taglib/riff/wav/wavfile.cpp @@ -23,13 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "wavfile.h" + #include "tbytevector.h" #include "tdebug.h" #include "tstringlist.h" #include "tpropertymap.h" #include "tagutils.h" -#include "wavfile.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 395ebe6c..dc9bdbbc 100644 --- a/taglib/riff/wav/wavproperties.cpp +++ b/taglib/riff/wav/wavproperties.cpp @@ -23,9 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "wavproperties.h" #include "tdebug.h" #include "wavfile.h" -#include "wavproperties.h" using namespace TagLib; diff --git a/taglib/tagutils.cpp b/taglib/tagutils.cpp index 4904f736..5fd9e7f0 100644 --- a/taglib/tagutils.cpp +++ b/taglib/tagutils.cpp @@ -23,14 +23,14 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "tagutils.h" + #include "tfile.h" #include "id3v1tag.h" #include "id3v2header.h" #include "apetag.h" -#include "tagutils.h" - using namespace TagLib; offset_t Utils::findID3v1(File *file) diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp index dfa0f364..3a3c26a6 100644 --- a/taglib/toolkit/tbytevector.cpp +++ b/taglib/toolkit/tbytevector.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "tbytevector.h" + #include #include #include @@ -35,8 +37,6 @@ #include "trefcounter.h" #include "tutils.h" -#include "tbytevector.h" - // This is a bit ugly to keep writing over and over again. // A rather obscure feature of the C++ spec that I hadn't thought of that makes diff --git a/taglib/toolkit/tiostream.cpp b/taglib/toolkit/tiostream.cpp index 87647414..6033729e 100644 --- a/taglib/toolkit/tiostream.cpp +++ b/taglib/toolkit/tiostream.cpp @@ -23,13 +23,13 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "tiostream.h" + #ifdef _WIN32 # include # include "tstring.h" #endif -#include "tiostream.h" - using namespace TagLib; #ifdef _WIN32 diff --git a/taglib/toolkit/tpropertymap.cpp b/taglib/toolkit/tpropertymap.cpp index da7a9cf2..c9f32622 100644 --- a/taglib/toolkit/tpropertymap.cpp +++ b/taglib/toolkit/tpropertymap.cpp @@ -23,10 +23,9 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ - #include "tpropertymap.h" -using namespace TagLib; +using namespace TagLib; PropertyMap::PropertyMap() = default; diff --git a/taglib/toolkit/trefcounter.cpp b/taglib/toolkit/trefcounter.cpp index 67a6642e..2445c8ba 100644 --- a/taglib/toolkit/trefcounter.cpp +++ b/taglib/toolkit/trefcounter.cpp @@ -23,12 +23,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "trefcounter.h" + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "trefcounter.h" - #if defined(HAVE_GCC_ATOMIC) # define ATOMIC_INT int # define ATOMIC_INC(x) __sync_add_and_fetch(&(x), 1) diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp index ce5aafca..f3b7ad28 100644 --- a/taglib/toolkit/tstring.cpp +++ b/taglib/toolkit/tstring.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "tstring.h" + #include #include @@ -33,8 +35,6 @@ #include "trefcounter.h" #include "tutils.h" -#include "tstring.h" - namespace { using namespace TagLib; diff --git a/taglib/toolkit/tzlib.cpp b/taglib/toolkit/tzlib.cpp index 2c6bd5e6..a463edcf 100644 --- a/taglib/toolkit/tzlib.cpp +++ b/taglib/toolkit/tzlib.cpp @@ -23,6 +23,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "tzlib.h" + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -33,8 +35,6 @@ # include "tdebug.h" #endif -#include "tzlib.h" - using namespace TagLib; bool zlib::isAvailable() diff --git a/taglib/trueaudio/trueaudiofile.cpp b/taglib/trueaudio/trueaudiofile.cpp index db3b814f..db5cd4b1 100644 --- a/taglib/trueaudio/trueaudiofile.cpp +++ b/taglib/trueaudio/trueaudiofile.cpp @@ -27,6 +27,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "trueaudiofile.h" + #include "tbytevector.h" #include "tstring.h" #include "tdebug.h" @@ -35,7 +37,6 @@ #include "tpropertymap.h" #include "tagutils.h" -#include "trueaudiofile.h" #include "id3v1tag.h" #include "id3v2tag.h" #include "id3v2header.h" diff --git a/taglib/trueaudio/trueaudioproperties.cpp b/taglib/trueaudio/trueaudioproperties.cpp index 99b783a9..832a7807 100644 --- a/taglib/trueaudio/trueaudioproperties.cpp +++ b/taglib/trueaudio/trueaudioproperties.cpp @@ -27,11 +27,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "trueaudioproperties.h" + #include "tstring.h" #include "tdebug.h" #include -#include "trueaudioproperties.h" #include "trueaudiofile.h" using namespace TagLib; diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp index 4cb97503..7f786d46 100644 --- a/taglib/wavpack/wavpackfile.cpp +++ b/taglib/wavpack/wavpackfile.cpp @@ -27,6 +27,8 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "wavpackfile.h" + #include "tbytevector.h" #include "tstring.h" #include "tdebug.h" @@ -34,7 +36,6 @@ #include "tpropertymap.h" #include "tagutils.h" -#include "wavpackfile.h" #include "id3v1tag.h" #include "id3v2header.h" #include "apetag.h" diff --git a/taglib/wavpack/wavpackproperties.cpp b/taglib/wavpack/wavpackproperties.cpp index b881a16f..553b698a 100644 --- a/taglib/wavpack/wavpackproperties.cpp +++ b/taglib/wavpack/wavpackproperties.cpp @@ -27,11 +27,12 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "wavpackproperties.h" + #include #include "tstring.h" #include "tdebug.h" -#include "wavpackproperties.h" #include "wavpackfile.h" // Implementation of this class is based on the information at: diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp index a570bf1d..6476d62a 100644 --- a/taglib/xm/xmfile.cpp +++ b/taglib/xm/xmfile.cpp @@ -23,9 +23,10 @@ * http://www.mozilla.org/MPL/ * ***************************************************************************/ +#include "xmfile.h" + #include "tstringlist.h" #include "tdebug.h" -#include "xmfile.h" #include "modfileprivate.h" #include "tpropertymap.h"