From 8a2d1186415f3a48e7a760155e60e2553955ad4e Mon Sep 17 00:00:00 2001
From: SweetId <2630750+SweetId@users.noreply.github.com>
Date: Sat, 21 Oct 2023 17:08:24 -0400
Subject: [PATCH] Merge EditorAction_Log_Copy and Clear into EditorAction_Log

---
 include/NazaraEditor/Core.hpp                     |  5 ++---
 ...g_CopyToClipboard.hpp => EditorAction_Log.hpp} |  9 +++++++++
 .../Actions/EditorAction_Log_Clear.hpp            | 15 ---------------
 ...g_CopyToClipboard.cpp => EditorAction_Log.cpp} | 12 ++++++------
 .../Actions/EditorAction_Log_Clear.cpp            | 10 ----------
 5 files changed, 17 insertions(+), 34 deletions(-)
 rename include/NazaraEditor/Core/Application/Actions/{EditorAction_Log_CopyToClipboard.hpp => EditorAction_Log.hpp} (60%)
 delete mode 100644 include/NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.hpp
 rename src/NazaraEditor/Core/Application/Actions/{EditorAction_Log_CopyToClipboard.cpp => EditorAction_Log.cpp} (77%)
 delete mode 100644 src/NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.cpp

diff --git a/include/NazaraEditor/Core.hpp b/include/NazaraEditor/Core.hpp
index 52e3754..66dacca 100644
--- a/include/NazaraEditor/Core.hpp
+++ b/include/NazaraEditor/Core.hpp
@@ -3,10 +3,9 @@
 #include <NazaraEditor/Core/Core.hpp>
 #include <NazaraEditor/Core/Application/Action.hpp>
 #include <NazaraEditor/Core/Application/ActionStack.hpp>
-#include <NazaraEditor/Core/Application/Actions/EditorAction_Level.hpp>
-#include <NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.hpp>
-#include <NazaraEditor/Core/Application/Actions/EditorAction_Log_CopyToClipboard.hpp>
 #include <NazaraEditor/Core/Application/Actions/EditorAction_Editor.hpp>
+#include <NazaraEditor/Core/Application/Actions/EditorAction_Level.hpp>
+#include <NazaraEditor/Core/Application/Actions/EditorAction_Log.hpp>
 #include <NazaraEditor/Core/Application/BaseApplication.hpp>
 #include <NazaraEditor/Core/Application/EditorLogger.hpp>
 #include <NazaraEditor/Core/Application/Level.hpp>
diff --git a/include/NazaraEditor/Core/Application/Actions/EditorAction_Log_CopyToClipboard.hpp b/include/NazaraEditor/Core/Application/Actions/EditorAction_Log.hpp
similarity index 60%
rename from include/NazaraEditor/Core/Application/Actions/EditorAction_Log_CopyToClipboard.hpp
rename to include/NazaraEditor/Core/Application/Actions/EditorAction_Log.hpp
index e0d1020..30f9dce 100644
--- a/include/NazaraEditor/Core/Application/Actions/EditorAction_Log_CopyToClipboard.hpp
+++ b/include/NazaraEditor/Core/Application/Actions/EditorAction_Log.hpp
@@ -4,6 +4,15 @@
 
 namespace Nz
 {
+	class NAZARAEDITOR_CORE_API EditorAction_Log_Clear final
+		: public EditorAction
+	{
+		EDITORACTION_BODY(EditorAction_Log_Clear, false);
+
+	public:
+		void Execute() override;
+	};
+
 	class NAZARAEDITOR_CORE_API EditorAction_Log_CopyToClipboard final
 		: public EditorAction
 	{
diff --git a/include/NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.hpp b/include/NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.hpp
deleted file mode 100644
index 9565c16..0000000
--- a/include/NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <NazaraEditor/Core/Application/Action.hpp>
-
-namespace Nz
-{
-	class NAZARAEDITOR_CORE_API EditorAction_Log_Clear final
-		: public EditorAction
-	{
-		EDITORACTION_BODY(EditorAction_Log_Clear, false);
-
-	public:
-		void Execute() override;
-	};
-}
\ No newline at end of file
diff --git a/src/NazaraEditor/Core/Application/Actions/EditorAction_Log_CopyToClipboard.cpp b/src/NazaraEditor/Core/Application/Actions/EditorAction_Log.cpp
similarity index 77%
rename from src/NazaraEditor/Core/Application/Actions/EditorAction_Log_CopyToClipboard.cpp
rename to src/NazaraEditor/Core/Application/Actions/EditorAction_Log.cpp
index d231bed..afa3dfd 100644
--- a/src/NazaraEditor/Core/Application/Actions/EditorAction_Log_CopyToClipboard.cpp
+++ b/src/NazaraEditor/Core/Application/Actions/EditorAction_Log.cpp
@@ -1,13 +1,13 @@
-#include <NazaraEditor/Core/Application/Actions/EditorAction_Log_CopyToClipboard.hpp>
+#include <NazaraEditor/Core/Application/Actions/EditorAction_Log.hpp>
 #include <NazaraEditor/Core/Application/BaseApplication.hpp>
-#include <NazaraEditor/Core/Application/EditorLogger.hpp>
-
-#include <Nazara/Platform.hpp>
-
-#include <sstream>
 
 namespace Nz
 {
+	void EditorAction_Log_Clear::Execute()
+	{
+		Nz::EditorBaseApplication::Instance()->GetLogger().Clear();
+	}
+
 	void EditorAction_Log_CopyToClipboard::Execute()
 	{
 		auto& lines = Nz::EditorBaseApplication::Instance()->GetLogger().GetLog();
diff --git a/src/NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.cpp b/src/NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.cpp
deleted file mode 100644
index 2eaf4c3..0000000
--- a/src/NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <NazaraEditor/Core/Application/Actions/EditorAction_Log_Clear.hpp>
-#include <NazaraEditor/Core/Application/BaseApplication.hpp>
-
-namespace Nz
-{
-	void EditorAction_Log_Clear::Execute()
-	{
-		Nz::EditorBaseApplication::Instance()->GetLogger().Clear();
-	}
-}
\ No newline at end of file