From 18c621cdc2d845308c2b6f63d7706ebaa00ab1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Fri, 9 Oct 2009 21:03:59 +0000 Subject: [PATCH] Always use #include "XXX" in TagLib's code Patch by Stephen F. Booth, thanks! git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1033289 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- taglib/asf/asfattribute.h | 4 ++-- taglib/asf/asffile.h | 4 ++-- taglib/asf/asfproperties.h | 4 ++-- taglib/asf/asftag.h | 6 +++--- taglib/fileref.h | 4 ++-- taglib/mp4/mp4atom.h | 4 ++-- taglib/mp4/mp4file.h | 4 ++-- taglib/mp4/mp4item.h | 2 +- taglib/mp4/mp4tag.h | 10 +++++----- taglib/mpeg/id3v2/frames/attachedpictureframe.h | 4 ++-- taglib/mpeg/id3v2/frames/commentsframe.h | 2 +- .../mpeg/id3v2/frames/generalencapsulatedobjectframe.h | 4 ++-- taglib/mpeg/id3v2/frames/popularimeterframe.h | 2 +- taglib/mpeg/id3v2/frames/relativevolumeframe.h | 4 ++-- taglib/mpeg/id3v2/frames/textidentificationframe.h | 4 ++-- taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h | 2 +- taglib/mpeg/id3v2/frames/unknownframe.h | 2 +- taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h | 2 +- taglib/mpeg/id3v2/frames/urllinkframe.h | 2 +- taglib/ogg/speex/speexfile.h | 4 ++-- taglib/ogg/speex/speexproperties.h | 2 +- taglib/trueaudio/trueaudiofile.h | 2 +- taglib/wavpack/wavpackfile.h | 2 +- 23 files changed, 40 insertions(+), 40 deletions(-) diff --git a/taglib/asf/asfattribute.h b/taglib/asf/asfattribute.h index 7278e90b..6c702c5d 100644 --- a/taglib/asf/asfattribute.h +++ b/taglib/asf/asfattribute.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_ASFATTRIBUTE_H #define TAGLIB_ASFATTRIBUTE_H -#include -#include +#include "tstring.h" +#include "tbytevector.h" #include "taglib_export.h" namespace TagLib diff --git a/taglib/asf/asffile.h b/taglib/asf/asffile.h index 9d2913d5..23a6d009 100644 --- a/taglib/asf/asffile.h +++ b/taglib/asf/asffile.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_ASFFILE_H #define TAGLIB_ASFFILE_H -#include -#include +#include "tag.h" +#include "tfile.h" #include "taglib_export.h" #include "asfproperties.h" #include "asftag.h" diff --git a/taglib/asf/asfproperties.h b/taglib/asf/asfproperties.h index 938b0c9d..653b015e 100644 --- a/taglib/asf/asfproperties.h +++ b/taglib/asf/asfproperties.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_ASFPROPERTIES_H #define TAGLIB_ASFPROPERTIES_H -#include -#include +#include "audioproperties.h" +#include "tstring.h" #include "taglib_export.h" namespace TagLib { diff --git a/taglib/asf/asftag.h b/taglib/asf/asftag.h index 78c90fc2..8e730670 100644 --- a/taglib/asf/asftag.h +++ b/taglib/asf/asftag.h @@ -26,9 +26,9 @@ #ifndef TAGLIB_ASFTAG_H #define TAGLIB_ASFTAG_H -#include -#include -#include +#include "tag.h" +#include "tlist.h" +#include "tmap.h" #include "taglib_export.h" #include "asfattribute.h" diff --git a/taglib/fileref.h b/taglib/fileref.h index 0a7ecee0..0cfe611a 100644 --- a/taglib/fileref.h +++ b/taglib/fileref.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_FILEREF_H #define TAGLIB_FILEREF_H -#include -#include +#include "tfile.h" +#include "tstringlist.h" #include "taglib_export.h" #include "audioproperties.h" diff --git a/taglib/mp4/mp4atom.h b/taglib/mp4/mp4atom.h index 702566b9..a9185613 100644 --- a/taglib/mp4/mp4atom.h +++ b/taglib/mp4/mp4atom.h @@ -30,8 +30,8 @@ #ifndef TAGLIB_MP4ATOM_H #define TAGLIB_MP4ATOM_H -#include -#include +#include "tfile.h" +#include "tlist.h" namespace TagLib { diff --git a/taglib/mp4/mp4file.h b/taglib/mp4/mp4file.h index 3bd15e3a..53d4a028 100644 --- a/taglib/mp4/mp4file.h +++ b/taglib/mp4/mp4file.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_MP4FILE_H #define TAGLIB_MP4FILE_H -#include -#include +#include "tag.h" +#include "tfile.h" #include "taglib_export.h" #include "mp4properties.h" #include "mp4tag.h" diff --git a/taglib/mp4/mp4item.h b/taglib/mp4/mp4item.h index d53c41c3..1405dc59 100644 --- a/taglib/mp4/mp4item.h +++ b/taglib/mp4/mp4item.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_MP4ITEM_H #define TAGLIB_MP4ITEM_H -#include +#include "tstringlist.h" #include "taglib_export.h" namespace TagLib { diff --git a/taglib/mp4/mp4tag.h b/taglib/mp4/mp4tag.h index bd3a360a..a2e0968a 100644 --- a/taglib/mp4/mp4tag.h +++ b/taglib/mp4/mp4tag.h @@ -26,11 +26,11 @@ #ifndef TAGLIB_MP4TAG_H #define TAGLIB_MP4TAG_H -#include -#include -#include -#include -#include +#include "tag.h" +#include "tbytevectorlist.h" +#include "tfile.h" +#include "tmap.h" +#include "tstringlist.h" #include "taglib_export.h" #include "mp4atom.h" #include "mp4item.h" diff --git a/taglib/mpeg/id3v2/frames/attachedpictureframe.h b/taglib/mpeg/id3v2/frames/attachedpictureframe.h index 90b597b8..bd3453cd 100644 --- a/taglib/mpeg/id3v2/frames/attachedpictureframe.h +++ b/taglib/mpeg/id3v2/frames/attachedpictureframe.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_ATTACHEDPICTUREFRAME_H #define TAGLIB_ATTACHEDPICTUREFRAME_H -#include -#include +#include "id3v2frame.h" +#include "id3v2header.h" #include "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/commentsframe.h b/taglib/mpeg/id3v2/frames/commentsframe.h index 9123c739..d02015dd 100644 --- a/taglib/mpeg/id3v2/frames/commentsframe.h +++ b/taglib/mpeg/id3v2/frames/commentsframe.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_COMMENTSFRAME_H #define TAGLIB_COMMENTSFRAME_H -#include +#include "id3v2frame.h" #include "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h index 116ab3fd..ce462c6b 100644 --- a/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h +++ b/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h @@ -28,8 +28,8 @@ #ifndef TAGLIB_GENERALENCAPSULATEDOBJECT_H #define TAGLIB_GENERALENCAPSULATEDOBJECT_H -#include -#include +#include "id3v2frame.h" +#include "id3v2header.h" #include "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/popularimeterframe.h b/taglib/mpeg/id3v2/frames/popularimeterframe.h index 2d626f4d..b1010dfa 100644 --- a/taglib/mpeg/id3v2/frames/popularimeterframe.h +++ b/taglib/mpeg/id3v2/frames/popularimeterframe.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_POPULARIMETERFRAME_H #define TAGLIB_POPULARIMETERFRAME_H -#include +#include "id3v2frame.h" #include "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/relativevolumeframe.h b/taglib/mpeg/id3v2/frames/relativevolumeframe.h index f8521986..189199f6 100644 --- a/taglib/mpeg/id3v2/frames/relativevolumeframe.h +++ b/taglib/mpeg/id3v2/frames/relativevolumeframe.h @@ -26,8 +26,8 @@ #ifndef TAGLIB_RELATIVEVOLUMEFRAME_H #define TAGLIB_RELATIVEVOLUMEFRAME_H -#include -#include +#include "tlist.h" +#include "id3v2frame.h" #include "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.h b/taglib/mpeg/id3v2/frames/textidentificationframe.h index 291cba5b..eccebeba 100644 --- a/taglib/mpeg/id3v2/frames/textidentificationframe.h +++ b/taglib/mpeg/id3v2/frames/textidentificationframe.h @@ -26,10 +26,10 @@ #ifndef TAGLIB_TEXTIDENTIFICATIONFRAME_H #define TAGLIB_TEXTIDENTIFICATIONFRAME_H -#include +#include "tstringlist.h" #include "taglib_export.h" -#include +#include "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h index a0a66bb1..b8a00392 100644 --- a/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h +++ b/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_UNIQUEFILEIDENTIFIERFRAME #define TAGLIB_UNIQUEFILEIDENTIFIERFRAME -#include +#include "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/unknownframe.h b/taglib/mpeg/id3v2/frames/unknownframe.h index 164a44a0..fd1dbbba 100644 --- a/taglib/mpeg/id3v2/frames/unknownframe.h +++ b/taglib/mpeg/id3v2/frames/unknownframe.h @@ -26,7 +26,7 @@ #ifndef TAGLIB_UNKNOWNFRAME_H #define TAGLIB_UNKNOWNFRAME_H -#include +#include "id3v2frame.h" #include "taglib_export.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h index 28cc1e8c..94c09d19 100644 --- a/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h +++ b/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h @@ -28,7 +28,7 @@ #ifndef TAGLIB_UNSYNCHRONIZEDLYRICSFRAME_H #define TAGLIB_UNSYNCHRONIZEDLYRICSFRAME_H -#include +#include "id3v2frame.h" namespace TagLib { diff --git a/taglib/mpeg/id3v2/frames/urllinkframe.h b/taglib/mpeg/id3v2/frames/urllinkframe.h index 649f85de..4810de94 100644 --- a/taglib/mpeg/id3v2/frames/urllinkframe.h +++ b/taglib/mpeg/id3v2/frames/urllinkframe.h @@ -28,7 +28,7 @@ #ifndef TAGLIB_URLLINKFRAME_H #define TAGLIB_URLLINKFRAME_H -#include +#include "id3v2frame.h" namespace TagLib { diff --git a/taglib/ogg/speex/speexfile.h b/taglib/ogg/speex/speexfile.h index 6b585452..b744c25e 100644 --- a/taglib/ogg/speex/speexfile.h +++ b/taglib/ogg/speex/speexfile.h @@ -30,8 +30,8 @@ #ifndef TAGLIB_SPEEXFILE_H #define TAGLIB_SPEEXFILE_H -#include -#include +#include "oggfile.h" +#include "xiphcomment.h" #include "speexproperties.h" diff --git a/taglib/ogg/speex/speexproperties.h b/taglib/ogg/speex/speexproperties.h index 3bab7974..081f0e08 100644 --- a/taglib/ogg/speex/speexproperties.h +++ b/taglib/ogg/speex/speexproperties.h @@ -30,7 +30,7 @@ #ifndef TAGLIB_SPEEXPROPERTIES_H #define TAGLIB_SPEEXPROPERTIES_H -#include +#include "audioproperties.h" namespace TagLib { diff --git a/taglib/trueaudio/trueaudiofile.h b/taglib/trueaudio/trueaudiofile.h index bd30baa8..cbb1755c 100644 --- a/taglib/trueaudio/trueaudiofile.h +++ b/taglib/trueaudio/trueaudiofile.h @@ -30,7 +30,7 @@ #ifndef TAGLIB_TRUEAUDIOFILE_H #define TAGLIB_TRUEAUDIOFILE_H -#include +#include "tfile.h" #include "trueaudioproperties.h" namespace TagLib { diff --git a/taglib/wavpack/wavpackfile.h b/taglib/wavpack/wavpackfile.h index e43a9878..46bd3e8d 100644 --- a/taglib/wavpack/wavpackfile.h +++ b/taglib/wavpack/wavpackfile.h @@ -30,7 +30,7 @@ #ifndef TAGLIB_WVFILE_H #define TAGLIB_WVFILE_H -#include +#include "tfile.h" #include "taglib_export.h" #include "wavpackproperties.h"