tag/Tag*: rename several source files

26 files changed, 33 insertions, 33 deletions

diff --git a/src/tag/ApeTag.cxx b/src/tag/ApeTag.cxx
index ebf988ee5..6e5a88a8f 100644
--- 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>
diff --git a/src/tag/ApeTag.hxx b/src/tag/ApeTag.hxx
index 0586e530d..93b8ba126 100644
--- 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;
diff --git a/src/tag/TagBuilder.cxx b/src/tag/Builder.cxx
index 6d259dc54..57f176869 100644
--- a/src/tag/TagBuilder.cxx
+++ b/src/tag/Builder.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"
diff --git a/src/tag/TagBuilder.hxx b/src/tag/Builder.hxx
index 43b4d71e7..b940515c6 100644
--- a/src/tag/TagBuilder.hxx
+++ b/src/tag/Builder.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"
 
diff --git a/src/tag/TagConfig.cxx b/src/tag/Config.cxx
index 93f8675e5..8a691efd0 100644
--- a/src/tag/TagConfig.cxx
+++ b/src/tag/Config.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "TagConfig.hxx"
+#include "Config.hxx"
 #include "Settings.hxx"
 #include "Tag.hxx"
 #include "config/ConfigGlobal.hxx"
diff --git a/src/tag/TagConfig.hxx b/src/tag/Config.hxx
index 47d1eb835..47d1eb835 100644
--- a/src/tag/TagConfig.hxx
+++ b/src/tag/Config.hxx
diff --git a/src/tag/TagString.cxx b/src/tag/FixString.cxx
index 8462c1fa1..b70118dc4 100644
--- a/src/tag/TagString.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"
diff --git a/src/tag/TagString.hxx b/src/tag/FixString.hxx
index 618d9640d..618d9640d 100644
--- a/src/tag/TagString.hxx
+++ b/src/tag/FixString.hxx
diff --git a/src/tag/Generic.cxx b/src/tag/Generic.cxx
index 852065d97..859f4382b 100644
--- 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"
diff --git a/src/tag/TagHandler.cxx b/src/tag/Handler.cxx
index 46e3e79b4..c04bddb72 100644
--- a/src/tag/TagHandler.cxx
+++ b/src/tag/Handler.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>
diff --git a/src/tag/TagHandler.hxx b/src/tag/Handler.hxx
index a66d4d41c..8611cb5ba 100644
--- a/src/tag/TagHandler.hxx
+++ b/src/tag/Handler.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>
diff --git a/src/tag/TagId3.cxx b/src/tag/Id3Scan.cxx
index f9bf7e9b2..74433fa47 100644
--- a/src/tag/TagId3.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"
diff --git a/src/tag/TagId3.hxx b/src/tag/Id3Scan.hxx
index 13300c0a2..21d86346c 100644
--- a/src/tag/TagId3.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"
 
diff --git a/src/tag/TagItem.hxx b/src/tag/Item.hxx
index f92269ad1..e3ff7b6a5 100644
--- a/src/tag/TagItem.hxx
+++ b/src/tag/Item.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
diff --git a/src/tag/TagNames.c b/src/tag/Names.c
index 9f470b094..6e5ebc2bc 100644
--- a/src/tag/TagNames.c
+++ b/src/tag/Names.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",
diff --git a/src/tag/TagPool.cxx b/src/tag/Pool.cxx
index fc5cd06aa..fa38d6526 100644
--- a/src/tag/TagPool.cxx
+++ b/src/tag/Pool.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"
diff --git a/src/tag/TagPool.hxx b/src/tag/Pool.hxx
index 3c4496ec6..927774d4e 100644
--- a/src/tag/TagPool.hxx
+++ b/src/tag/Pool.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;
diff --git a/src/tag/TagRva2.cxx b/src/tag/Rva2.cxx
index d51a5cb2e..2291aa34d 100644
--- a/src/tag/TagRva2.cxx
+++ b/src/tag/Rva2.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "TagRva2.hxx"
+#include "Rva2.hxx"
 #include "ReplayGainInfo.hxx"
 
 #include <id3tag.h>
diff --git a/src/tag/TagRva2.hxx b/src/tag/Rva2.hxx
index d30d2ad0f..d30d2ad0f 100644
--- a/src/tag/TagRva2.hxx
+++ b/src/tag/Rva2.hxx
diff --git a/src/tag/Set.cxx b/src/tag/Set.cxx
index 8becc4cf8..97aabef08 100644
--- 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>
diff --git a/src/tag/Settings.hxx b/src/tag/Settings.hxx
index a6e573cee..01cd6af4e 100644
--- 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;
diff --git a/src/tag/TagTable.cxx b/src/tag/Table.cxx
index 74ef03521..d8ca1798b 100644
--- a/src/tag/TagTable.cxx
+++ b/src/tag/Table.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>
diff --git a/src/tag/TagTable.hxx b/src/tag/Table.hxx
index 3591fbb1d..3bda0f21f 100644
--- a/src/tag/TagTable.hxx
+++ b/src/tag/Table.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 {
diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx
index d2623793b..85732d2e8 100644
--- 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>
diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx
index 236793649..9320e767e 100644
--- 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"
 
diff --git a/src/tag/TagType.h b/src/tag/Type.h
index e5a4ef1f7..e5a4ef1f7 100644
--- a/src/tag/TagType.h
+++ b/src/tag/Type.h