From 539d6eab3e01c6edfbe31c67c25faa6cfeefbde5 Mon Sep 17 00:00:00 2001 From: getnamo Date: Tue, 25 Sep 2018 06:56:37 -0700 Subject: [PATCH] iwyu changes for 4.20 engine build -part 2 -remove pch --- SocketIOClient.uplugin | 2 +- Source/SIOJson/Private/SIOJConvert.cpp | 5 +++- Source/SIOJson/Private/SIOJLibrary.cpp | 5 +++- Source/SIOJson/Private/SIOJRequestJSON.cpp | 3 ++- Source/SIOJson/Private/SIOJson.cpp | 5 +++- Source/SIOJson/Private/SIOJsonObject.cpp | 2 +- Source/SIOJson/Private/SIOJsonPrivatePCH.h | 29 ---------------------- Source/SIOJson/Private/SIOJsonValue.cpp | 2 +- Source/SIOJson/Public/ISIOJson.h | 2 ++ Source/SIOJson/Public/SIOJConvert.h | 5 ++-- Source/SIOJson/Public/SIOJRequestJSON.h | 3 ++- Source/SIOJson/Public/SIOJsonValue.h | 1 + 12 files changed, 25 insertions(+), 39 deletions(-) delete mode 100644 Source/SIOJson/Private/SIOJsonPrivatePCH.h diff --git a/SocketIOClient.uplugin b/SocketIOClient.uplugin index 090b8c0a..6c4363d5 100644 --- a/SocketIOClient.uplugin +++ b/SocketIOClient.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, "Version": 1, - "VersionName": "0.9.1", + "VersionName": "0.9.2", "EngineVersion" : "4.20.0", "FriendlyName": "Socket.IO Client", "Description": "Real-time networking library Socket.IO Client usable from blueprints and c++.", diff --git a/Source/SIOJson/Private/SIOJConvert.cpp b/Source/SIOJson/Private/SIOJConvert.cpp index bb055ba5..10b691c1 100644 --- a/Source/SIOJson/Private/SIOJConvert.cpp +++ b/Source/SIOJson/Private/SIOJConvert.cpp @@ -2,7 +2,10 @@ #include "SIOJConvert.h" -#include "SIOJsonPrivatePCH.h" +#include "Runtime/Json/Public/Json.h" +#include "Runtime/JsonUtilities/Public/JsonObjectConverter.h" +#include "SIOJsonValue.h" +#include "SIOJsonObject.h" typedef TJsonWriterFactory< TCHAR, TCondensedJsonPrintPolicy > FCondensedJsonStringWriterFactory; typedef TJsonWriter< TCHAR, TCondensedJsonPrintPolicy > FCondensedJsonStringWriter; diff --git a/Source/SIOJson/Private/SIOJLibrary.cpp b/Source/SIOJson/Private/SIOJLibrary.cpp index b521fa30..2bfea8f1 100644 --- a/Source/SIOJson/Private/SIOJLibrary.cpp +++ b/Source/SIOJson/Private/SIOJLibrary.cpp @@ -4,7 +4,10 @@ // Copyright 2016 Vladimir Alyamkin. All Rights Reserved. #include "SIOJLibrary.h" -#include "SIOJsonPrivatePCH.h" +#include "ISIOJson.h" +#include "Runtime/Json/Public/Json.h" +#include "SIOJsonValue.h" +#include "SIOJsonObject.h" #include "Runtime/Core/Public/Misc/Base64.h" ////////////////////////////////////////////////////////////////////////// diff --git a/Source/SIOJson/Private/SIOJRequestJSON.cpp b/Source/SIOJson/Private/SIOJRequestJSON.cpp index 7bc89e3b..d2dcab99 100644 --- a/Source/SIOJson/Private/SIOJRequestJSON.cpp +++ b/Source/SIOJson/Private/SIOJRequestJSON.cpp @@ -4,7 +4,8 @@ // Copyright 2014 Vladimir Alyamkin. All Rights Reserved. #include "SIOJRequestJSON.h" -#include "SIOJsonPrivatePCH.h" +#include "SIOJsonValue.h" +#include "SIOJsonObject.h" template void FSIOJLatentAction::Cancel() { diff --git a/Source/SIOJson/Private/SIOJson.cpp b/Source/SIOJson/Private/SIOJson.cpp index 7e983d63..a16621fe 100644 --- a/Source/SIOJson/Private/SIOJson.cpp +++ b/Source/SIOJson/Private/SIOJson.cpp @@ -3,7 +3,10 @@ // Copyright 2014 Vladimir Alyamkin. All Rights Reserved. -#include "SIOJsonPrivatePCH.h" +#include "ISIOJson.h" +#include "SIOJsonObject.h" +#include "SIOJsonValue.h" +#include "SIOJRequestJSON.h" class FSIOJson : public ISIOJson { diff --git a/Source/SIOJson/Private/SIOJsonObject.cpp b/Source/SIOJson/Private/SIOJsonObject.cpp index 301e7f3f..34b09e52 100644 --- a/Source/SIOJson/Private/SIOJsonObject.cpp +++ b/Source/SIOJson/Private/SIOJsonObject.cpp @@ -4,7 +4,7 @@ // Copyright 2014 Vladimir Alyamkin. All Rights Reserved. #include "SIOJsonObject.h" -#include "SIOJsonPrivatePCH.h" +#include "Runtime/Json/Public/Json.h" typedef TJsonWriterFactory< TCHAR, TCondensedJsonPrintPolicy > FCondensedJsonStringWriterFactory; typedef TJsonWriter< TCHAR, TCondensedJsonPrintPolicy > FCondensedJsonStringWriter; diff --git a/Source/SIOJson/Private/SIOJsonPrivatePCH.h b/Source/SIOJson/Private/SIOJsonPrivatePCH.h deleted file mode 100644 index ab2b4715..00000000 --- a/Source/SIOJson/Private/SIOJsonPrivatePCH.h +++ /dev/null @@ -1,29 +0,0 @@ -// Modifications Copyright 2018-current Getnamo. All Rights Reserved - - -// Copyright 2014 Vladimir Alyamkin. All Rights Reserved. - -#pragma once - -#include "CoreUObject.h" - -#include "Delegates/Delegate.h" -#include "Http.h" -#include "Runtime/Core/Public/Containers/Map.h" -#include "JsonGlobals.h" -#include "JsonUtilities.h" - -#include "LatentActions.h" -#include "CoreMinimal.h" -#include "EngineMinimal.h" -#include "Runtime/Core/Public/Templates/SharedPointer.h" - -DECLARE_LOG_CATEGORY_EXTERN(LogSIOJ, Log, All); - -#include "ISIOJson.h" -#include "SIOJConvert.h" -#include "SIOJsonObject.h" -#include "SIOJsonValue.h" -#include "SIOJLibrary.h" -#include "SIOJRequestJSON.h" -#include "SIOJTypes.h" diff --git a/Source/SIOJson/Private/SIOJsonValue.cpp b/Source/SIOJson/Private/SIOJsonValue.cpp index bf03b496..8f8a708d 100644 --- a/Source/SIOJson/Private/SIOJsonValue.cpp +++ b/Source/SIOJson/Private/SIOJsonValue.cpp @@ -4,7 +4,7 @@ // Copyright 2014 Vladimir Alyamkin. All Rights Reserved. #include "SIOJsonValue.h" -#include "SIOJsonPrivatePCH.h" +#include "Runtime/Json/Public/Json.h" #include "SIOJConvert.h" #if PLATFORM_WINDOWS diff --git a/Source/SIOJson/Public/ISIOJson.h b/Source/SIOJson/Public/ISIOJson.h index 2d05df2e..caf3b6b6 100644 --- a/Source/SIOJson/Public/ISIOJson.h +++ b/Source/SIOJson/Public/ISIOJson.h @@ -7,6 +7,8 @@ #include "Runtime/Core/Public/Modules/ModuleManager.h" +DECLARE_LOG_CATEGORY_EXTERN(LogSIOJ, Log, All); + /** * The public interface to this module. In most cases, this interface is only public to sibling modules diff --git a/Source/SIOJson/Public/SIOJConvert.h b/Source/SIOJson/Public/SIOJConvert.h index b7d13577..4040f83d 100644 --- a/Source/SIOJson/Public/SIOJConvert.h +++ b/Source/SIOJson/Public/SIOJConvert.h @@ -3,8 +3,9 @@ #pragma once -#include "JsonGlobals.h" -#include "EngineMinimal.h" +#include "CoreMinimal.h" +#include "Runtime/Json/Public/Dom/JsonObject.h" +#include "Runtime/Json/Public/Dom/JsonValue.h" #include "SIOJConvert.generated.h" struct FTrimmedKeyMap diff --git a/Source/SIOJson/Public/SIOJRequestJSON.h b/Source/SIOJson/Public/SIOJRequestJSON.h index 6671312a..2e6890f8 100644 --- a/Source/SIOJson/Public/SIOJRequestJSON.h +++ b/Source/SIOJson/Public/SIOJRequestJSON.h @@ -8,7 +8,8 @@ #include "Delegates/Delegate.h" #include "Http.h" #include "Runtime/Core/Public/Containers/Map.h" -#include "JsonGlobals.h" +#include "Runtime/Json/Public/Dom/JsonObject.h" +#include "Runtime/Json/Public/Dom/JsonValue.h" #include "LatentActions.h" #include "Engine/LatentActionManager.h" #include "SIOJTypes.h" diff --git a/Source/SIOJson/Public/SIOJsonValue.h b/Source/SIOJson/Public/SIOJsonValue.h index bb8c06ce..502b20fc 100644 --- a/Source/SIOJson/Public/SIOJsonValue.h +++ b/Source/SIOJson/Public/SIOJsonValue.h @@ -6,6 +6,7 @@ #pragma once +#include "Runtime/Json/Public/Dom/JsonValue.h" #include "SIOJsonValue.generated.h" class USIOJsonObject;