Create definitions for u8string and u8string_view

src/openrct2-ui/interface/InGameConsole.h

@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include <openrct2/core/String.hpp>
 #include <openrct2/interface/InteractiveConsole.h>
 #include <openrct2/localisation/FormatCodes.h>
 #include <openrct2/world/Location.hpp>

src/openrct2/Context.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "common.h"
+#include "core/String.hpp"
 #include "world/Location.hpp"
 
 #include <memory>

src/openrct2/FileClassifier.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "common.h"
+#include "core/String.hpp"
 
 enum
 {

src/openrct2/Game.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "common.h"
+#include "core/String.hpp"
 
 #include <string>
 

src/openrct2/OpenRCT2.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "common.h"
+#include "core/String.hpp"
 
 #include <string>
 

src/openrct2/common.h

@@ -24,17 +24,12 @@
 #include <cstddef>
 #include <cstdint>
 
-using utf8 = char;
-using utf8string = utf8*;
-using const_utf8string = const utf8*;
-
 // Define MAX_PATH for various headers that don't want to include system headers
 // just for MAX_PATH
 #ifndef MAX_PATH
 #    define MAX_PATH 260
 #endif
 
-using codepoint_t = uint32_t;
 using colour_t = uint8_t;
 
 // Gets the name of a symbol as a C string

src/openrct2/config/Config.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 #include "../drawing/Drawing.h"
 #include "../localisation/Currency.h"
 

src/openrct2/config/IniReader.hpp

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <memory>
 #include <string>

src/openrct2/config/IniWriter.hpp

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <memory>
 #include <string>

src/openrct2/core/Console.hpp

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <cstdarg>
 

src/openrct2/core/DataSerialiserTraits.h

@@ -11,6 +11,7 @@
 
 #include "../Cheats.h"
 #include "../core/MemoryStream.h"
+#include "../core/String.hpp"
 #include "../entity/Guest.h"
 #include "../localisation/Localisation.h"
 #include "../network/NetworkTypes.h"

src/openrct2/core/FileScanner.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <memory>
 #include <string>

src/openrct2/core/Json.hpp

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 #include "FileSystem.hpp"
 
 #include <nlohmann/json.hpp>

src/openrct2/core/Path.hpp

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <string>
 

src/openrct2/core/String.hpp

@@ -18,6 +18,14 @@
 #include <string_view>
 #include <vector>
 
+using utf8 = char;
+using utf8string = utf8*;
+using const_utf8string = const utf8*;
+using u8string = std::basic_string<utf8>;
+using u8string_view = std::basic_string_view<utf8>;
+
+using codepoint_t = uint32_t;
+
 namespace CODE_PAGE
 {
     // windows.h defines CP_UTF8

src/openrct2/core/StringBuilder.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <string>
 

src/openrct2/core/StringReader.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 struct IStringReader
 {

src/openrct2/drawing/Drawing.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 #include "../interface/Colour.h"
 #include "../interface/ZoomLevel.h"
 #include "../world/Location.hpp"

src/openrct2/drawing/Font.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 constexpr const uint16_t FONT_SPRITE_GLYPH_COUNT = 224;
 

src/openrct2/localisation/Currency.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 // List of currencies
 enum class CurrencyType : uint8_t

src/openrct2/localisation/Formatter.h

@@ -11,6 +11,7 @@
 
 #include "../common.h"
 #include "../core/Guard.hpp"
+#include "../core/String.hpp"
 
 #include <array>
 #include <cstring>

src/openrct2/localisation/LanguagePack.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <memory>
 #include <string>

src/openrct2/management/NewsItem.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <algorithm>
 #include <array>

src/openrct2/network/NetworkUser.h

@@ -11,6 +11,7 @@
 
 #include "../common.h"
 #include "../core/JsonFwd.hpp"
+#include "../core/String.hpp"
 
 #include <map>
 #include <optional>

src/openrct2/object/Object.h

@@ -11,6 +11,7 @@
 
 #include "../common.h"
 #include "../core/JsonFwd.hpp"
+#include "../core/String.hpp"
 #include "../util/Util.h"
 #include "ImageTable.h"
 #include "StringTable.h"

src/openrct2/object/ObjectFactory.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <memory>
 #include <string_view>

src/openrct2/ride/TrackDesignRepository.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <memory>
 

src/openrct2/scenario/ScenarioSources.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 struct source_desc
 {

src/openrct2/title/TitleSequenceManager.h

@@ -9,6 +9,7 @@
 
 #pragma once
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <string>
 

src/openrct2/util/Util.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 #include <cstdio>
 #include <ctime>

src/openrct2/world/MapGen.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/String.hpp"
 
 struct mapgen_settings
 {