From 2f36d0aa2da8b03d525b484228813fbb35f3e35e Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sun, 3 Sep 2023 18:40:03 +0100
Subject: Move TokenList back to its own header and move INSP_FORMAT to compat.

This allows making stringutils an optional header given that most
of it is not used by most of the codebase.
---
 include/stringutils.h | 61 ---------------------------------------------------
 1 file changed, 61 deletions(-)

(limited to 'include/stringutils.h')

diff --git a/include/stringutils.h b/include/stringutils.h
index 30710306e..90b3eef1c 100644
--- a/include/stringutils.h
+++ b/include/stringutils.h
@@ -27,17 +27,6 @@
 
 #pragma once
 
-/** @def INSP_FORMAT(FORMAT, ...)
- * Formats a string with format string checking.
- */
-#if defined __cpp_if_constexpr && defined __cpp_return_type_deduction
-# include <fmt/compile.h>
-# define INSP_FORMAT(FORMAT, ...) fmt::format(FMT_COMPILE(FORMAT), __VA_ARGS__)
-#else
-# include <fmt/core.h>
-# define INSP_FORMAT(FORMAT, ...) fmt::format(FMT_STRING(FORMAT), __VA_ARGS__)
-#endif
-
 namespace Base64
 {
 	/** The default table used when handling Base64-encoded strings. */
@@ -165,53 +154,3 @@ namespace Template
 	 */
 	CoreExport std::string Replace(const std::string& str, const VariableMap& vars);
 }
-
-/** Encapsulates a list of tokens in the format "* -FOO -BAR".*/
-class CoreExport TokenList final
-{
-private:
-	/** Whether this list includes all tokens by default. */
-	bool permissive = false;
-
-	/** Either the tokens to exclude if in permissive mode or the tokens to include if in strict mode. */
-	insp::flat_set<std::string, irc::insensitive_swo> tokens;
-
-public:
-	/** Creates a new empty token list. */
-	TokenList() = default;
-
-	/** Creates a new token list from a list of tokens. */
-	TokenList(const std::string& tokenlist);
-
-	/** Adds a space-delimited list of tokens to the token list.
-	 * @param tokenlist The list of space-delimited tokens to add.
-	 */
-	void AddList(const std::string& tokenlist);
-
-	/** Adds a single token to the token list.
-	 * @param token The token to add.
-	 */
-	void Add(const std::string& token);
-
-	/** Removes all tokens from the token list. */
-	void Clear();
-
-	/** Determines whether the specified token exists in the token list.
-	 * @param token The token to search for.
-	 */
-	bool Contains(const std::string& token) const;
-
-	/** Removes the specified token from the token list.
-	 * @param token The token to remove.
-	 */
-	void Remove(const std::string& token);
-
-	/** Retrieves a string which represents the contents of this token list. */
-	std::string ToString() const;
-
-	/** Determines whether the specified token list contains the same tokens as this instance.
-	 * @param other The tokenlist to compare against.
-	 * @return True if the token lists are equal; otherwise, false.
-	 */
-	bool operator==(const TokenList& other) const;
-};
-- 
cgit v1.3.1-10-gc9f91