Remove unused IStream::ReadString() function and fix includes

src/openrct2/FileClassifier.cpp

@@ -12,6 +12,7 @@
 #include "Diagnostic.h"
 #include "core/Console.hpp"
 #include "core/FileStream.h"
+#include "core/Memory.hpp"
 #include "core/Path.hpp"
 #include "core/String.hpp"
 #include "park/ParkFile.h"

src/openrct2/core/Crypt.CNG.cpp

@@ -14,7 +14,10 @@
 #    include "../platform/Platform.h"
 #    include "IStream.hpp"
 
+#    include <cstdint>
+#    include <cstring>
 #    include <iomanip>
+#    include <limits>
 #    include <sstream>
 #    include <stdexcept>
 #    include <string>

src/openrct2/core/IStream.cpp

@@ -9,30 +9,12 @@
 
 #include "IStream.hpp"
 
-#include "../object/Object.h"
-#include "Memory.hpp"
 #include "String.hpp"
 
 #include <vector>
 
 namespace OpenRCT2
 {
-    utf8* IStream::ReadString()
-    {
-        std::vector<utf8> result;
-
-        uint8_t ch;
-        while ((ch = ReadValue<uint8_t>()) != 0)
-        {
-            result.push_back(ch);
-        }
-        result.push_back(0);
-
-        utf8* resultString = Memory::AllocateArray<utf8>(result.size());
-        std::copy(result.begin(), result.end(), resultString);
-        return resultString;
-    }
-
     std::string IStream::ReadStdString()
     {
         std::string result;

src/openrct2/core/IStream.hpp

@@ -9,8 +9,7 @@
 
 #pragma once
 
-#include "../object/Object.h"
-#include "Memory.hpp"
+#include "StringTypes.h"
 
 #include <istream>
 #include <memory>
@@ -204,7 +203,6 @@ namespace OpenRCT2
             Write(buffer, sizeof(T) * count);
         }
 
-        utf8* ReadString();
         std::string ReadStdString();
         void WriteString(const utf8* str);
         void WriteString(const std::string_view string);

src/openrct2/core/MemoryStream.h

@@ -11,6 +11,7 @@
 
 #include "IStream.hpp"
 
+#include <cstring>
 #include <vector>
 
 namespace OpenRCT2

src/openrct2/core/OrcaStream.hpp

@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include "../util/Util.h"
 #include "../world/Location.hpp"
 #include "Crypt.h"
 #include "FileStream.h"

src/openrct2/core/ZipAndroid.cpp

@@ -12,6 +12,7 @@
 #    include "../Diagnostic.h"
 #    include "../platform/Platform.h"
 #    include "IStream.hpp"
+#    include "Memory.hpp"
 #    include "MemoryStream.h"
 #    include "Zip.h"
 

src/openrct2/drawing/Drawing.Sprite.cpp

@@ -15,6 +15,7 @@
 #include "../PlatformEnvironment.h"
 #include "../config/Config.h"
 #include "../core/FileStream.h"
+#include "../core/Guard.hpp"
 #include "../core/MemoryStream.h"
 #include "../core/Path.hpp"
 #include "../platform/Platform.h"

src/openrct2/network/NetworkKey.cpp

@@ -13,6 +13,7 @@
 
 #    include "../Diagnostic.h"
 #    include "../core/Crypt.h"
+#    include "../core/Guard.hpp"
 #    include "../core/IStream.hpp"
 #    include "../core/String.hpp"
 

src/openrct2/object/AudioObject.cpp

@@ -13,6 +13,7 @@
 #include "../Context.h"
 #include "../PlatformEnvironment.h"
 #include "../audio/AudioContext.h"
+#include "../core/Guard.hpp"
 #include "../core/Json.hpp"
 #include "../core/Path.hpp"
 

src/openrct2/object/BannerObject.cpp

@@ -9,6 +9,7 @@
 
 #include "BannerObject.h"
 
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 #include "../drawing/Drawing.h"

src/openrct2/object/EntranceObject.cpp

@@ -9,6 +9,7 @@
 
 #include "EntranceObject.h"
 
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 #include "../core/String.hpp"

src/openrct2/object/FootpathRailingsObject.cpp

@@ -9,6 +9,7 @@
 
 #include "FootpathRailingsObject.h"
 
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 

src/openrct2/object/FootpathSurfaceObject.cpp

@@ -9,6 +9,7 @@
 
 #include "FootpathSurfaceObject.h"
 
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 #include "../drawing/Image.h"

src/openrct2/object/ImageTable.cpp

@@ -15,6 +15,7 @@
 #include "../PlatformEnvironment.h"
 #include "../core/File.h"
 #include "../core/FileScanner.h"
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 #include "../core/Path.hpp"

src/openrct2/object/PathAdditionObject.cpp

@@ -9,6 +9,7 @@
 
 #include "PathAdditionObject.h"
 
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 #include "../drawing/Drawing.h"

src/openrct2/object/PeepNamesObject.cpp

@@ -11,6 +11,7 @@
 
 #include "../Context.h"
 #include "../PlatformEnvironment.h"
+#include "../core/Guard.hpp"
 #include "../core/Json.hpp"
 
 using namespace OpenRCT2;

src/openrct2/object/StationObject.cpp

@@ -9,6 +9,7 @@
 
 #include "StationObject.h"
 
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 #include "../core/String.hpp"

src/openrct2/object/StringTable.cpp

@@ -10,6 +10,7 @@
 #include "StringTable.h"
 
 #include "../Context.h"
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 #include "../core/String.hpp"

src/openrct2/object/TerrainEdgeObject.cpp

@@ -10,6 +10,7 @@
 #include "TerrainEdgeObject.h"
 
 #include "../Context.h"
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 #include "../core/String.hpp"

src/openrct2/object/WallObject.cpp

@@ -9,6 +9,7 @@
 
 #include "WallObject.h"
 
+#include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
 #include "../core/Json.hpp"
 #include "../core/String.hpp"