iwyu changes for 4.20 engine build

-part 2 -remove pch
getnamo · Sep 25, 2018 · 539d6ea · 539d6ea
1 parent 5e6631a
commit 539d6ea
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 39 deletions.
diff --git 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
@@ -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<TCHAR> > FCondensedJsonStringWriterFactory;
 typedef TJsonWriter< TCHAR, TCondensedJsonPrintPolicy<TCHAR> > FCondensedJsonStringWriter;

diff --git 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
@@ -4,7 +4,8 @@
 // Copyright 2014 Vladimir Alyamkin. All Rights Reserved.
 
 #include "SIOJRequestJSON.h"
-#include "SIOJsonPrivatePCH.h"
+#include "SIOJsonValue.h"
+#include "SIOJsonObject.h"
 
 template <class T> void FSIOJLatentAction<T>::Cancel()
 {

diff --git 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
@@ -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<TCHAR> > FCondensedJsonStringWriterFactory;
 typedef TJsonWriter< TCHAR, TCondensedJsonPrintPolicy<TCHAR> > FCondensedJsonStringWriter;

diff --git a/Source/SIOJson/Private/SIOJsonPrivatePCH.h b/Source/SIOJson/Private/SIOJsonPrivatePCH.h
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include "Runtime/Json/Public/Dom/JsonValue.h"
 #include "SIOJsonValue.generated.h"
 
 class USIOJsonObject;
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@