Change includes of nlohmann/json_fwd.hpp to new core/JsonFwd.hpp

src/openrct2/core/JsonFwd.hpp

@@ -0,0 +1,14 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2020 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
+#pragma once
+
+#include <nlohmann/json_fwd.hpp>
+
+using json_t = nlohmann::json;

src/openrct2/libopenrct2.vcxproj

@@ -169,6 +169,7 @@
     <ClInclude Include="core\IStream.hpp" />
     <ClInclude Include="core\JobPool.hpp" />
     <ClInclude Include="core\Json.hpp" />
+    <ClInclude Include="core\JsonFwd.hpp" />
     <ClInclude Include="core\Memory.hpp" />
     <ClInclude Include="core\MemoryStream.h" />
     <ClInclude Include="core\Meta.hpp" />

src/openrct2/network/NetworkBase.cpp

@@ -18,6 +18,7 @@
 #include "../actions/NetworkModifyGroupAction.hpp"
 #include "../actions/PeepPickupAction.hpp"
 #include "../core/Guard.hpp"
+#include "../core/Json.hpp"
 #include "../platform/Platform2.h"
 #include "../scripting/ScriptEngine.h"
 #include "../ui/UiContext.h"
@@ -52,7 +53,6 @@ static constexpr uint32_t CHUNK_SIZE = 1024 * 63;
 #    include "../config/Config.h"
 #    include "../core/Console.hpp"
 #    include "../core/FileStream.hpp"
-#    include "../core/Json.hpp"
 #    include "../core/MemoryStream.h"
 #    include "../core/Nullable.hpp"
 #    include "../core/Path.hpp"

src/openrct2/network/NetworkBase.h

@@ -9,7 +9,6 @@
 #include "NetworkUser.h"
 
 #include <fstream>
-#include <nlohmann/json_fwd.hpp>
 
 #ifndef DISABLE_NETWORK
 

src/openrct2/network/NetworkGroup.h

@@ -13,7 +13,6 @@
 #include "NetworkPacket.h"
 
 #include <array>
-#include <nlohmann/json_fwd.hpp>
 #include <string>
 
 enum class NetworkPermission : uint32_t;

src/openrct2/network/NetworkUser.h

@@ -10,14 +10,12 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/JsonFwd.hpp"
 #include "../core/Nullable.hpp"
 
 #include <map>
-#include <nlohmann/json_fwd.hpp>
 #include <string>
 
-using json_t = nlohmann::json;
-
 class NetworkUser final
 {
 public:

src/openrct2/network/ServerList.h

@@ -10,16 +10,14 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/JsonFwd.hpp"
 
 #include <future>
-#include <nlohmann/json_fwd.hpp>
 #include <optional>
 #include <stdexcept>
 #include <string>
 #include <vector>
 
-using json_t = nlohmann::json;
-
 struct INetworkEndpoint;
 
 struct ServerListEntry

src/openrct2/network/network.h

@@ -15,16 +15,14 @@
 #define MAX_SERVER_DESCRIPTION_LENGTH 256
 
 #include "../common.h"
+#include "../core/JsonFwd.hpp"
 #include "../localisation/StringIds.h"
 #include "NetworkTypes.h"
 
 #include <memory>
-#include <nlohmann/json_fwd.hpp>
 #include <string>
 #include <vector>
 
-using json_t = nlohmann::json;
-
 struct GameAction;
 struct Peep;
 struct CoordsXYZ;

src/openrct2/object/ImageTable.h

@@ -10,14 +10,12 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/JsonFwd.hpp"
 #include "../drawing/Drawing.h"
 
 #include <memory>
-#include <nlohmann/json_fwd.hpp>
 #include <vector>
 
-using json_t = nlohmann::json;
-
 struct IReadObjectContext;
 namespace OpenRCT2
 {

src/openrct2/object/LargeSceneryObject.cpp

@@ -22,7 +22,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <nlohmann/json_fwd.hpp>
 
 void LargeSceneryObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stream)
 {

src/openrct2/object/Object.h

@@ -10,16 +10,15 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/JsonFwd.hpp"
 #include "ImageTable.h"
 #include "StringTable.h"
 
 #include <algorithm>
-#include <nlohmann/json_fwd.hpp>
 #include <optional>
 #include <string_view>
 #include <vector>
 
-using json_t = nlohmann::json;
 using ObjectEntryIndex = uint16_t;
 constexpr const ObjectEntryIndex OBJECT_ENTRY_INDEX_NULL = std::numeric_limits<ObjectEntryIndex>::max();
 

src/openrct2/object/RideObject.h

@@ -13,7 +13,6 @@
 #include "../ride/Ride.h"
 #include "Object.h"
 
-#include <nlohmann/json_fwd.hpp>
 #include <vector>
 
 class RideObject final : public Object

src/openrct2/object/StringTable.h

@@ -10,14 +10,12 @@
 #pragma once
 
 #include "../common.h"
+#include "../core/JsonFwd.hpp"
 #include "../localisation/Language.h"
 
-#include <nlohmann/json_fwd.hpp>
 #include <string>
 #include <vector>
 
-using json_t = nlohmann::json;
-
 struct IReadObjectContext;
 namespace OpenRCT2
 {