From bbd2c01071524830fd6fc0b7a0e3b78e4accec9e Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian.e.gross@gmail.com>
Date: Sun, 14 Jun 2020 20:21:49 +0100
Subject: [PATCH] Replaced includes of monolithic headers.

---
 CHANGES.md                                           | 4 ++++
 ImGui.uplugin                                        | 2 +-
 README.md                                            | 2 +-
 Source/ImGui/Private/ImGuiDrawData.h                 | 3 +--
 Source/ImGui/Private/ImGuiInputHandler.cpp           | 1 +
 Source/ImGui/Private/ImGuiModuleSettings.cpp         | 2 ++
 Source/ImGui/Private/ImGuiModuleSettings.h           | 1 +
 Source/ImGui/Private/ImGuiPrivatePCH.h               | 4 ++--
 Source/ImGui/Private/TextureManager.h                | 1 -
 Source/ImGui/Private/Utilities/DebugExecBindings.cpp | 1 +
 Source/ImGui/Private/Utilities/WorldContext.h        | 6 ++++--
 Source/ImGui/Private/Widgets/SImGuiCanvasControl.cpp | 2 ++
 Source/ImGui/Private/Widgets/SImGuiCanvasControl.h   | 2 ++
 Source/ImGui/Private/Widgets/SImGuiLayout.cpp        | 1 +
 Source/ImGui/Private/Widgets/SImGuiLayout.h          | 1 +
 Source/ImGui/Private/Widgets/SImGuiWidget.cpp        | 5 +++++
 Source/ImGui/Private/Widgets/SImGuiWidget.h          | 1 +
 Source/ImGui/Public/ImGuiDelegates.h                 | 4 +++-
 18 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 36bbd85..117244f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,10 @@ Versions marked as 'unofficial' are labelled only for the needs of this changelo
 Change History
 --------------
 
+Version: 1.20 (2020/06)
+Transition to IWYU and maintenence:
+- Replaced includes of monolithic headers.
+
 Version: 1.19 (2020/03-06)
 - Integrated fix for issue with ImGui popup/modal windows not being able to be closed in transparent mouse input mode. 
 - Integrated first version of Adaptive Canvas Size.
diff --git a/ImGui.uplugin b/ImGui.uplugin
index b100ae8..31b6b28 100644
--- a/ImGui.uplugin
+++ b/ImGui.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.19",
+	"VersionName": "1.20",
 	"FriendlyName": "ImGui",
 	"Description": "",
 	"Category": "Debug",
diff --git a/README.md b/README.md
index 7386abd..5dad407 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Dear ImGui is an immediate-mode graphical user interface library that is very li
 
 Status
 ------
-Version: 1.19
+Version: 1.20
 
 ImGui version: 1.74
 
diff --git a/Source/ImGui/Private/ImGuiDrawData.h b/Source/ImGui/Private/ImGuiDrawData.h
index 2f6e404..b628efa 100644
--- a/Source/ImGui/Private/ImGuiDrawData.h
+++ b/Source/ImGui/Private/ImGuiDrawData.h
@@ -4,8 +4,7 @@
 
 #include "ImGuiInteroperability.h"
 
-#include <Runtime/Launch/Resources/Version.h>
-#include <SlateCore.h>
+#include <Rendering/RenderingCommon.h>
 
 #include <imgui.h>
 
diff --git a/Source/ImGui/Private/ImGuiInputHandler.cpp b/Source/ImGui/Private/ImGuiInputHandler.cpp
index 4f614fc..0d00380 100644
--- a/Source/ImGui/Private/ImGuiInputHandler.cpp
+++ b/Source/ImGui/Private/ImGuiInputHandler.cpp
@@ -10,6 +10,7 @@
 #include "ImGuiModuleSettings.h"
 
 #include <Engine/Console.h>
+#include <GameFramework/InputSettings.h>
 #include <Input/Events.h>
 
 #if WITH_EDITOR
diff --git a/Source/ImGui/Private/ImGuiModuleSettings.cpp b/Source/ImGui/Private/ImGuiModuleSettings.cpp
index 96cfc73..c8e9d18 100644
--- a/Source/ImGui/Private/ImGuiModuleSettings.cpp
+++ b/Source/ImGui/Private/ImGuiModuleSettings.cpp
@@ -7,6 +7,8 @@
 #include "ImGuiModuleCommands.h"
 #include "ImGuiModuleProperties.h"
 
+#include <GameFramework/GameUserSettings.h>
+
 
 //====================================================================================================
 // FImGuiDPIScaleInfo
diff --git a/Source/ImGui/Private/ImGuiModuleSettings.h b/Source/ImGui/Private/ImGuiModuleSettings.h
index bb88ca2..0a5626f 100644
--- a/Source/ImGui/Private/ImGuiModuleSettings.h
+++ b/Source/ImGui/Private/ImGuiModuleSettings.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <SlateTypes.h>
 #include <Curves/CurveFloat.h>
 #include <Delegates/Delegate.h>
 #include <UObject/Object.h>
diff --git a/Source/ImGui/Private/ImGuiPrivatePCH.h b/Source/ImGui/Private/ImGuiPrivatePCH.h
index 7ccf7f2..c22f298 100644
--- a/Source/ImGui/Private/ImGuiPrivatePCH.h
+++ b/Source/ImGui/Private/ImGuiPrivatePCH.h
@@ -8,8 +8,8 @@
 #include "ImGuiModule.h"
 
 // Engine
-#include <Core.h>
-#include <Engine.h>
+#include <CoreMinimal.h>
+#include <Engine/Engine.h>
 
 // For backward compatibility we will use FStringClassReference which in newer engine versions is a typedef for
 // FSoftClassPath. Include right soft class reference header to avoid warnings in newer engine version.
diff --git a/Source/ImGui/Private/TextureManager.h b/Source/ImGui/Private/TextureManager.h
index 65cf531..4c181eb 100644
--- a/Source/ImGui/Private/TextureManager.h
+++ b/Source/ImGui/Private/TextureManager.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <Core.h>
 #include <Styling/SlateBrush.h>
 #include <Textures/SlateShaderResource.h>
 
diff --git a/Source/ImGui/Private/Utilities/DebugExecBindings.cpp b/Source/ImGui/Private/Utilities/DebugExecBindings.cpp
index 7606bbc..f396bd8 100644
--- a/Source/ImGui/Private/Utilities/DebugExecBindings.cpp
+++ b/Source/ImGui/Private/Utilities/DebugExecBindings.cpp
@@ -6,6 +6,7 @@
 #include "ImGuiModuleSettings.h"
 
 #include <GameFramework/PlayerInput.h>
+#include <UObject/UObjectIterator.h>
 
 
 namespace
diff --git a/Source/ImGui/Private/Utilities/WorldContext.h b/Source/ImGui/Private/Utilities/WorldContext.h
index 790383e..5c3c295 100644
--- a/Source/ImGui/Private/Utilities/WorldContext.h
+++ b/Source/ImGui/Private/Utilities/WorldContext.h
@@ -2,8 +2,10 @@
 
 #pragma once
 
-#include <Core.h>
-#include <Engine.h>
+#include <CoreMinimal.h>
+#include <Engine/Engine.h>
+#include <Engine/GameInstance.h>
+#include <Engine/GameViewportClient.h>
 
 
 // Utilities helping to get a World Context.
diff --git a/Source/ImGui/Private/Widgets/SImGuiCanvasControl.cpp b/Source/ImGui/Private/Widgets/SImGuiCanvasControl.cpp
index 13131b6..0778c97 100644
--- a/Source/ImGui/Private/Widgets/SImGuiCanvasControl.cpp
+++ b/Source/ImGui/Private/Widgets/SImGuiCanvasControl.cpp
@@ -4,6 +4,8 @@
 
 #include "SImGuiCanvasControl.h"
 
+#include <SlateOptMacros.h>
+
 
 namespace
 {
diff --git a/Source/ImGui/Private/Widgets/SImGuiCanvasControl.h b/Source/ImGui/Private/Widgets/SImGuiCanvasControl.h
index 5e80ba2..c58f8e0 100644
--- a/Source/ImGui/Private/Widgets/SImGuiCanvasControl.h
+++ b/Source/ImGui/Private/Widgets/SImGuiCanvasControl.h
@@ -6,6 +6,8 @@
 #include "ImGuiModuleDebug.h"
 #include "ImGuiModuleSettings.h"
 
+#include <Brushes/SlateBorderBrush.h>
+#include <Widgets/DeclarativeSyntaxSupport.h>
 #include <Widgets/SLeafWidget.h>
 
 
diff --git a/Source/ImGui/Private/Widgets/SImGuiLayout.cpp b/Source/ImGui/Private/Widgets/SImGuiLayout.cpp
index cfa55a9..b2f5567 100644
--- a/Source/ImGui/Private/Widgets/SImGuiLayout.cpp
+++ b/Source/ImGui/Private/Widgets/SImGuiLayout.cpp
@@ -8,6 +8,7 @@
 #include "ImGuiModuleManager.h"
 #include "ImGuiModuleSettings.h"
 
+#include <SlateOptMacros.h>
 #include <Widgets/Layout/SConstraintCanvas.h>
 #include <Widgets/Layout/SDPIScaler.h>
 #include <Widgets/Layout/SScaleBox.h>
diff --git a/Source/ImGui/Private/Widgets/SImGuiLayout.h b/Source/ImGui/Private/Widgets/SImGuiLayout.h
index 4633094..66f3f1e 100644
--- a/Source/ImGui/Private/Widgets/SImGuiLayout.h
+++ b/Source/ImGui/Private/Widgets/SImGuiLayout.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <Widgets/DeclarativeSyntaxSupport.h>
 #include <Widgets/SCompoundWidget.h>
 
 
diff --git a/Source/ImGui/Private/Widgets/SImGuiWidget.cpp b/Source/ImGui/Private/Widgets/SImGuiWidget.cpp
index d690b64..689fcef 100644
--- a/Source/ImGui/Private/Widgets/SImGuiWidget.cpp
+++ b/Source/ImGui/Private/Widgets/SImGuiWidget.cpp
@@ -17,6 +17,11 @@
 #include "Utilities/ScopeGuards.h"
 
 #include <Engine/Console.h>
+#include <Engine/GameViewportClient.h>
+#include <Engine/LocalPlayer.h>
+#include <GameFramework/GameUserSettings.h>
+#include <SlateOptMacros.h>
+#include <Widgets/SViewport.h>
 
 #include <utility>
 
diff --git a/Source/ImGui/Private/Widgets/SImGuiWidget.h b/Source/ImGui/Private/Widgets/SImGuiWidget.h
index 014c5cd..95e87ad 100644
--- a/Source/ImGui/Private/Widgets/SImGuiWidget.h
+++ b/Source/ImGui/Private/Widgets/SImGuiWidget.h
@@ -5,6 +5,7 @@
 #include "ImGuiModuleDebug.h"
 #include "ImGuiModuleSettings.h"
 
+#include <Widgets/DeclarativeSyntaxSupport.h>
 #include <Widgets/SCompoundWidget.h>
 
 
diff --git a/Source/ImGui/Public/ImGuiDelegates.h b/Source/ImGui/Public/ImGuiDelegates.h
index d59f93d..d6be5e3 100644
--- a/Source/ImGui/Public/ImGuiDelegates.h
+++ b/Source/ImGui/Public/ImGuiDelegates.h
@@ -2,9 +2,11 @@
 
 #pragma once
 
-#include <Core.h>
+#include <Delegates/Delegate.h>
 
 
+class UWorld;
+
 /**
  * Delegates to ImGui debug events. World delegates are called once per frame during world updates and have invocation
  * lists cleared after their worlds become invalid. Multi-context delegates are called once for every updated world.