From 42b86d46435fe29e9ddfefeeb9a1c01e5cc454dc Mon Sep 17 00:00:00 2001
From: Hourier <66951241+Hourier@users.noreply.github.com>
Date: Sat, 25 May 2024 23:06:49 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#4158=20sort.cpp/h=20=E3=82=92targe?=
 =?utf8?q?t-sorter.cpp/h=20=E3=81=AB=E3=83=AA=E3=83=8D=E3=83=BC=E3=83=A0?=
 =?utf8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Hengband/Hengband/Hengband.vcxproj              | 4 ++--
 Hengband/Hengband/Hengband.vcxproj.filters      | 8 ++++----
 src/Makefile.am                                 | 2 +-
 src/target/grid-selector.cpp                    | 2 +-
 src/target/target-preparation.cpp               | 2 +-
 src/{util/sort.cpp => target/target-sorter.cpp} | 2 +-
 src/{util/sort.h => target/target-sorter.h}     | 0
 src/wizard/wizard-spoiler.cpp                   | 1 -
 8 files changed, 10 insertions(+), 11 deletions(-)
 rename src/{util/sort.cpp => target/target-sorter.cpp} (99%)
 rename src/{util/sort.h => target/target-sorter.h} (100%)

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 4ba6211c2..3acac28fa 100644
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -1732,7 +1732,7 @@
     <ClCompile Include="..\..\src\player-info\self-info.cpp" />
     <ClCompile Include="..\..\src\io\signal-handlers.cpp" />
     <ClCompile Include="..\..\src\mind\mind-sniper.cpp" />
-    <ClCompile Include="..\..\src\util\sort.cpp" />
+    <ClCompile Include="..\..\src\target\target-sorter.cpp" />
     <ClCompile Include="..\..\src\spell\spells-diceroll.cpp" />
     <ClCompile Include="..\..\src\spell-kind\spells-floor.cpp" />
     <ClCompile Include="..\..\src\spell\spells-object.cpp" />
@@ -2009,7 +2009,7 @@
     <ClInclude Include="..\..\src\core\scores.h" />
     <ClInclude Include="..\..\src\player-info\self-info.h" />
     <ClInclude Include="..\..\src\mind\mind-sniper.h" />
-    <ClInclude Include="..\..\src\util\sort.h" />
+    <ClInclude Include="..\..\src\target\target-sorter.h" />
     <ClInclude Include="..\..\src\spell\spells-diceroll.h" />
     <ClInclude Include="..\..\src\spell-kind\spells-floor.h" />
     <ClInclude Include="..\..\src\spell\spells-object.h" />
diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 5dd488e8f..c704636db 100644
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1199,8 +1199,8 @@
     <ClCompile Include="..\..\src\term\screen-processor.cpp">
       <Filter>term</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\util\sort.cpp">
-      <Filter>util</Filter>
+    <ClCompile Include="..\..\src\target\target-sorter.cpp">
+      <Filter>target</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\io\input-key-requester.cpp">
       <Filter>io</Filter>
@@ -3899,8 +3899,8 @@
     <ClInclude Include="..\..\src\term\screen-processor.h">
       <Filter>term</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\util\sort.h">
-      <Filter>util</Filter>
+    <ClInclude Include="..\..\src\target\target-sorter.h">
+      <Filter>target</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\io\input-key-requester.h">
       <Filter>io</Filter>
diff --git a/src/Makefile.am b/src/Makefile.am
index c46ab1614..74b57e31c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -944,6 +944,7 @@ hengband_SOURCES = \
 	target/target-getter.cpp target/target-getter.h \
 	target/target-preparation.cpp target/target-preparation.h \
 	target/target-setter.cpp target/target-setter.h \
+	target/target-sorter.cpp target/target-sorter.h \
 	target/target-types.h \
 	\
 	term/gameterm.cpp term/gameterm.h \
@@ -979,7 +980,6 @@ hengband_SOURCES = \
 	util/probability-table.h \
 	util/rng-xoshiro.cpp util/rng-xoshiro.h \
 	util/sha256.cpp util/sha256.h \
-	util/sort.cpp util/sort.h \
 	util/string-processor.cpp util/string-processor.h \
 	\
 	view/colored-char.h \
diff --git a/src/target/grid-selector.cpp b/src/target/grid-selector.cpp
index 5d7222ef6..d88d17844 100644
--- a/src/target/grid-selector.cpp
+++ b/src/target/grid-selector.cpp
@@ -19,7 +19,7 @@
 #include "timed-effect/player-hallucination.h"
 #include "timed-effect/timed-effects.h"
 #include "util/int-char-converter.h"
-#include "util/sort.h"
+#include "target/target-sorter.h"
 #include "view/display-messages.h"
 #include "window/main-window-util.h"
 #include <functional>
diff --git a/src/target/target-preparation.cpp b/src/target/target-preparation.cpp
index a422f2e1a..92a525fd5 100644
--- a/src/target/target-preparation.cpp
+++ b/src/target/target-preparation.cpp
@@ -16,11 +16,11 @@
 #include "system/player-type-definition.h"
 #include "system/terrain-type-definition.h"
 #include "target/projection-path-calculator.h"
+#include "target/target-sorter.h"
 #include "target/target-types.h"
 #include "timed-effect/player-hallucination.h"
 #include "timed-effect/timed-effects.h"
 #include "util/bit-flags-calculator.h"
-#include "util/sort.h"
 #include "window/main-window-util.h"
 #include <algorithm>
 #include <utility>
diff --git a/src/util/sort.cpp b/src/target/target-sorter.cpp
similarity index 99%
rename from src/util/sort.cpp
rename to src/target/target-sorter.cpp
index 75ab94e76..c8abb9c94 100644
--- a/src/util/sort.cpp
+++ b/src/target/target-sorter.cpp
@@ -1,4 +1,4 @@
-#include "util/sort.h"
+#include "target/target-sorter.h"
 #include "artifact/fixed-art-types.h"
 #include "dungeon/quest.h"
 #include "grid/grid.h"
diff --git a/src/util/sort.h b/src/target/target-sorter.h
similarity index 100%
rename from src/util/sort.h
rename to src/target/target-sorter.h
diff --git a/src/wizard/wizard-spoiler.cpp b/src/wizard/wizard-spoiler.cpp
index 7aee29c67..da8af1e76 100644
--- a/src/wizard/wizard-spoiler.cpp
+++ b/src/wizard/wizard-spoiler.cpp
@@ -30,7 +30,6 @@
 #include "util/angband-files.h"
 #include "util/bit-flags-calculator.h"
 #include "util/int-char-converter.h"
-#include "util/sort.h"
 #include "util/string-processor.h"
 #include "view/display-messages.h"
 #include "wizard/fixed-artifacts-spoiler.h"
-- 
2.11.0