Fix naming conflicts

src/openrct2-ui/windows/ShortcutKeys.cpp

@@ -159,7 +159,7 @@ private:
     struct ShortcutStringPair
     {
         std::string ShortcutId;
-        StringId StringId = STR_NONE;
+        ::StringId StringId = STR_NONE;
         std::string CustomString;
         std::string Binding;
     };

src/openrct2/localisation/FormatCodes.cpp

@@ -37,7 +37,7 @@ static const EnumMap<FormatToken> FormatTokenMap = {
     { "UINT16",               FormatToken::UInt16,              },
     { "CURRENCY2DP",          FormatToken::Currency2dp,         },
     { "CURRENCY",             FormatToken::Currency,            },
-    { "STRINGID",             FormatToken::StringId,            },
+    { "STRINGID",             FormatToken::StringById,          },
     { "STRING",               FormatToken::String,              },
     { "MONTHYEAR",            FormatToken::MonthYear,           },
     { "MONTH",                FormatToken::Month,               },
@@ -116,7 +116,7 @@ bool FormatTokenTakesArgument(FormatToken token)
         case FormatToken::UInt16:
         case FormatToken::Currency2dp:
         case FormatToken::Currency:
-        case FormatToken::StringId:
+        case FormatToken::StringById:
         case FormatToken::String:
         case FormatToken::MonthYear:
         case FormatToken::Month:

src/openrct2/localisation/FormatCodes.h

@@ -35,7 +35,7 @@ enum class FormatToken
     UInt16,
     Currency2dp,
     Currency,
-    StringId,
+    StringById,
     String,
     MonthYear,
     Month,

src/openrct2/localisation/Formatting.cpp

@@ -682,7 +682,7 @@ namespace OpenRCT2
     {
         for (const auto& token : fmt)
         {
-            if (token.kind == FormatToken::StringId)
+            if (token.kind == FormatToken::StringById)
             {
                 if (argIndex < args.size())
                 {
@@ -782,7 +782,7 @@ namespace OpenRCT2
                 case FormatToken::Comma1dp16:
                     anyArgs.push_back(ReadFromArgs<int16_t>(args));
                     break;
-                case FormatToken::StringId:
+                case FormatToken::StringById:
                 {
                     auto stringId = ReadFromArgs<StringId>(args);
                     anyArgs.push_back(stringId);

src/openrct2/localisation/Formatting.h

@@ -233,7 +233,7 @@ namespace OpenRCT2
             while (!it.eol())
             {
                 auto token = *it++;
-                if (token.kind == FormatToken::StringId)
+                if (token.kind == FormatToken::StringById)
                 {
                     if constexpr (std::is_integral<TArg0>())
                     {

src/openrct2/title/TitleSequenceManager.cpp

@@ -32,7 +32,7 @@ namespace TitleSequenceManager
     {
         const utf8* ConfigId;
         const utf8* Filename;
-        StringId StringId;
+        ::StringId StringId;
     };
 
     static constexpr PredefinedSequence PredefinedSequences[] = {