Use core/format.hpp for fmt includes

JGRennison · Jul 20, 2023 · 508f871 · 508f871
1 parent 40faaa4
commit 508f871
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 16 deletions.
diff --git a/src/3rdparty/squirrel/squirrel/squtils.h b/src/3rdparty/squirrel/squirrel/squtils.h
@@ -2,7 +2,7 @@
 #ifndef _SQUTILS_H_
 #define _SQUTILS_H_
 
-#include "../../fmt/format.h"
+#include "../../../core/format.hpp"
 #include "../../../script/script_fatalerror.hpp"
 #include <type_traits>
 

diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
@@ -15,7 +15,7 @@
 #include "../debug.h"
 #include "../string_func.h"
 #include "../rev.h"
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 #include <set>
 
 #include "../safeguards.h"

diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
@@ -17,7 +17,7 @@
 #include "../script/api/script_object.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 
 #include "../safeguards.h"
 

diff --git a/src/game/game_scanner.cpp b/src/game/game_scanner.cpp
@@ -12,8 +12,7 @@
 #include "../script/squirrel_class.hpp"
 #include "game_info.hpp"
 #include "game_scanner.hpp"
-
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 
 #include "../safeguards.h"
 

diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
@@ -21,7 +21,7 @@
 #include "network.h"
 #include "network_client.h"
 #include "network_base.h"
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 
 #include "../widgets/network_chat_widget.h"
 

diff --git a/src/os/macosx/survey_osx.cpp b/src/os/macosx/survey_osx.cpp
@@ -11,7 +11,7 @@
 
 #include "../../stdafx.h"
 
-#include "../../3rdparty/fmt/format.h"
+#include "../../core/format.hpp"
 #include "macos.h"
 
 #include <mach-o/arch.h>

diff --git a/src/os/windows/survey_win.cpp b/src/os/windows/survey_win.cpp
@@ -11,7 +11,7 @@
 
 #include "../../stdafx.h"
 
-#include "../../3rdparty/fmt/format.h"
+#include "../../core/format.hpp"
 
 #include <nlohmann/json.hpp>
 #include <windows.h>

diff --git a/src/script/api/script_admin.cpp b/src/script/api/script_admin.cpp
@@ -13,7 +13,7 @@
 #include "../../network/network_admin.h"
 #include "../script_instance.hpp"
 #include "../../string_func.h"
-#include "../../3rdparty/fmt/format.h"
+#include "../../core/format.hpp"
 
 #include "../../safeguards.h"
 

diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp
@@ -21,7 +21,7 @@
 #include "../script_gui.h"
 #include "../../settings_type.h"
 #include "../../network/network.h"
-#include "../../3rdparty/fmt/format.h"
+#include "../../core/format.hpp"
 
 #include "../../safeguards.h"
 

diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp
@@ -17,7 +17,7 @@
 #include "../script_instance.hpp"
 #include "script_log.hpp"
 #include "../../table/control_codes.h"
-#include "../../3rdparty/fmt/format.h"
+#include "../../core/format.hpp"
 
 #include "table/strings.h"
 

diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp
@@ -14,7 +14,7 @@
 #include "api/script_object.hpp"
 #include "../textfile_gui.h"
 #include "../string_func.h"
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 #include <charconv>
 
 #include "../safeguards.h"

diff --git a/src/script/script_info.cpp b/src/script/script_info.cpp
@@ -14,7 +14,7 @@
 
 #include "script_info.hpp"
 #include "script_scanner.hpp"
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 
 #include "../safeguards.h"
 

diff --git a/src/script/script_info_dummy.cpp b/src/script/script_info_dummy.cpp
@@ -12,7 +12,7 @@
 
 #include "../string_func.h"
 #include "../strings_func.h"
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 
 #include "../safeguards.h"
 

diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp
@@ -29,7 +29,7 @@
 #include "../fileio_func.h"
 #include "../league_type.h"
 
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 
 #include "../safeguards.h"
 

diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp
@@ -20,7 +20,7 @@
 #include "../network/network_content.h"
 #include "../3rdparty/md5/md5.h"
 #include "../tar_type.h"
-#include "../3rdparty/fmt/format.h"
+#include "../core/format.hpp"
 
 #include "../safeguards.h"