From 2c2003aa5b552b1751aa2e896444b55023a505d2 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Sat, 19 Jun 2021 12:40:59 +0200
Subject: [PATCH] move try_to_int64 to StrUtil

---
 Utilities/Config.cpp     | 4 ++--
 Utilities/Config.h       | 8 +-------
 Utilities/StrUtil.h      | 6 ++++++
 Utilities/cheat_info.cpp | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Utilities/Config.cpp b/Utilities/Config.cpp
index d7d0198324..15197a0b71 100644
--- a/Utilities/Config.cpp
+++ b/Utilities/Config.cpp
@@ -58,7 +58,7 @@ std::vector<std::string> cfg::make_int_range(s64 min, s64 max)
 	return {std::to_string(min), std::to_string(max)};
 }
 
-bool cfg::try_to_int64(s64* out, const std::string& value, s64 min, s64 max)
+bool try_to_int64(s64* out, const std::string& value, s64 min, s64 max)
 {
 	s64 result;
 	const char* start = &value.front();
@@ -104,7 +104,7 @@ std::vector<std::string> cfg::make_uint_range(u64 min, u64 max)
 	return {std::to_string(min), std::to_string(max)};
 }
 
-bool cfg::try_to_uint64(u64* out, const std::string& value, u64 min, u64 max)
+bool try_to_uint64(u64* out, const std::string& value, u64 min, u64 max)
 {
 	u64 result;
 	const char* start = &value.front();
diff --git a/Utilities/Config.h b/Utilities/Config.h
index c997e329d8..d891b47c76 100644
--- a/Utilities/Config.h
+++ b/Utilities/Config.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "util/types.hpp"
-#include "Utilities/StrFmt.h"
+#include "Utilities/StrUtil.h"
 #include "util/logs.hpp"
 #include "util/atomic.hpp"
 #include "util/shared_ptr.hpp"
@@ -17,15 +17,9 @@ namespace cfg
 	// Format min and max values
 	std::vector<std::string> make_int_range(s64 min, s64 max);
 
-	// Convert string to signed integer
-	bool try_to_int64(s64* out, const std::string& value, s64 min, s64 max);
-
 	// Format min and max unsigned values
 	std::vector<std::string> make_uint_range(u64 min, u64 max);
 
-	// Convert string to unsigned integer
-	bool try_to_uint64(u64* out, const std::string& value, u64 min, u64 max);
-
 	// Internal hack
 	bool try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, const std::string&);
 
diff --git a/Utilities/StrUtil.h b/Utilities/StrUtil.h
index 561f078757..922b0fba16 100644
--- a/Utilities/StrUtil.h
+++ b/Utilities/StrUtil.h
@@ -21,6 +21,12 @@ inline void strcpy_trunc(D& dst, const T& src)
 	std::memset(std::data(dst) + count, 0, std::size(dst) - count);
 }
 
+// Convert string to signed integer
+bool try_to_int64(s64* out, const std::string& value, s64 min, s64 max);
+
+// Convert string to unsigned integer
+bool try_to_uint64(u64* out, const std::string& value, u64 min, u64 max);
+
 namespace fmt
 {
 	std::string replace_all(std::string_view src, std::string_view from, std::string_view to, usz count = -1);
diff --git a/Utilities/cheat_info.cpp b/Utilities/cheat_info.cpp
index ea902651e4..42ffb89e52 100644
--- a/Utilities/cheat_info.cpp
+++ b/Utilities/cheat_info.cpp
@@ -10,7 +10,7 @@ bool cheat_info::from_str(const std::string& cheat_line)
 	auto cheat_vec = fmt::split(cheat_line, {"@@@"}, false);
 
 	s64 val64 = 0;
-	if (cheat_vec.size() != 5 || !cfg::try_to_int64(&val64, cheat_vec[2], 0, cheat_type_max - 1))
+	if (cheat_vec.size() != 5 || !try_to_int64(&val64, cheat_vec[2], 0, cheat_type_max - 1))
 	{
 		log_cheat.fatal("Failed to parse cheat line");
 		return false;