Merge pull request #117 from ImpellerStudios/master

Make VaRest IWYU compatible (reverted from commit 4320c81)
ufna · Mar 7, 2018 · 198828d · 198828d
1 parent 4320c81
commit 198828d
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 15 deletions.
diff --git a/Source/VaRestEditorPlugin/Private/VaRestEditorPlugin.cpp b/Source/VaRestEditorPlugin/Private/VaRestEditorPlugin.cpp
@@ -1,8 +1,8 @@
 // Copyright 2015 Vladimir Alyamkin. All Rights Reserved.
 // Original code by https://github.com/unktomi
 
-#include "VaRestEditorPlugin.h"
 #include "VaRestEditorPluginPrivatePCH.h"
+#include "VaRestEditorPlugin.h"
 
 #define LOCTEXT_NAMESPACE "FVaRestEditorPluginModule"
 

diff --git a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp
@@ -1,8 +1,8 @@
 // Copyright 2015 Vladimir Alyamkin. All Rights Reserved.
 // Original code by https://github.com/unktomi
 
-#include "VaRest_BreakJson.h"
 #include "VaRestEditorPluginPrivatePCH.h"
+#include "VaRest_BreakJson.h"
 
 #include "Runtime/Launch/Resources/Version.h"
 #include "EdGraphUtilities.h"

diff --git a/Source/VaRestPlugin/Classes/VaRestJsonObject.h b/Source/VaRestPlugin/Classes/VaRestJsonObject.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "JsonObject.h"
 #include "VaRestJsonObject.generated.h"
 
 class UVaRestJsonValue;

diff --git a/Source/VaRestPlugin/Classes/VaRestJsonValue.h b/Source/VaRestPlugin/Classes/VaRestJsonValue.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "JsonValue.h"
 #include "VaRestJsonValue.generated.h"
 
 class UVaRestJsonObject;

diff --git a/Source/VaRestPlugin/Classes/VaRestLibrary.h b/Source/VaRestPlugin/Classes/VaRestLibrary.h
@@ -3,8 +3,6 @@
 #pragma once
 
 #include "Kismet/BlueprintFunctionLibrary.h"
-#include "Object.h"
-#include "IDelegateInstance.h"
 
 #include "VaRestTypes.h"
 #include "VaRestLibrary.generated.h"

diff --git a/Source/VaRestPlugin/Classes/VaRestRequestJSON.h b/Source/VaRestPlugin/Classes/VaRestRequestJSON.h
@@ -4,7 +4,7 @@
 
 #include "Engine/LatentActionManager.h"
 #include "Http.h"
-#include "LatentActions.h"
+
 #include "VaRestTypes.h"
 #include "VaRestRequestJSON.generated.h"
 

diff --git a/Source/VaRestPlugin/Private/VaRestJsonObject.cpp b/Source/VaRestPlugin/Private/VaRestJsonObject.cpp
@@ -1,11 +1,6 @@
 // Copyright 2014 Vladimir Alyamkin. All Rights Reserved.
 
-#include "VaRestJsonObject.h"
 #include "VaRestPluginPrivatePCH.h"
-#include "JsonSerializer.h"
-#include "JsonValue.h"
-#include "VaRestJsonValue.h"
-#include "Array.h"
 
 typedef TJsonWriterFactory< TCHAR, TCondensedJsonPrintPolicy<TCHAR> > FCondensedJsonStringWriterFactory;
 typedef TJsonWriter< TCHAR, TCondensedJsonPrintPolicy<TCHAR> > FCondensedJsonStringWriter;

diff --git a/Source/VaRestPlugin/Private/VaRestJsonValue.cpp b/Source/VaRestPlugin/Private/VaRestJsonValue.cpp
@@ -1,6 +1,5 @@
 // Copyright 2014 Vladimir Alyamkin. All Rights Reserved.
 
-#include "VaRestJsonValue.h"
 #include "VaRestPluginPrivatePCH.h"
 
 UVaRestJsonValue::UVaRestJsonValue(const class FObjectInitializer& PCIP)

diff --git a/Source/VaRestPlugin/Private/VaRestLibrary.cpp b/Source/VaRestPlugin/Private/VaRestLibrary.cpp
@@ -1,6 +1,5 @@
 // Copyright 2016 Vladimir Alyamkin. All Rights Reserved.
 
-#include "VaRestLibrary.h"
 #include "VaRestPluginPrivatePCH.h"
 #include "Base64.h"
 

diff --git a/Source/VaRestPlugin/Private/VaRestRequestJSON.cpp b/Source/VaRestPlugin/Private/VaRestRequestJSON.cpp
@@ -1,6 +1,5 @@
 // Copyright 2014 Vladimir Alyamkin. All Rights Reserved.
 
-#include "VaRestRequestJSON.h"
 #include "VaRestPluginPrivatePCH.h"
 #include "CoreMisc.h"