db/Interface, ...: forward-declare TagType

src/command/ClientCommands.cxx

@@ -8,6 +8,7 @@
 #include "client/Response.hxx"
 #include "TagPrint.hxx"
 #include "tag/ParseName.hxx"
+#include "tag/Type.h"
 #include "util/StringAPI.hxx"
 
 CommandResult

src/command/TagCommands.cxx

@@ -6,6 +6,7 @@
 #include "client/Client.hxx"
 #include "client/Response.hxx"
 #include "tag/ParseName.hxx"
+#include "tag/Type.h"
 #include "queue/Playlist.hxx"
 
 #include <fmt/format.h>

src/db/Interface.hxx

@@ -5,12 +5,13 @@
 #define MPD_DATABASE_INTERFACE_HXX
 
 #include "Visitor.hxx"
-#include "tag/Type.h"
 
 #include <chrono>
+#include <cstdint>
 #include <span>
 #include <string>
 
+enum TagType : uint8_t;
 struct DatabasePlugin;
 struct DatabaseStats;
 struct DatabaseSelection;

src/db/UniqueTags.hxx

@@ -4,11 +4,11 @@
 #ifndef MPD_DB_UNIQUE_TAGS_HXX
 #define MPD_DB_UNIQUE_TAGS_HXX
 
-#include "tag/Type.h"
-
+#include <cstdint>
 #include <span>
 #include <string>
 
+enum TagType : uint8_t;
 class Database;
 struct DatabaseSelection;
 template<typename Key> class RecursiveMap;

src/output/plugins/httpd/IcyMetaDataServer.hxx

@@ -5,8 +5,10 @@
 #define MPD_ICY_META_DATA_SERVER_HXX
 
 #include "Page.hxx"
-#include "tag/Type.h"
 
+#include <cstdint>
+
+enum TagType : uint8_t;
 struct Tag;
 class AllocatedString;
 

src/song/Filter.cxx

@@ -12,6 +12,7 @@
 #include "PrioritySongFilter.hxx"
 #include "pcm/AudioParser.hxx"
 #include "tag/ParseName.hxx"
+#include "tag/Type.h"
 #include "time/ISO8601.hxx"
 #include "lib/fmt/RuntimeError.hxx"
 #include "util/CharUtil.hxx"

src/tag/Config.cxx

@@ -4,6 +4,7 @@
 #include "Config.hxx"
 #include "Settings.hxx"
 #include "ParseName.hxx"
+#include "Type.h"
 #include "config/Data.hxx"
 #include "config/Option.hxx"
 #include "lib/fmt/RuntimeError.hxx"

src/tag/Fallback.hxx

@@ -4,6 +4,8 @@
 #ifndef MPD_TAG_FALLBACK_HXX
 #define MPD_TAG_FALLBACK_HXX
 
+#include "Type.h"
+
 #include <utility>
 
 /**

src/tag/GenParseName.cxx

@@ -31,6 +31,7 @@ main(int argc, char **argv)
 
 	fprintf(out,
 		"#include \"ParseName.hxx\"\n"
+		"#include \"Type.h\"\n"
 		"\n"
 		"#include <assert.h>\n"
 		"#include <string.h>\n"

src/tag/Handler.hxx

@@ -4,14 +4,15 @@
 #ifndef MPD_TAG_HANDLER_HXX
 #define MPD_TAG_HANDLER_HXX
 
-#include "Type.h"
 #include "Chrono.hxx"
 #include "util/Compiler.h"
 
 #include <cstddef>
+#include <cstdint>
 #include <span>
 #include <string_view>
 
+enum TagType : uint8_t;
 struct AudioFormat;
 class TagBuilder;
 

src/tag/Item.hxx

@@ -4,7 +4,9 @@
 #ifndef MPD_TAG_ITEM_HXX
 #define MPD_TAG_ITEM_HXX
 
-#include "Type.h"
+#include <cstdint>
+
+enum TagType : uint8_t;
 
 /**
  * One tag value.  It is a mapping of #TagType to am arbitrary string

src/tag/Mask.hxx

@@ -4,10 +4,10 @@
 #ifndef MPD_TAG_MASK_HXX
 #define MPD_TAG_MASK_HXX
 
-#include "Type.h"
-
 #include <cstdint>
 
+enum TagType : uint8_t;
+
 class TagMask {
 	typedef uint_least32_t mask_t;
 	mask_t value;

src/tag/ParseName.hxx

@@ -4,10 +4,11 @@
 #ifndef MPD_TAG_PARSE_NAME_HXX
 #define MPD_TAG_PARSE_NAME_HXX
 
-#include "Type.h"
-
+#include <cstdint>
 #include <string_view>
 
+enum TagType : uint8_t;
+
 /**
  * Parse the string, and convert it into a #TagType.  Returns
  * #TAG_NUM_OF_ITEM_TYPES if the string could not be recognized.

src/tag/Pool.hxx

@@ -4,11 +4,13 @@
 #ifndef MPD_TAG_POOL_HXX
 #define MPD_TAG_POOL_HXX
 
-#include "Type.h"
 #include "thread/Mutex.hxx"
 
+#include <cstdint>
 #include <string_view>
 
+enum TagType : uint8_t;
+
 extern Mutex tag_pool_lock;
 
 struct TagItem;

src/tag/Settings.cxx

@@ -2,5 +2,6 @@
 // Copyright The Music Player Daemon Project
 
 #include "Settings.hxx"
+#include "Type.h"
 
 TagMask global_tag_mask = TagMask::All() & ~TagMask(TAG_COMMENT);

src/tag/Settings.hxx

@@ -5,7 +5,6 @@
 #define MPD_TAG_SETTINGS_HXX
 
 #include "Mask.hxx"
-#include "Type.h"
 
 extern TagMask global_tag_mask;
 

src/tag/Sort.hxx

@@ -3,8 +3,9 @@
 
 #pragma once
 
-#include "Type.h"
+#include <cstdint>
 
+enum TagType : uint8_t;
 struct Tag;
 
 [[gnu::pure]]