tag/Tag*: rename several source files

2017-02-08 08:26:58 +01:00 · 2017-02-08 08:26:58 +01:00 · 03a97d87ea
commit 03a97d87ea
parent 8cbf099054
83 changed files with 116 additions and 116 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -905,18 +905,18 @@ TAG_LIBS = \
 	$(ID3TAG_LIBS)

 libtag_a_SOURCES =\
-	src/tag/TagType.h \
+	src/tag/Type.h \
 	src/tag/Tag.cxx src/tag/Tag.hxx \
-	src/tag/TagBuilder.cxx src/tag/TagBuilder.hxx \
-	src/tag/TagItem.hxx \
-	src/tag/TagHandler.cxx src/tag/TagHandler.hxx \
+	src/tag/Builder.cxx src/tag/Builder.hxx \
+	src/tag/Item.hxx \
+	src/tag/Handler.cxx src/tag/Handler.hxx \
 	src/tag/Mask.hxx \
 	src/tag/Settings.cxx src/tag/Settings.hxx \
-	src/tag/TagConfig.cxx src/tag/TagConfig.hxx \
-	src/tag/TagNames.c \
-	src/tag/TagString.cxx src/tag/TagString.hxx \
-	src/tag/TagPool.cxx src/tag/TagPool.hxx \
-	src/tag/TagTable.cxx src/tag/TagTable.hxx \
+	src/tag/Config.cxx src/tag/Config.hxx \
+	src/tag/Names.c \
+	src/tag/FixString.cxx src/tag/FixString.hxx \
+	src/tag/Pool.cxx src/tag/Pool.hxx \
+	src/tag/Table.cxx src/tag/Table.hxx \
 	src/tag/Set.cxx src/tag/Set.hxx \
 	src/tag/Format.cxx src/tag/Format.hxx \
 	src/tag/VorbisComment.cxx src/tag/VorbisComment.hxx \
@ -931,8 +931,8 @@ if ENABLE_ID3TAG
 libtag_a_SOURCES += \
 	src/tag/Id3Load.cxx src/tag/Id3Load.hxx \
 	src/tag/Id3Unique.hxx \
-	src/tag/TagId3.cxx src/tag/TagId3.hxx \
-	src/tag/TagRva2.cxx src/tag/TagRva2.hxx \
+	src/tag/Id3Scan.cxx src/tag/Id3Scan.hxx \
+	src/tag/Rva2.cxx src/tag/Rva2.hxx \
 	src/tag/Riff.cxx src/tag/Riff.hxx \
 	src/tag/Aiff.cxx src/tag/Aiff.hxx
 endif
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/Domain.hxx"
 #include "util/StringView.hxx"
 #include "Log.hxx"
--- a/src/Main.cxx
+++ b/src/Main.cxx
@ -32,7 +32,7 @@
 #include "client/ClientList.hxx"
 #include "command/AllCommands.hxx"
 #include "Partition.hxx"
-#include "tag/TagConfig.hxx"
+#include "tag/Config.hxx"
 #include "ReplayGainGlobal.hxx"
 #include "Idle.hxx"
 #include "Log.hxx"
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@ -25,7 +25,7 @@
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/StringUtil.hxx"
 #include "util/RuntimeError.hxx"

--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@ -26,7 +26,7 @@
 #include "util/UriUtil.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileInfo.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "TagFile.hxx"
 #include "TagStream.hxx"

--- a/src/TagFile.cxx
+++ b/src/TagFile.cxx
@ -20,8 +20,8 @@
 #include "config.h"
 #include "TagFile.hxx"
 #include "tag/Generic.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "fs/Path.hxx"
 #include "decoder/DecoderList.hxx"
 #include "decoder/DecoderPlugin.hxx"
--- a/src/TagStream.cxx
+++ b/src/TagStream.cxx
@ -20,8 +20,8 @@
 #include "config.h"
 #include "TagStream.hxx"
 #include "tag/Generic.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "util/MimeType.hxx"
 #include "util/UriUtil.hxx"
 #include "decoder/DecoderList.hxx"
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@ -33,7 +33,7 @@
 #include "NeighborCommands.hxx"
 #include "OtherCommands.hxx"
 #include "Permission.hxx"
-#include "tag/TagType.h"
+#include "tag/Type.h"
 #include "Partition.hxx"
 #include "client/Client.hxx"
 #include "client/Response.hxx"
--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@ -28,7 +28,7 @@
 #include "client/Response.hxx"
 #include "util/CharUtil.hxx"
 #include "util/UriUtil.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "tag/Generic.hxx"
 #include "TagStream.hxx"
 #include "TagFile.hxx"
--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@ -30,7 +30,7 @@
 #include "SongPrint.hxx"
 #include "TagPrint.hxx"
 #include "TagStream.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "TimePrint.hxx"
 #include "decoder/DecoderPrint.hxx"
 #include "ls.hxx"
--- a/src/db/Interface.hxx
+++ b/src/db/Interface.hxx
@ -21,7 +21,7 @@
 #define MPD_DATABASE_INTERFACE_HXX

 #include "Visitor.hxx"
-#include "tag/TagType.h"
+#include "tag/Type.h"
 #include "tag/Mask.hxx"
 #include "Compiler.h"

--- a/src/db/UniqueTags.hxx
+++ b/src/db/UniqueTags.hxx
@ -21,7 +21,7 @@
 #define MPD_DB_UNIQUE_TAGS_HXX

 #include "Visitor.hxx"
-#include "tag/TagType.h"
+#include "tag/Type.h"
 #include "tag/Mask.hxx"

 class Database;
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@ -31,7 +31,7 @@
 #include "SongFilter.hxx"
 #include "Compiler.h"
 #include "config/Block.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "tag/Tag.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/db/plugins/upnp/Directory.cxx
+++ b/src/db/plugins/upnp/Directory.cxx
@ -22,8 +22,8 @@
 #include "lib/upnp/Util.hxx"
 #include "lib/expat/ExpatParser.hxx"
 #include "Tags.hxx"
-#include "tag/TagBuilder.hxx"
-#include "tag/TagTable.hxx"
+#include "tag/Builder.hxx"
+#include "tag/Table.hxx"
 #include "util/NumberParser.hxx"
 #include "util/StringView.hxx"

--- a/src/db/plugins/upnp/Tags.cxx
+++ b/src/db/plugins/upnp/Tags.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "Tags.hxx"
-#include "tag/TagTable.hxx"
+#include "tag/Table.hxx"

 const struct tag_table upnp_tags[] = {
 	{ "upnp:artist", TAG_ARTIST },
--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
@ -33,8 +33,8 @@
 #include "db/LightSong.hxx"
 #include "db/Stats.hxx"
 #include "config/Block.hxx"
-#include "tag/TagBuilder.hxx"
-#include "tag/TagTable.hxx"
+#include "tag/Builder.hxx"
+#include "tag/Table.hxx"
 #include "fs/Traits.hxx"
 #include "Log.hxx"
 #include "SongFilter.hxx"
--- a/src/decoder/plugins/AdPlugDecoderPlugin.cxx
+++ b/src/decoder/plugins/AdPlugDecoderPlugin.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "AdPlugDecoderPlugin.h"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "../DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
 #include "fs/Path.hxx"
--- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx
+++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
@ -22,7 +22,7 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
--- a/src/decoder/plugins/DsdLib.cxx
+++ b/src/decoder/plugins/DsdLib.cxx
@ -27,7 +27,7 @@
 #include "DsdLib.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
-#include "tag/TagId3.hxx"
+#include "tag/Id3Scan.hxx"

 #ifdef ENABLE_ID3TAG
 #include <id3tag.h>
--- a/src/decoder/plugins/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/plugins/DsdiffDecoderPlugin.cxx
@ -33,7 +33,7 @@
 #include "CheckAudioFormat.hxx"
 #include "util/bit_reverse.h"
 #include "system/ByteOrder.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "DsdLib.hxx"
 #include "Log.hxx"

--- a/src/decoder/plugins/DsfDecoderPlugin.cxx
+++ b/src/decoder/plugins/DsfDecoderPlugin.cxx
@ -35,7 +35,7 @@
 #include "util/bit_reverse.h"
 #include "system/ByteOrder.hxx"
 #include "DsdLib.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "Log.hxx"

 #include <string.h>
--- a/src/decoder/plugins/FaadDecoderPlugin.cxx
+++ b/src/decoder/plugins/FaadDecoderPlugin.cxx
@ -23,7 +23,7 @@
 #include "../DecoderBuffer.hxx"
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/Domain.hxx"
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@ -32,8 +32,8 @@
 #include "FfmpegMetaData.hxx"
 #include "FfmpegIo.hxx"
 #include "pcm/Interleave.hxx"
-#include "tag/TagBuilder.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Builder.hxx"
+#include "tag/Handler.hxx"
 #include "tag/ReplayGain.hxx"
 #include "tag/MixRamp.hxx"
 #include "input/InputStream.hxx"
--- a/src/decoder/plugins/FfmpegMetaData.cxx
+++ b/src/decoder/plugins/FfmpegMetaData.cxx
@ -22,8 +22,8 @@

 #include "config.h"
 #include "FfmpegMetaData.hxx"
-#include "tag/TagTable.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Table.hxx"
+#include "tag/Handler.hxx"

 extern "C" {
 #include <libavutil/dict.h>
--- a/src/decoder/plugins/FlacMetadata.cxx
+++ b/src/decoder/plugins/FlacMetadata.cxx
@ -21,9 +21,9 @@
 #include "FlacMetadata.hxx"
 #include "lib/xiph/XiphTags.hxx"
 #include "MixRampInfo.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagTable.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Table.hxx"
+#include "tag/Builder.hxx"
 #include "tag/Tag.hxx"
 #include "tag/VorbisComment.hxx"
 #include "tag/ReplayGain.hxx"
--- a/src/decoder/plugins/GmeDecoderPlugin.cxx
+++ b/src/decoder/plugins/GmeDecoderPlugin.cxx
@ -23,8 +23,8 @@
 #include "config/Block.cxx"
 #include "CheckAudioFormat.hxx"
 #include "DetachedSong.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "fs/Path.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/ScopeExit.hxx"
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@ -22,9 +22,9 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "tag/TagId3.hxx"
-#include "tag/TagRva2.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Id3Scan.hxx"
+#include "tag/Rva2.hxx"
+#include "tag/Handler.hxx"
 #include "tag/ReplayGain.hxx"
 #include "tag/MixRamp.hxx"
 #include "CheckAudioFormat.hxx"
--- a/src/decoder/plugins/MikmodDecoderPlugin.cxx
+++ b/src/decoder/plugins/MikmodDecoderPlugin.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "MikmodDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "fs/Path.hxx"
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/decoder/plugins/ModplugDecoderPlugin.cxx
+++ b/src/decoder/plugins/ModplugDecoderPlugin.cxx
@ -21,7 +21,7 @@
 #include "ModplugDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/WritableBuffer.hxx"
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/decoder/plugins/MpcdecDecoderPlugin.cxx
+++ b/src/decoder/plugins/MpcdecDecoderPlugin.cxx
@ -23,7 +23,7 @@
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
 #include "pcm/Traits.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/Domain.hxx"
 #include "util/Macros.hxx"
 #include "util/Clamp.hxx"
--- a/src/decoder/plugins/Mpg123DecoderPlugin.cxx
+++ b/src/decoder/plugins/Mpg123DecoderPlugin.cxx
@ -21,8 +21,8 @@
 #include "Mpg123DecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "tag/ReplayGain.hxx"
 #include "tag/MixRamp.hxx"
 #include "fs/Path.hxx"
--- a/src/decoder/plugins/OpusDecoderPlugin.cxx
+++ b/src/decoder/plugins/OpusDecoderPlugin.cxx
@ -29,8 +29,8 @@
 #include "decoder/Reader.hxx"
 #include "input/Reader.hxx"
 #include "OggCodec.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "input/InputStream.hxx"
 #include "util/RuntimeError.hxx"
 #include "Log.hxx"
--- a/src/decoder/plugins/OpusTags.cxx
+++ b/src/decoder/plugins/OpusTags.cxx
@ -21,7 +21,7 @@
 #include "OpusTags.hxx"
 #include "OpusReader.hxx"
 #include "lib/xiph/XiphTags.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "tag/Tag.hxx"
 #include "ReplayGainInfo.hxx"

--- a/src/decoder/plugins/SidplayDecoderPlugin.cxx
+++ b/src/decoder/plugins/SidplayDecoderPlugin.cxx
@ -20,8 +20,8 @@
 #include "config.h"
 #include "SidplayDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "DetachedSong.hxx"
 #include "fs/Path.hxx"
 #include "fs/AllocatedPath.hxx"
--- a/src/decoder/plugins/SndfileDecoderPlugin.cxx
+++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx
@ -22,7 +22,7 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"

--- a/src/decoder/plugins/VorbisDecoderPlugin.cxx
+++ b/src/decoder/plugins/VorbisDecoderPlugin.cxx
@ -32,7 +32,7 @@
 #include "util/Macros.hxx"
 #include "util/ScopeExit.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "Log.hxx"

 #ifndef HAVE_TREMOR
--- a/src/decoder/plugins/WavpackDecoderPlugin.cxx
+++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx
@ -22,7 +22,7 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "fs/Path.hxx"
 #include "util/Macros.hxx"
 #include "util/Alloc.hxx"
--- a/src/decoder/plugins/WildmidiDecoderPlugin.cxx
+++ b/src/decoder/plugins/WildmidiDecoderPlugin.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "WildmidiDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/Domain.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@ -29,7 +29,7 @@
 #include "../InputPlugin.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/Block.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "event/Call.hxx"
 #include "event/Loop.hxx"
 #include "thread/Cond.hxx"
--- a/src/lib/xiph/VorbisComments.cxx
+++ b/src/lib/xiph/VorbisComments.cxx
@ -20,9 +20,9 @@
 #include "config.h"
 #include "VorbisComments.hxx"
 #include "XiphTags.hxx"
-#include "tag/TagTable.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Table.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "tag/VorbisComment.hxx"
 #include "tag/ReplayGain.hxx"
 #include "ReplayGainInfo.hxx"
--- a/src/lib/xiph/XiphTags.hxx
+++ b/src/lib/xiph/XiphTags.hxx
@ -21,7 +21,7 @@
 #define MPD_XIPH_TAGS_HXX

 #include "check.h"
-#include "tag/TagTable.hxx"
+#include "tag/Table.hxx"

 extern const struct tag_table xiph_tags[];

--- a/src/output/plugins/httpd/IcyMetaDataServer.hxx
+++ b/src/output/plugins/httpd/IcyMetaDataServer.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_ICY_META_DATA_SERVER_HXX
 #define MPD_ICY_META_DATA_SERVER_HXX

-#include "tag/TagType.h"
+#include "tag/Type.h"

 struct Tag;
 class Page;
--- a/src/playlist/PlaylistSong.cxx
+++ b/src/playlist/PlaylistSong.cxx
@ -21,7 +21,7 @@
 #include "PlaylistSong.hxx"
 #include "SongLoader.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "fs/Traits.hxx"
 #include "util/UriUtil.hxx"
 #include "DetachedSong.hxx"
--- a/src/playlist/cue/CueParser.hxx
+++ b/src/playlist/cue/CueParser.hxx
@ -22,7 +22,7 @@

 #include "check.h"
 #include "DetachedSong.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "Compiler.h"

 #include <string>
--- a/src/playlist/plugins/AsxPlaylistPlugin.cxx
+++ b/src/playlist/plugins/AsxPlaylistPlugin.cxx
@ -21,7 +21,7 @@
 #include "AsxPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/ASCII.hxx"
 #include "util/StringView.hxx"
 #include "lib/expat/ExpatParser.hxx"
--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
@ -28,7 +28,7 @@
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
 #include "../cue/CueParser.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "tag/Generic.hxx"
 #include "DetachedSong.hxx"
 #include "TagFile.hxx"
--- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
@ -23,7 +23,7 @@
 #include "../SongEnumerator.hxx"
 #include "DetachedSong.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/StringUtil.hxx"
 #include "util/StringCompare.hxx"
 #include "input/TextInputStream.hxx"
--- a/src/playlist/plugins/PlsPlaylistPlugin.cxx
+++ b/src/playlist/plugins/PlsPlaylistPlugin.cxx
@ -24,7 +24,7 @@
 #include "input/TextInputStream.hxx"
 #include "input/InputStream.hxx"
 #include "DetachedSong.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/ASCII.hxx"
 #include "util/StringUtil.hxx"
 #include "util/DivideString.hxx"
--- a/src/playlist/plugins/RssPlaylistPlugin.cxx
+++ b/src/playlist/plugins/RssPlaylistPlugin.cxx
@ -21,7 +21,7 @@
 #include "RssPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/ASCII.hxx"
 #include "util/StringView.hxx"
 #include "lib/expat/ExpatParser.hxx"
--- a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
+++ b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
@ -23,7 +23,7 @@
 #include "../MemorySongEnumerator.hxx"
 #include "config/Block.hxx"
 #include "input/InputStream.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/StringCompare.hxx"
 #include "util/Alloc.hxx"
 #include "util/Domain.hxx"
--- a/src/playlist/plugins/XspfPlaylistPlugin.cxx
+++ b/src/playlist/plugins/XspfPlaylistPlugin.cxx
@ -23,7 +23,7 @@
 #include "../MemorySongEnumerator.hxx"
 #include "DetachedSong.hxx"
 #include "input/InputStream.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/StringView.hxx"
 #include "lib/expat/ExpatParser.hxx"
 #include "Log.hxx"
--- a/src/queue/PlaylistTag.cxx
+++ b/src/queue/PlaylistTag.cxx
@ -28,7 +28,7 @@
 #include "PlaylistError.hxx"
 #include "DetachedSong.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"

 void
 playlist::AddSongIdTag(unsigned id, TagType tag_type, const char *value)
--- a/src/tag/ApeTag.cxx
+++ b/src/tag/ApeTag.cxx
@ -21,8 +21,8 @@
 #include "ApeTag.hxx"
 #include "ApeLoader.hxx"
 #include "Tag.hxx"
-#include "TagTable.hxx"
-#include "TagHandler.hxx"
+#include "Table.hxx"
+#include "Handler.hxx"
 #include "util/StringView.hxx"

 #include <string>
--- a/src/tag/ApeTag.hxx
+++ b/src/tag/ApeTag.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_APE_TAG_HXX
 #define MPD_APE_TAG_HXX

-#include "TagTable.hxx"
+#include "Table.hxx"

 class InputStream;
 struct TagHandler;
--- a/src/tag/TagBuilder.cxx
+++ b/src/tag/TagBuilder.cxx
@ -18,10 +18,10 @@
 */

 #include "config.h"
-#include "TagBuilder.hxx"
+#include "Builder.hxx"
 #include "Settings.hxx"
-#include "TagPool.hxx"
-#include "TagString.hxx"
+#include "Pool.hxx"
+#include "FixString.hxx"
 #include "Tag.hxx"
 #include "util/WritableBuffer.hxx"
 #include "util/StringView.hxx"
--- a/src/tag/TagBuilder.hxx
+++ b/src/tag/TagBuilder.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_TAG_BUILDER_HXX
 #define MPD_TAG_BUILDER_HXX

-#include "TagType.h"
+#include "Type.h"
 #include "Chrono.hxx"
 #include "Compiler.h"

--- a/src/tag/TagConfig.cxx
+++ b/src/tag/TagConfig.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "TagConfig.hxx"
+#include "Config.hxx"
 #include "Settings.hxx"
 #include "Tag.hxx"
 #include "config/ConfigGlobal.hxx"
--- a/src/tag/TagConfig.hxx
+++ b/src/tag/TagConfig.hxx
--- a/src/tag/FixString.cxx
+++ b/src/tag/FixString.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "TagString.hxx"
+#include "FixString.hxx"
 #include "util/Alloc.hxx"
 #include "util/WritableBuffer.hxx"
 #include "util/StringView.hxx"
--- a/src/tag/FixString.hxx
+++ b/src/tag/FixString.hxx
--- a/src/tag/Generic.cxx
+++ b/src/tag/Generic.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "Generic.hxx"
-#include "TagId3.hxx"
+#include "Id3Scan.hxx"
 #include "ApeTag.hxx"
 #include "fs/Path.hxx"
 #include "thread/Mutex.hxx"
--- a/src/tag/TagHandler.cxx
+++ b/src/tag/TagHandler.cxx
@ -18,8 +18,8 @@
 */

 #include "config.h"
-#include "TagHandler.hxx"
-#include "TagBuilder.hxx"
+#include "Handler.hxx"
+#include "Builder.hxx"
 #include "util/ASCII.hxx"

 #include <stdio.h>
--- a/src/tag/TagHandler.hxx
+++ b/src/tag/TagHandler.hxx
@ -21,7 +21,7 @@
 #define MPD_TAG_HANDLER_HXX

 #include "check.h"
-#include "TagType.h"
+#include "Type.h"
 #include "Chrono.hxx"

 #include <assert.h>
--- a/src/tag/Id3Scan.cxx
+++ b/src/tag/Id3Scan.cxx
@ -18,11 +18,11 @@
 */

 #include "config.h"
-#include "TagId3.hxx"
+#include "Id3Scan.hxx"
 #include "Id3Load.hxx"
-#include "TagHandler.hxx"
-#include "TagTable.hxx"
-#include "TagBuilder.hxx"
+#include "Handler.hxx"
+#include "Table.hxx"
+#include "Builder.hxx"
 #include "util/Alloc.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/StringUtil.hxx"
--- a/src/tag/Id3Scan.hxx
+++ b/src/tag/Id3Scan.hxx
@ -17,8 +17,8 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_TAG_ID3_HXX
-#define MPD_TAG_ID3_HXX
+#ifndef MPD_TAG_ID3_SCAN_HXX
+#define MPD_TAG_ID3_SCAN_HXX

 #include "check.h"

--- a/src/tag/TagItem.hxx
+++ b/src/tag/TagItem.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_TAG_ITEM_HXX
 #define MPD_TAG_ITEM_HXX

-#include "TagType.h"
+#include "Type.h"

 /**
 * One tag value.  It is a mapping of #TagType to am arbitrary string
--- a/src/tag/TagNames.c
+++ b/src/tag/TagNames.c
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "TagType.h"
+#include "Type.h"

 const char *const tag_item_names[TAG_NUM_OF_ITEM_TYPES] = {
 	[TAG_ARTIST] = "Artist",
--- a/src/tag/TagPool.cxx
+++ b/src/tag/TagPool.cxx
@ -18,8 +18,8 @@
 */

 #include "config.h"
-#include "TagPool.hxx"
-#include "TagItem.hxx"
+#include "Pool.hxx"
+#include "Item.hxx"
 #include "util/Cast.hxx"
 #include "util/VarSize.hxx"
 #include "util/StringView.hxx"
--- a/src/tag/TagPool.hxx
+++ b/src/tag/TagPool.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_TAG_POOL_HXX
 #define MPD_TAG_POOL_HXX

-#include "TagType.h"
+#include "Type.h"
 #include "thread/Mutex.hxx"

 extern Mutex tag_pool_lock;
--- a/src/tag/TagRva2.cxx
+++ b/src/tag/TagRva2.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "TagRva2.hxx"
+#include "Rva2.hxx"
 #include "ReplayGainInfo.hxx"

 #include <id3tag.h>
--- a/src/tag/TagRva2.hxx
+++ b/src/tag/TagRva2.hxx
--- a/src/tag/Set.cxx
+++ b/src/tag/Set.cxx
@ -18,7 +18,7 @@
 */

 #include "Set.hxx"
-#include "TagBuilder.hxx"
+#include "Builder.hxx"
 #include "Settings.hxx"

 #include <assert.h>
--- a/src/tag/Settings.hxx
+++ b/src/tag/Settings.hxx
@ -21,7 +21,7 @@
 #define MPD_TAG_SETTINGS_HXX

 #include "Mask.hxx"
-#include "TagType.h"
+#include "Type.h"
 #include "Compiler.h"

 extern tag_mask_t global_tag_mask;
--- a/src/tag/TagTable.cxx
+++ b/src/tag/TagTable.cxx
@ -17,7 +17,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "TagTable.hxx"
+#include "Table.hxx"
 #include "util/ASCII.hxx"

 #include <string.h>
--- a/src/tag/TagTable.hxx
+++ b/src/tag/TagTable.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_TAG_TABLE_HXX
 #define MPD_TAG_TABLE_HXX

-#include "TagType.h"
+#include "Type.h"
 #include "Compiler.h"

 struct tag_table {
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
@ -19,8 +19,8 @@

 #include "config.h"
 #include "Tag.hxx"
-#include "TagPool.hxx"
-#include "TagBuilder.hxx"
+#include "Pool.hxx"
+#include "Builder.hxx"
 #include "util/ASCII.hxx"

 #include <assert.h>
--- a/src/tag/Tag.hxx
+++ b/src/tag/Tag.hxx
@ -20,8 +20,8 @@
 #ifndef MPD_TAG_HXX
 #define MPD_TAG_HXX

-#include "TagType.h" // IWYU pragma: export
-#include "TagItem.hxx" // IWYU pragma: export
+#include "Type.h" // IWYU pragma: export
+#include "Item.hxx" // IWYU pragma: export
 #include "Chrono.hxx"
 #include "Compiler.h"

--- a/src/tag/TagType.h
+++ b/src/tag/TagType.h
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@ -29,7 +29,7 @@
 #include "config/ConfigGlobal.hxx"
 #include "config/Param.hxx"
 #include "config/Block.hxx"
-#include "tag/TagConfig.hxx"
+#include "tag/Config.hxx"
 #include "fs/Path.hxx"
 #include "event/Loop.hxx"
 #include "Log.hxx"
--- a/test/dump_rva2.cxx
+++ b/test/dump_rva2.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "tag/Id3Load.hxx"
-#include "tag/TagRva2.hxx"
+#include "tag/Rva2.hxx"
 #include "ReplayGainInfo.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "thread/Mutex.hxx"
--- a/test/read_tags.cxx
+++ b/test/read_tags.cxx
@ -23,7 +23,7 @@
 #include "decoder/DecoderPlugin.hxx"
 #include "input/Init.hxx"
 #include "input/InputStream.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "tag/Generic.hxx"
 #include "fs/Path.hxx"
 #include "thread/Cond.hxx"
--- a/test/test_translate_song.cxx
+++ b/test/test_translate_song.cxx
@ -7,7 +7,7 @@
 #include "DetachedSong.hxx"
 #include "SongLoader.hxx"
 #include "client/Client.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "tag/Tag.hxx"
 #include "util/Domain.hxx"
 #include "fs/AllocatedPath.hxx"
--- a/test/test_vorbis_encoder.cxx
+++ b/test/test_vorbis_encoder.cxx
@ -26,7 +26,7 @@
 #include "config/Block.hxx"
 #include "fs/io/StdioOutputStream.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "Log.hxx"

 #include <memory>