From 556ca510d4f583c7029d597c4ad2b1f9f9192c99 Mon Sep 17 00:00:00 2001
From: ZXShady <153229951+ZXShady@users.noreply.github.com>
Date: Wed, 2 Oct 2024 22:55:19 +0100
Subject: [PATCH] Make ConvertEvent.hpp file in window module folder.

It is a window related module it makes more sense imo for it to be in it.

I also addded it to the cmake file so it appears in VIsual Studio
---
 src/CSFML/Graphics/RenderWindow.cpp     | 2 +-
 src/CSFML/Window/CMakeLists.txt         | 1 +
 src/CSFML/{ => Window}/ConvertEvent.hpp | 0
 src/CSFML/Window/Window.cpp             | 2 +-
 src/CSFML/Window/WindowBase.cpp         | 2 +-
 5 files changed, 4 insertions(+), 3 deletions(-)
 rename src/CSFML/{ => Window}/ConvertEvent.hpp (100%)

diff --git a/src/CSFML/Graphics/RenderWindow.cpp b/src/CSFML/Graphics/RenderWindow.cpp
index 6b6cb6d4..06f33090 100644
--- a/src/CSFML/Graphics/RenderWindow.cpp
+++ b/src/CSFML/Graphics/RenderWindow.cpp
@@ -25,7 +25,6 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <CSFML/ConvertEvent.hpp>
 #include <CSFML/Graphics/CircleShapeStruct.hpp>
 #include <CSFML/Graphics/ConvertColor.hpp>
 #include <CSFML/Graphics/ConvertRect.hpp>
@@ -43,6 +42,7 @@
 #include <CSFML/Graphics/VertexBufferStruct.hpp>
 #include <CSFML/System/ConvertVector2.hpp>
 #include <CSFML/Window/ConvertContextSettings.hpp>
+#include <CSFML/Window/ConvertEvent.hpp>
 #include <CSFML/Window/ConvertVideoMode.hpp>
 #include <CSFML/Window/CursorStruct.hpp>
 
diff --git a/src/CSFML/Window/CMakeLists.txt b/src/CSFML/Window/CMakeLists.txt
index 5cdfeb56..0b650a2a 100644
--- a/src/CSFML/Window/CMakeLists.txt
+++ b/src/CSFML/Window/CMakeLists.txt
@@ -13,6 +13,7 @@ set(SRC
     ${SRCROOT}/ContextStruct.hpp
     ${INCROOT}/Context.h
     ${SRCROOT}/ConvertContextSettings.hpp
+    ${SRCROOT}/ConvertEvent.hpp
     ${SRCROOT}/ConvertVideoMode.hpp
     ${INCROOT}/Event.h
     ${SRCROOT}/Joystick.cpp
diff --git a/src/CSFML/ConvertEvent.hpp b/src/CSFML/Window/ConvertEvent.hpp
similarity index 100%
rename from src/CSFML/ConvertEvent.hpp
rename to src/CSFML/Window/ConvertEvent.hpp
diff --git a/src/CSFML/Window/Window.cpp b/src/CSFML/Window/Window.cpp
index 19d772f3..81421db6 100644
--- a/src/CSFML/Window/Window.cpp
+++ b/src/CSFML/Window/Window.cpp
@@ -25,9 +25,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <CSFML/ConvertEvent.hpp>
 #include <CSFML/System/ConvertVector2.hpp>
 #include <CSFML/Window/ConvertContextSettings.hpp>
+#include <CSFML/Window/ConvertEvent.hpp>
 #include <CSFML/Window/ConvertVideoMode.hpp>
 #include <CSFML/Window/CursorStruct.hpp>
 #include <CSFML/Window/Window.h>
diff --git a/src/CSFML/Window/WindowBase.cpp b/src/CSFML/Window/WindowBase.cpp
index 37cc007d..bd3bc090 100644
--- a/src/CSFML/Window/WindowBase.cpp
+++ b/src/CSFML/Window/WindowBase.cpp
@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <CSFML/ConvertEvent.hpp>
 #include <CSFML/System/ConvertVector2.hpp>
+#include <CSFML/Window/ConvertEvent.hpp>
 #include <CSFML/Window/ConvertVideoMode.hpp>
 #include <CSFML/Window/CursorStruct.hpp>
 #include <CSFML/Window/WindowBase.h>