[Refactor] #4158 sort.cpp/h をtarget-sorter.cpp/h にリネームした

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 4ba6211..3acac28 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -1732,7 +1732,7 @@
     <ClCompile Include="..\..\src\player-info\self-info.cpp" />\r
     <ClCompile Include="..\..\src\io\signal-handlers.cpp" />\r
     <ClCompile Include="..\..\src\mind\mind-sniper.cpp" />\r
-    <ClCompile Include="..\..\src\util\sort.cpp" />\r
+    <ClCompile Include="..\..\src\target\target-sorter.cpp" />\r
     <ClCompile Include="..\..\src\spell\spells-diceroll.cpp" />\r
     <ClCompile Include="..\..\src\spell-kind\spells-floor.cpp" />\r
     <ClCompile Include="..\..\src\spell\spells-object.cpp" />\r
@@ -2009,7 +2009,7 @@
     <ClInclude Include="..\..\src\core\scores.h" />\r
     <ClInclude Include="..\..\src\player-info\self-info.h" />\r
     <ClInclude Include="..\..\src\mind\mind-sniper.h" />\r
-    <ClInclude Include="..\..\src\util\sort.h" />\r
+    <ClInclude Include="..\..\src\target\target-sorter.h" />\r
     <ClInclude Include="..\..\src\spell\spells-diceroll.h" />\r
     <ClInclude Include="..\..\src\spell-kind\spells-floor.h" />\r
     <ClInclude Include="..\..\src\spell\spells-object.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 5dd488e..c704636 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1199,8 +1199,8 @@
     <ClCompile Include="..\..\src\term\screen-processor.cpp">\r
       <Filter>term</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\util\sort.cpp">\r
-      <Filter>util</Filter>\r
+    <ClCompile Include="..\..\src\target\target-sorter.cpp">\r
+      <Filter>target</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\io\input-key-requester.cpp">\r
       <Filter>io</Filter>\r
@@ -3899,8 +3899,8 @@
     <ClInclude Include="..\..\src\term\screen-processor.h">\r
       <Filter>term</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\util\sort.h">\r
-      <Filter>util</Filter>\r
+    <ClInclude Include="..\..\src\target\target-sorter.h">\r
+      <Filter>target</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\io\input-key-requester.h">\r
       <Filter>io</Filter>\r

diff --git a/src/Makefile.am b/src/Makefile.am
index c46ab16..74b57e3 100644 (file)
--- 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 5d7222e..d88d178 100644 (file)
--- 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 a422f2e..92a525f 100644 (file)
--- 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 75ab94e..c8abb9c 100644 (file)
--- 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 7aee29c..da8af1e 100644 (file)
--- 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"