From d3c05c9ade358ec93c4ca55ab8624c8dd463f565 Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Sat, 21 Jan 2023 12:06:07 +0100
Subject: [PATCH] Update globalheaders and fix includes/header guards

---
 include/Nazara/Core.hpp                           | 5 +++++
 include/Nazara/OpenGLRenderer/OpenGLSwapchain.hpp | 6 +++---
 include/Nazara/Platform.hpp                       | 5 +++--
 include/Nazara/Platform/Window.hpp                | 2 +-
 include/Nazara/Platform/WindowEvent.hpp           | 6 +++---
 include/Nazara/Platform/WindowEventHandler.hpp    | 6 +++---
 include/Nazara/Renderer/SwapchainParameters.hpp   | 6 +++---
 include/Nazara/Renderer/WindowSwapchain.hpp       | 6 +++---
 include/Nazara/VulkanRenderer/VulkanSwapchain.hpp | 8 ++++----
 include/Nazara/Widgets/BaseWidget.hpp             | 2 +-
 src/Nazara/Graphics/Systems/RenderSystem.cpp      | 2 +-
 src/Nazara/Renderer/WindowSwapchain.cpp           | 2 +-
 12 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/include/Nazara/Core.hpp b/include/Nazara/Core.hpp
index bf67424a4..c8e0a53e2 100644
--- a/include/Nazara/Core.hpp
+++ b/include/Nazara/Core.hpp
@@ -32,7 +32,11 @@
 #include <Nazara/Core/AbstractHash.hpp>
 #include <Nazara/Core/AbstractLogger.hpp>
 #include <Nazara/Core/Algorithm.hpp>
+#include <Nazara/Core/AppEntitySystemComponent.hpp>
 #include <Nazara/Core/Application.hpp>
+#include <Nazara/Core/ApplicationBase.hpp>
+#include <Nazara/Core/ApplicationComponent.hpp>
+#include <Nazara/Core/ApplicationComponentRegistry.hpp>
 #include <Nazara/Core/ByteArray.hpp>
 #include <Nazara/Core/ByteArrayPool.hpp>
 #include <Nazara/Core/ByteStream.hpp>
@@ -78,6 +82,7 @@
 #include <Nazara/Core/Stream.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Core/TaskScheduler.hpp>
+#include <Nazara/Core/Time.hpp>
 #include <Nazara/Core/Unicode.hpp>
 #include <Nazara/Core/Updatable.hpp>
 #include <Nazara/Core/Uuid.hpp>
diff --git a/include/Nazara/OpenGLRenderer/OpenGLSwapchain.hpp b/include/Nazara/OpenGLRenderer/OpenGLSwapchain.hpp
index ef67afb41..a4ead4ea1 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLSwapchain.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLSwapchain.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_OPENGLRENDERER_OPENGLRENDERWINDOW_HPP
-#define NAZARA_OPENGLRENDERER_OPENGLRENDERWINDOW_HPP
+#ifndef NAZARA_OPENGLRENDERER_OPENGLSWAPCHAIN_HPP
+#define NAZARA_OPENGLRENDERER_OPENGLSWAPCHAIN_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
@@ -54,4 +54,4 @@ namespace Nz
 
 #include <Nazara/OpenGLRenderer/OpenGLSwapchain.inl>
 
-#endif // NAZARA_OPENGLRENDERER_OPENGLRENDERWINDOW_HPP
+#endif // NAZARA_OPENGLRENDERER_OPENGLSWAPCHAIN_HPP
diff --git a/include/Nazara/Platform.hpp b/include/Nazara/Platform.hpp
index 9a904e901..7dad894ba 100644
--- a/include/Nazara/Platform.hpp
+++ b/include/Nazara/Platform.hpp
@@ -29,13 +29,12 @@
 #ifndef NAZARA_GLOBAL_PLATFORM_HPP
 #define NAZARA_GLOBAL_PLATFORM_HPP
 
+#include <Nazara/Platform/AppWindowingComponent.hpp>
 #include <Nazara/Platform/Clipboard.hpp>
 #include <Nazara/Platform/Config.hpp>
 #include <Nazara/Platform/Cursor.hpp>
 #include <Nazara/Platform/CursorController.hpp>
 #include <Nazara/Platform/Enums.hpp>
-#include <Nazara/Platform/WindowEvent.hpp>
-#include <Nazara/Platform/WindowEventHandler.hpp>
 #include <Nazara/Platform/Icon.hpp>
 #include <Nazara/Platform/Joystick.hpp>
 #include <Nazara/Platform/Keyboard.hpp>
@@ -43,6 +42,8 @@
 #include <Nazara/Platform/Platform.hpp>
 #include <Nazara/Platform/VideoMode.hpp>
 #include <Nazara/Platform/Window.hpp>
+#include <Nazara/Platform/WindowEvent.hpp>
+#include <Nazara/Platform/WindowEventHandler.hpp>
 #include <Nazara/Platform/WindowHandle.hpp>
 
 #endif // NAZARA_GLOBAL_PLATFORM_HPP
diff --git a/include/Nazara/Platform/Window.hpp b/include/Nazara/Platform/Window.hpp
index 568c9bb1a..615fd4b8d 100644
--- a/include/Nazara/Platform/Window.hpp
+++ b/include/Nazara/Platform/Window.hpp
@@ -15,9 +15,9 @@
 #include <Nazara/Platform/Cursor.hpp>
 #include <Nazara/Platform/CursorController.hpp>
 #include <Nazara/Platform/Enums.hpp>
-#include <Nazara/Platform/WindowEventHandler.hpp>
 #include <Nazara/Platform/Icon.hpp>
 #include <Nazara/Platform/VideoMode.hpp>
+#include <Nazara/Platform/WindowEventHandler.hpp>
 #include <Nazara/Platform/WindowHandle.hpp>
 #include <Nazara/Utils/MovablePtr.hpp>
 #include <condition_variable>
diff --git a/include/Nazara/Platform/WindowEvent.hpp b/include/Nazara/Platform/WindowEvent.hpp
index 40f468425..7662cfb91 100644
--- a/include/Nazara/Platform/WindowEvent.hpp
+++ b/include/Nazara/Platform/WindowEvent.hpp
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#ifndef NAZARA_PLATFORM_EVENT_HPP
-#define NAZARA_PLATFORM_EVENT_HPP
+#ifndef NAZARA_PLATFORM_WINDOWEVENT_HPP
+#define NAZARA_PLATFORM_WINDOWEVENT_HPP
 
 #include <Nazara/Platform/Enums.hpp>
 #include <Nazara/Platform/Keyboard.hpp>
@@ -135,4 +135,4 @@ namespace Nz
 	};
 }
 
-#endif // NAZARA_PLATFORM_EVENT_HPP
+#endif // NAZARA_PLATFORM_WINDOWEVENT_HPP
diff --git a/include/Nazara/Platform/WindowEventHandler.hpp b/include/Nazara/Platform/WindowEventHandler.hpp
index 48bf88444..94889b71f 100644
--- a/include/Nazara/Platform/WindowEventHandler.hpp
+++ b/include/Nazara/Platform/WindowEventHandler.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_PLATFORM_EVENTHANDLER_HPP
-#define NAZARA_PLATFORM_EVENTHANDLER_HPP
+#ifndef NAZARA_PLATFORM_WINDOWEVENTHANDLER_HPP
+#define NAZARA_PLATFORM_WINDOWEVENTHANDLER_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/HandledObject.hpp>
@@ -58,4 +58,4 @@ namespace Nz
 
 #include <Nazara/Platform/WindowEventHandler.inl>
 
-#endif // NAZARA_PLATFORM_EVENTHANDLER_HPP
+#endif // NAZARA_PLATFORM_WINDOWEVENTHANDLER_HPP
diff --git a/include/Nazara/Renderer/SwapchainParameters.hpp b/include/Nazara/Renderer/SwapchainParameters.hpp
index 97d3dfa6d..8221e208b 100644
--- a/include/Nazara/Renderer/SwapchainParameters.hpp
+++ b/include/Nazara/Renderer/SwapchainParameters.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_RENDERER_RENDERWINDOWPARAMETERS_HPP
-#define NAZARA_RENDERER_RENDERWINDOWPARAMETERS_HPP
+#ifndef NAZARA_RENDERER_SWAPCHAINPARAMETERS_HPP
+#define NAZARA_RENDERER_SWAPCHAINPARAMETERS_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/PixelFormat.hpp>
@@ -20,4 +20,4 @@ namespace Nz
 	};
 }
 
-#endif // NAZARA_RENDERER_RENDERWINDOWPARAMETERS_HPP
+#endif // NAZARA_RENDERER_SWAPCHAINPARAMETERS_HPP
diff --git a/include/Nazara/Renderer/WindowSwapchain.hpp b/include/Nazara/Renderer/WindowSwapchain.hpp
index 302604e6a..dd6b2f88f 100644
--- a/include/Nazara/Renderer/WindowSwapchain.hpp
+++ b/include/Nazara/Renderer/WindowSwapchain.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_RENDERER_RENDERWINDOW_HPP
-#define NAZARA_RENDERER_RENDERWINDOW_HPP
+#ifndef NAZARA_RENDERER_WINDOWSWAPCHAIN_HPP
+#define NAZARA_RENDERER_WINDOWSWAPCHAIN_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Platform/WindowEventHandler.hpp>
@@ -62,4 +62,4 @@ namespace Nz
 
 #include <Nazara/Renderer/WindowSwapchain.inl>
 
-#endif // NAZARA_RENDERER_RENDERWINDOW_HPP
+#endif // NAZARA_RENDERER_WINDOWSWAPCHAIN_HPP
diff --git a/include/Nazara/VulkanRenderer/VulkanSwapchain.hpp b/include/Nazara/VulkanRenderer/VulkanSwapchain.hpp
index 5c1c003d2..5e2de7226 100644
--- a/include/Nazara/VulkanRenderer/VulkanSwapchain.hpp
+++ b/include/Nazara/VulkanRenderer/VulkanSwapchain.hpp
@@ -4,16 +4,16 @@
 
 #pragma once
 
-#ifndef NAZARA_VULKANRENDERER_VULKANRENDERWINDOW_HPP
-#define NAZARA_VULKANRENDERER_VULKANRENDERWINDOW_HPP
+#ifndef NAZARA_VULKANRENDERER_VULKANSWAPCHAIN_HPP
+#define NAZARA_VULKANRENDERER_VULKANSWAPCHAIN_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Clock.hpp>
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Renderer/Enums.hpp>
-#include <Nazara/Renderer/Swapchain.hpp>
 #include <Nazara/Renderer/RendererImpl.hpp>
+#include <Nazara/Renderer/Swapchain.hpp>
 #include <Nazara/Renderer/SwapchainParameters.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
 #include <Nazara/VulkanRenderer/VulkanDevice.hpp>
@@ -93,4 +93,4 @@ namespace Nz
 
 #include <Nazara/VulkanRenderer/VulkanSwapchain.inl>
 
-#endif // NAZARA_VULKANRENDERER_VULKANRENDERWINDOW_HPP
+#endif // NAZARA_VULKANRENDERER_VULKANSWAPCHAIN_HPP
diff --git a/include/Nazara/Widgets/BaseWidget.hpp b/include/Nazara/Widgets/BaseWidget.hpp
index a69003510..413594a79 100644
--- a/include/Nazara/Widgets/BaseWidget.hpp
+++ b/include/Nazara/Widgets/BaseWidget.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_WIDGETS_BASEWIDGET_HPP
 
 #include <Nazara/Graphics/Sprite.hpp>
-#include <Nazara/Platform/WindowEvent.hpp>
 #include <Nazara/Platform/Mouse.hpp>
+#include <Nazara/Platform/WindowEvent.hpp>
 #include <Nazara/Utility/Node.hpp>
 #include <Nazara/Widgets/Config.hpp>
 #include <entt/entity/entity.hpp>
diff --git a/src/Nazara/Graphics/Systems/RenderSystem.cpp b/src/Nazara/Graphics/Systems/RenderSystem.cpp
index ac31f9d7a..c5004591d 100644
--- a/src/Nazara/Graphics/Systems/RenderSystem.cpp
+++ b/src/Nazara/Graphics/Systems/RenderSystem.cpp
@@ -10,8 +10,8 @@
 #include <Nazara/Graphics/Components/GraphicsComponent.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/Renderer/RenderFrame.hpp>
-#include <Nazara/Renderer/WindowSwapchain.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
+#include <Nazara/Renderer/WindowSwapchain.hpp>
 #include <Nazara/Utility/Components/NodeComponent.hpp>
 #include <Nazara/Utility/Components/SharedSkeletonComponent.hpp>
 #include <Nazara/Utility/Components/SkeletonComponent.hpp>
diff --git a/src/Nazara/Renderer/WindowSwapchain.cpp b/src/Nazara/Renderer/WindowSwapchain.cpp
index 884dede23..bebd57049 100644
--- a/src/Nazara/Renderer/WindowSwapchain.cpp
+++ b/src/Nazara/Renderer/WindowSwapchain.cpp
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Renderer/WindowSwapchain.hpp>
-#include <Nazara/Renderer/RenderDevice.hpp>
 #include <Nazara/Platform/Window.hpp>
+#include <Nazara/Renderer/RenderDevice.hpp>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz