From 76a0113cd1a144a21444acf066fef5ab6b8e2b7e Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Sun, 3 May 2020 09:12:10 +0200
Subject: [PATCH] #5231: Move Undo system back to main binary, UI code needs to
 be refactored first.

---
 {core => radiant}/undo/Operation.h         |  0
 {core => radiant}/undo/Stack.h             |  0
 {core => radiant}/undo/StackFiller.h       |  0
 {core => radiant}/undo/UndoSystem.cpp      |  0
 {core => radiant}/undo/UndoSystem.h        |  0
 tools/msvc/DarkRadiant.vcxproj             |  5 +++++
 tools/msvc/DarkRadiant.vcxproj.filters     | 18 ++++++++++++++++++
 tools/msvc/DarkRadiantCore.vcxproj         |  5 -----
 tools/msvc/DarkRadiantCore.vcxproj.filters | 18 ------------------
 9 files changed, 23 insertions(+), 23 deletions(-)
 rename {core => radiant}/undo/Operation.h (100%)
 rename {core => radiant}/undo/Stack.h (100%)
 rename {core => radiant}/undo/StackFiller.h (100%)
 rename {core => radiant}/undo/UndoSystem.cpp (100%)
 rename {core => radiant}/undo/UndoSystem.h (100%)

diff --git a/core/undo/Operation.h b/radiant/undo/Operation.h
similarity index 100%
rename from core/undo/Operation.h
rename to radiant/undo/Operation.h
diff --git a/core/undo/Stack.h b/radiant/undo/Stack.h
similarity index 100%
rename from core/undo/Stack.h
rename to radiant/undo/Stack.h
diff --git a/core/undo/StackFiller.h b/radiant/undo/StackFiller.h
similarity index 100%
rename from core/undo/StackFiller.h
rename to radiant/undo/StackFiller.h
diff --git a/core/undo/UndoSystem.cpp b/radiant/undo/UndoSystem.cpp
similarity index 100%
rename from core/undo/UndoSystem.cpp
rename to radiant/undo/UndoSystem.cpp
diff --git a/core/undo/UndoSystem.h b/radiant/undo/UndoSystem.h
similarity index 100%
rename from core/undo/UndoSystem.h
rename to radiant/undo/UndoSystem.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
index 61c750becb..53444770b3 100644
--- a/tools/msvc/DarkRadiant.vcxproj
+++ b/tools/msvc/DarkRadiant.vcxproj
@@ -991,6 +991,7 @@
     <ClCompile Include="..\..\radiant\ui\brush\QuerySidesDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\UserInterfaceModule.cpp" />
     <ClCompile Include="..\..\radiant\ui\widgets\Splitter.cpp" />
+    <ClCompile Include="..\..\radiant\undo\UndoSystem.cpp" />
     <ClCompile Include="..\..\radiant\xyview\FloatingOrthoView.cpp" />
     <ClCompile Include="..\..\radiant\xyview\GlobalXYWnd.cpp" />
     <ClCompile Include="..\..\radiant\xyview\tools\BrushCreatorTool.cpp" />
@@ -1479,6 +1480,10 @@
     <ClInclude Include="..\..\radiant\ui\brush\QuerySidesDialog.h" />
     <ClInclude Include="..\..\radiant\ui\UserInterfaceModule.h" />
     <ClInclude Include="..\..\radiant\ui\widgets\Splitter.h" />
+    <ClInclude Include="..\..\radiant\undo\Operation.h" />
+    <ClInclude Include="..\..\radiant\undo\Stack.h" />
+    <ClInclude Include="..\..\radiant\undo\StackFiller.h" />
+    <ClInclude Include="..\..\radiant\undo\UndoSystem.h" />
     <ClInclude Include="..\..\radiant\xyview\FloatingOrthoView.h" />
     <ClInclude Include="..\..\radiant\xyview\GlobalXYWnd.h" />
     <ClInclude Include="..\..\radiant\xyview\tools\BrushCreatorTool.h" />
diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
index 067ada2020..fa3f0d7bc8 100644
--- a/tools/msvc/DarkRadiant.vcxproj.filters
+++ b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -314,6 +314,9 @@
     <Filter Include="src\settings">
       <UniqueIdentifier>{89cfcc22-4783-4193-a6c6-ad49ec9f05f4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\undo">
+      <UniqueIdentifier>{482d5c89-ec91-4034-abd0-43e9c0f384e1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiant\main.cpp">
@@ -1528,6 +1531,9 @@
     <ClCompile Include="..\..\radiant\settings\Win32Registry.cpp">
       <Filter>src\settings</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\undo\UndoSystem.cpp">
+      <Filter>src\undo</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\RadiantModule.h">
@@ -3024,6 +3030,18 @@
     <ClInclude Include="..\..\radiant\settings\Win32Registry.h">
       <Filter>src\settings</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\undo\Operation.h">
+      <Filter>src\undo</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiant\undo\Stack.h">
+      <Filter>src\undo</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiant\undo\StackFiller.h">
+      <Filter>src\undo</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiant\undo\UndoSystem.h">
+      <Filter>src\undo</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
index abe8319e37..05d3ca4031 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj
+++ b/tools/msvc/DarkRadiantCore.vcxproj
@@ -34,7 +34,6 @@
     <ClCompile Include="..\..\core\settings\LanguageManager.cpp" />
     <ClCompile Include="..\..\core\settings\PreferencePage.cpp" />
     <ClCompile Include="..\..\core\settings\PreferenceSystem.cpp" />
-    <ClCompile Include="..\..\core\undo\UndoSystem.cpp" />
     <ClCompile Include="..\..\core\vfs\DeflatedInputStream.cpp" />
     <ClCompile Include="..\..\core\vfs\DirectoryArchive.cpp" />
     <ClCompile Include="..\..\core\vfs\Doom3FileSystem.cpp" />
@@ -71,10 +70,6 @@
     <ClInclude Include="..\..\core\settings\PreferenceItems.h" />
     <ClInclude Include="..\..\core\settings\PreferencePage.h" />
     <ClInclude Include="..\..\core\settings\PreferenceSystem.h" />
-    <ClInclude Include="..\..\core\undo\Operation.h" />
-    <ClInclude Include="..\..\core\undo\Stack.h" />
-    <ClInclude Include="..\..\core\undo\StackFiller.h" />
-    <ClInclude Include="..\..\core\undo\UndoSystem.h" />
     <ClInclude Include="..\..\core\vfs\Archive.h" />
     <ClInclude Include="..\..\core\vfs\DeflatedArchiveFile.h" />
     <ClInclude Include="..\..\core\vfs\DeflatedArchiveTextFile.h" />
diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
index d8018e6e47..f17502c9a7 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj.filters
+++ b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -20,9 +20,6 @@
     <Filter Include="src\vfs">
       <UniqueIdentifier>{fae22404-52d3-4653-afb9-c333e87edd41}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\undo">
-      <UniqueIdentifier>{365fbce2-bbe0-4f3a-a30a-a4b4dc8f94d6}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\commandsystem">
       <UniqueIdentifier>{67aed069-dd61-4b65-9c77-c8cfcc11be9b}</UniqueIdentifier>
     </Filter>
@@ -79,9 +76,6 @@
     <ClCompile Include="..\..\core\vfs\ZipArchive.cpp">
       <Filter>src\vfs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\core\undo\UndoSystem.cpp">
-      <Filter>src\undo</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\core\commandsystem\CommandSystem.cpp">
       <Filter>src\commandsystem</Filter>
     </ClCompile>
@@ -192,18 +186,6 @@
     <ClInclude Include="..\..\core\vfs\ZipStreamUtils.h">
       <Filter>src\vfs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\core\undo\Operation.h">
-      <Filter>src\undo</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\core\undo\Stack.h">
-      <Filter>src\undo</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\core\undo\StackFiller.h">
-      <Filter>src\undo</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\core\undo\UndoSystem.h">
-      <Filter>src\undo</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\core\commandsystem\CaseInsensitiveCompare.h">
       <Filter>src\commandsystem</Filter>
     </ClInclude>