From cdb5664b91fdf87c705f25d26b8b3b486994e9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Krupi=C5=84ski?= <danielkrupinski@outlook.com>
Date: Thu, 30 Jan 2025 20:50:27 +0100
Subject: [PATCH] Move Helpers directory contents to directories they fit more

---
 Source/GlobalContext/FullGlobalContext.h      |  4 ++--
 Source/GlobalContext/GlobalContext.h          |  2 +-
 .../{Helpers => GlobalContext}/UnloadFlag.h   |  0
 Source/MemoryPatterns/PatternFinders.h        |  2 +-
 Source/MemorySearch/PatternFinder.h           |  2 +-
 Source/MemorySearch/PatternFinderSIMD.h       |  2 +-
 .../PatternNotFoundLogger.h                   |  0
 Source/Osiris.vcxproj                         |  7 +++---
 Source/Osiris.vcxproj.filters                 | 24 +++++++------------
 .../UI/Panorama/PanoramaCommandDispatcher.h   |  2 +-
 Source/UI/Panorama/PanoramaGUI.h              |  2 +-
 Source/{Helpers => Utils}/Bits.h              |  0
 Tests/UnitTests/HelpersTests/Tests.h          |  3 ---
 Tests/UnitTests/UnitTests.cpp                 |  1 -
 .../{HelpersTests => UtilsTests}/BitsTests.h  | 10 ++++----
 Tests/UnitTests/UtilsTests/Tests.h            |  1 +
 16 files changed, 26 insertions(+), 36 deletions(-)
 rename Source/{Helpers => GlobalContext}/UnloadFlag.h (100%)
 rename Source/{Helpers => MemorySearch}/PatternNotFoundLogger.h (100%)
 rename Source/{Helpers => Utils}/Bits.h (100%)
 delete mode 100644 Tests/UnitTests/HelpersTests/Tests.h
 rename Tests/UnitTests/{HelpersTests => UtilsTests}/BitsTests.h (55%)

diff --git a/Source/GlobalContext/FullGlobalContext.h b/Source/GlobalContext/FullGlobalContext.h
index 7845fa43413..5ffb11acbd3 100644
--- a/Source/GlobalContext/FullGlobalContext.h
+++ b/Source/GlobalContext/FullGlobalContext.h
@@ -12,8 +12,8 @@
 #include <Features/FeaturesUnloadHandler.h>
 #include <Features/Visuals/ModelGlow/Preview/PlayerModelGlowPreviewState.h>
 #include <Features/Visuals/PlayerInfoInWorld/PlayerInfoPanelCacheState.h>
-#include <Helpers/PatternNotFoundLogger.h>
-#include <Helpers/UnloadFlag.h>
+#include <MemorySearch/PatternNotFoundLogger.h>
+#include "UnloadFlag.h"
 #include <Hooks/Hooks.h>
 #include <Hooks/PeepEventsHook.h>
 #include <Hud/BombStatus/BombStatusPanelManager.h>
diff --git a/Source/GlobalContext/GlobalContext.h b/Source/GlobalContext/GlobalContext.h
index 5cb18672c1b..92a319dfeb2 100644
--- a/Source/GlobalContext/GlobalContext.h
+++ b/Source/GlobalContext/GlobalContext.h
@@ -7,7 +7,7 @@
 #include <CS2/Constants/DllNames.h>
 #include <Features/Visuals/ModelGlow/Preview/PlayerModelGlowPreview.h>
 #include <Features/Common/InWorldPanelsUnloadHandler.h>
-#include <Helpers/PatternNotFoundLogger.h>
+#include <MemorySearch/PatternNotFoundLogger.h>
 #include <MemoryAllocation/FreeMemoryRegionList.h>
 #include <MemorySearch/PatternFinder.h>
 #include <Platform/DynamicLibrary.h>
diff --git a/Source/Helpers/UnloadFlag.h b/Source/GlobalContext/UnloadFlag.h
similarity index 100%
rename from Source/Helpers/UnloadFlag.h
rename to Source/GlobalContext/UnloadFlag.h
diff --git a/Source/MemoryPatterns/PatternFinders.h b/Source/MemoryPatterns/PatternFinders.h
index ba90fbc7389..30e4712e048 100644
--- a/Source/MemoryPatterns/PatternFinders.h
+++ b/Source/MemoryPatterns/PatternFinders.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <MemorySearch/PatternFinder.h>
-#include <Helpers/PatternNotFoundLogger.h>
+#include <MemorySearch/PatternNotFoundLogger.h>
 
 struct PatternFinders {
     PatternFinder<PatternNotFoundLogger> clientPatternFinder;
diff --git a/Source/MemorySearch/PatternFinder.h b/Source/MemorySearch/PatternFinder.h
index 0742e23d00a..5b44f39a021 100644
--- a/Source/MemorySearch/PatternFinder.h
+++ b/Source/MemorySearch/PatternFinder.h
@@ -6,7 +6,7 @@
 
 #include "BytePattern.h"
 #include "BytePatternView.h"
-#include <Helpers/PatternNotFoundLogger.h>
+#include "PatternNotFoundLogger.h"
 #include "HybridPatternFinder.h"
 #include "PatternPoolView.h"
 #include "PatternSearchResults.h"
diff --git a/Source/MemorySearch/PatternFinderSIMD.h b/Source/MemorySearch/PatternFinderSIMD.h
index 5ccf1e0d56e..582aa5501e7 100644
--- a/Source/MemorySearch/PatternFinderSIMD.h
+++ b/Source/MemorySearch/PatternFinderSIMD.h
@@ -8,7 +8,7 @@
 #include "BytePattern.h"
 #include <emmintrin.h>
 
-#include <Helpers/Bits.h>
+#include <Utils/Bits.h>
 
 class PatternFinderSIMD {
 public:
diff --git a/Source/Helpers/PatternNotFoundLogger.h b/Source/MemorySearch/PatternNotFoundLogger.h
similarity index 100%
rename from Source/Helpers/PatternNotFoundLogger.h
rename to Source/MemorySearch/PatternNotFoundLogger.h
diff --git a/Source/Osiris.vcxproj b/Source/Osiris.vcxproj
index 2f20fd7a4f9..2f8be670f3c 100644
--- a/Source/Osiris.vcxproj
+++ b/Source/Osiris.vcxproj
@@ -306,10 +306,7 @@
     <ClInclude Include="GlobalContext\GlobalContext.h" />
     <ClInclude Include="GlobalContext\PartialGlobalContext.h" />
     <ClInclude Include="GlobalContext\PeepEventsHookResult.h" />
-    <ClInclude Include="Helpers\Bits.h" />
-    <ClInclude Include="Helpers\PanoramaTransformFactory.h" />
-    <ClInclude Include="Helpers\PatternNotFoundLogger.h" />
-    <ClInclude Include="Helpers\UnloadFlag.h" />
+    <ClInclude Include="GlobalContext\UnloadFlag.h" />
     <ClInclude Include="HookDependencies\HookDependencies.h" />
     <ClInclude Include="Hooks\Hooks.h" />
     <ClInclude Include="Hooks\PeepEventsHook.h" />
@@ -410,6 +407,7 @@
     <ClInclude Include="MemorySearch\PatternFinder.h" />
     <ClInclude Include="MemorySearch\PatternFinderScalar.h" />
     <ClInclude Include="MemorySearch\PatternFinderSIMD.h" />
+    <ClInclude Include="MemorySearch\PatternNotFoundLogger.h" />
     <ClInclude Include="MemorySearch\PatternPool.h" />
     <ClInclude Include="MemorySearch\PatternPoolBuilder.h" />
     <ClInclude Include="MemorySearch\PatternPoolView.h" />
@@ -498,6 +496,7 @@
     <ClInclude Include="UI\Panorama\VisualsTab.h" />
     <ClInclude Include="Utils\Align.h" />
     <ClInclude Include="Utils\BitFlags.h" />
+    <ClInclude Include="Utils\Bits.h" />
     <ClInclude Include="Utils\CharUtils.h" />
     <ClInclude Include="Utils\ColorUtils.h" />
     <ClInclude Include="Utils\CString.h" />
diff --git a/Source/Osiris.vcxproj.filters b/Source/Osiris.vcxproj.filters
index 841c68ed052..c61ab7dc9a6 100644
--- a/Source/Osiris.vcxproj.filters
+++ b/Source/Osiris.vcxproj.filters
@@ -22,9 +22,6 @@
     <Filter Include="GameClasses">
       <UniqueIdentifier>{8f279e18-4344-42fb-8c01-6c773341568d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Helpers">
-      <UniqueIdentifier>{eaf12914-2d12-4935-aab3-1491b8021bd6}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Hooks">
       <UniqueIdentifier>{1ee84f1c-3411-4068-816f-186260cb390d}</UniqueIdentifier>
     </Filter>
@@ -270,15 +267,6 @@
     <ClInclude Include="Features\Visuals\VisualFeatures.h">
       <Filter>Features\Visuals</Filter>
     </ClInclude>
-    <ClInclude Include="Helpers\Bits.h">
-      <Filter>Helpers</Filter>
-    </ClInclude>
-    <ClInclude Include="Helpers\PatternNotFoundLogger.h">
-      <Filter>Helpers</Filter>
-    </ClInclude>
-    <ClInclude Include="Helpers\UnloadFlag.h">
-      <Filter>Helpers</Filter>
-    </ClInclude>
     <ClInclude Include="Hooks\PeepEventsHook.h">
       <Filter>Hooks</Filter>
     </ClInclude>
@@ -488,9 +476,6 @@
     <ClInclude Include="MemoryPatterns\Windows\MemAllocPatternsWindows.h">
       <Filter>MemoryPatterns\Windows</Filter>
     </ClInclude>
-    <ClInclude Include="Helpers\PanoramaTransformFactory.h">
-      <Filter>Helpers</Filter>
-    </ClInclude>
     <ClInclude Include="CS2\Classes\CViewRender.h">
       <Filter>CS2\Classes</Filter>
     </ClInclude>
@@ -1793,6 +1778,15 @@
     <ClInclude Include="Panorama\StylePropertySymbolMap.h">
       <Filter>Panorama</Filter>
     </ClInclude>
+    <ClInclude Include="GlobalContext\UnloadFlag.h">
+      <Filter>GlobalContext</Filter>
+    </ClInclude>
+    <ClInclude Include="MemorySearch\PatternNotFoundLogger.h">
+      <Filter>MemorySearch</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\Bits.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="UI\Panorama\CreateGUI.js">
diff --git a/Source/UI/Panorama/PanoramaCommandDispatcher.h b/Source/UI/Panorama/PanoramaCommandDispatcher.h
index 30faef24094..01036f96fef 100644
--- a/Source/UI/Panorama/PanoramaCommandDispatcher.h
+++ b/Source/UI/Panorama/PanoramaCommandDispatcher.h
@@ -3,7 +3,7 @@
 #include <string_view>
 
 #include <Features/Features.h>
-#include <Helpers/UnloadFlag.h>
+#include <GlobalContext/UnloadFlag.h>
 #include <Utils/StringParser.h>
 
 #include "SetCommandHandler.h"
diff --git a/Source/UI/Panorama/PanoramaGUI.h b/Source/UI/Panorama/PanoramaGUI.h
index 32b83a53ed0..5ac795a38a5 100644
--- a/Source/UI/Panorama/PanoramaGUI.h
+++ b/Source/UI/Panorama/PanoramaGUI.h
@@ -4,7 +4,7 @@
 #include <Panorama/MapPlayerPreviewPanel.h>
 #include <Panorama/PanoramaUiEngine.h>
 #include <Utils/StringParser.h>
-#include <Helpers/UnloadFlag.h>
+#include <GlobalContext/UnloadFlag.h>
 #include <FeatureHelpers/FeatureToggle.h>
 
 #include "PanoramaCommandDispatcher.h"
diff --git a/Source/Helpers/Bits.h b/Source/Utils/Bits.h
similarity index 100%
rename from Source/Helpers/Bits.h
rename to Source/Utils/Bits.h
diff --git a/Tests/UnitTests/HelpersTests/Tests.h b/Tests/UnitTests/HelpersTests/Tests.h
deleted file mode 100644
index 2a79e5d1ca8..00000000000
--- a/Tests/UnitTests/HelpersTests/Tests.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "BitsTests.h"
diff --git a/Tests/UnitTests/UnitTests.cpp b/Tests/UnitTests/UnitTests.cpp
index f2825b5ea97..4ca3ce7981a 100644
--- a/Tests/UnitTests/UnitTests.cpp
+++ b/Tests/UnitTests/UnitTests.cpp
@@ -1,5 +1,4 @@
 #include "FeatureTests/HudFeaturesTests/Tests.h"
-#include "HelpersTests/Tests.h"
 #include "MemorySearchTests/Tests.h"
 #include "PlatformTests/Tests.h"
 #include "UtilsTests/Tests.h"
diff --git a/Tests/UnitTests/HelpersTests/BitsTests.h b/Tests/UnitTests/UtilsTests/BitsTests.h
similarity index 55%
rename from Tests/UnitTests/HelpersTests/BitsTests.h
rename to Tests/UnitTests/UtilsTests/BitsTests.h
index 09156ec03cf..b790d6cab69 100644
--- a/Tests/UnitTests/HelpersTests/BitsTests.h
+++ b/Tests/UnitTests/UtilsTests/BitsTests.h
@@ -4,12 +4,12 @@
 
 #include <gtest/gtest.h>
 
-#include <Helpers/Bits.h>
+#include <Utils/Bits.h>
 
 namespace
 {
 
-TEST(Helpers_CountrZero, PassingZeroRaisesDebugAssertion) {
+TEST(CountrZero, PassingZeroRaisesDebugAssertion) {
     EXPECT_DEBUG_DEATH(std::ignore = bits::countrZero(0), "");
 }
 
@@ -18,13 +18,13 @@ struct CountrZeroParam {
     int firstSetBitIndex;
 };
 
-class Helpers_CountrZeroWithParam : public testing::TestWithParam<CountrZeroParam> {};
+class CountrZeroWithParam : public testing::TestWithParam<CountrZeroParam> {};
 
-TEST_P(Helpers_CountrZeroWithParam, IndexOfFirstSetBitFromRightIsReturned) {
+TEST_P(CountrZeroWithParam, IndexOfFirstSetBitFromRightIsReturned) {
     EXPECT_EQ(bits::countrZero(GetParam().x), GetParam().firstSetBitIndex);
 }
 
-INSTANTIATE_TEST_SUITE_P(, Helpers_CountrZeroWithParam, testing::Values(
+INSTANTIATE_TEST_SUITE_P(, CountrZeroWithParam, testing::Values(
     CountrZeroParam{ 1, 0 },
     CountrZeroParam{ 0b100001000, 3 },
     CountrZeroParam{ 1u << 31, 31 }
diff --git a/Tests/UnitTests/UtilsTests/Tests.h b/Tests/UnitTests/UtilsTests/Tests.h
index abaca050e1c..8edf76c0b16 100644
--- a/Tests/UnitTests/UtilsTests/Tests.h
+++ b/Tests/UnitTests/UtilsTests/Tests.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "BitsTests.h"
 #include "FlagsBuilderTests.h"
 #include "OptionalTests.h"
 #include "PatternFinderTests.h"