From e59951382ae02271eaf7a994685e7bead96899a6 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Mon, 10 Aug 2020 01:30:58 -0700 Subject: [PATCH] Global: Make stringutil includes more explicit. --- Common/KeyMap.cpp | 1 + Core/FileSystems/DirectoryFileSystem.cpp | 1 + Core/SaveState.cpp | 1 + Core/TextureReplacer.cpp | 1 + GPU/Directx9/ShaderManagerDX9.cpp | 1 + UI/DevScreens.cpp | 1 + UI/NativeApp.cpp | 3 ++- UI/PauseScreen.cpp | 1 + UI/RemoteISOScreen.cpp | 1 + UI/ReportScreen.cpp | 1 + UI/SavedataScreen.cpp | 1 + Windows/MainWindow.cpp | 1 + Windows/MainWindowMenu.cpp | 2 ++ Windows/main.cpp | 3 ++- ext/native/i18n/i18n.cpp | 1 + ext/native/i18n/i18n.h | 1 + ext/native/ui/ui_screen.cpp | 2 ++ 17 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index b7091b537a..8683ba8346 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -25,6 +25,7 @@ #endif #include "base/logging.h" +#include "base/stringutil.h" #include "base/NativeApp.h" #include "file/ini_file.h" #include "input/input_state.h" diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp index 7edb316eef..45dc902f04 100644 --- a/Core/FileSystems/DirectoryFileSystem.cpp +++ b/Core/FileSystems/DirectoryFileSystem.cpp @@ -19,6 +19,7 @@ #include #include +#include "base/stringutil.h" #include "file/free.h" #include "file/zip_read.h" #include "i18n/i18n.h" diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp index 19a78cc6ac..649b644a88 100644 --- a/Core/SaveState.cpp +++ b/Core/SaveState.cpp @@ -20,6 +20,7 @@ #include #include +#include "base/stringutil.h" #include "base/timeutil.h" #include "i18n/i18n.h" #include "thread/threadutil.h" diff --git a/Core/TextureReplacer.cpp b/Core/TextureReplacer.cpp index 41edb29ce0..05dd6c44f9 100644 --- a/Core/TextureReplacer.cpp +++ b/Core/TextureReplacer.cpp @@ -22,6 +22,7 @@ #endif #include +#include "base/stringutil.h" #include "i18n/i18n.h" #include "ext/xxhash.h" #include "file/ini_file.h" diff --git a/GPU/Directx9/ShaderManagerDX9.cpp b/GPU/Directx9/ShaderManagerDX9.cpp index 856150bbb3..e3157371e8 100644 --- a/GPU/Directx9/ShaderManagerDX9.cpp +++ b/GPU/Directx9/ShaderManagerDX9.cpp @@ -23,6 +23,7 @@ #include #include "gfx/d3d9_shader.h" #include "base/logging.h" +#include "base/stringutil.h" #include "i18n/i18n.h" #include "math/lin/matrix4x4.h" #include "math/math_util.h" diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index f146d099e9..9c0d6cdf99 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -18,6 +18,7 @@ #include #include "base/display.h" +#include "base/stringutil.h" #include "gfx_es2/gpu_features.h" #include "i18n/i18n.h" #include "ui/ui_context.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index cc855aa1fe..3db216d802 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -44,8 +44,9 @@ #endif #include "base/display.h" -#include "base/timeutil.h" #include "base/logging.h" +#include "base/stringutil.h" +#include "base/timeutil.h" #include "base/NativeApp.h" #include "file/vfs.h" #include "file/zip_read.h" diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index 59769a01c7..df694192f4 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -17,6 +17,7 @@ #include #include +#include "base/stringutil.h" #include "i18n/i18n.h" #include "gfx_es2/draw_buffer.h" #include "ui/view.h" diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp index 9f0930f77d..8029c39671 100644 --- a/UI/RemoteISOScreen.cpp +++ b/UI/RemoteISOScreen.cpp @@ -25,6 +25,7 @@ #include #endif +#include "base/stringutil.h" #include "base/timeutil.h" #include "file/path.h" // TODO: For text align flags, probably shouldn't be in gfx_es2/... diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp index 96ba662c6f..e2cf904b2c 100644 --- a/UI/ReportScreen.cpp +++ b/UI/ReportScreen.cpp @@ -17,6 +17,7 @@ #include #include "base/display.h" +#include "base/stringutil.h" // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" #include "i18n/i18n.h" diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 5ec73aa9ca..0f3ce2a45f 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -19,6 +19,7 @@ #include #include "base/colorutil.h" +#include "base/stringutil.h" #include "base/timeutil.h" #include "gfx_es2/draw_buffer.h" #include "i18n/i18n.h" diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index a735878ba0..59f6820aa5 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -34,6 +34,7 @@ #include "base/display.h" #include "base/NativeApp.h" +#include "base/stringutil.h" #include "base/timeutil.h" #include "i18n/i18n.h" #include "input/input_state.h" diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index 03296a8f28..fcc1b2528d 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -1,11 +1,13 @@ #include #include +#include #include "CommonWindows.h" #include #include "resource.h" +#include "base/stringutil.h" #include "i18n/i18n.h" #include "util/text/utf8.h" #include "base/NativeApp.h" diff --git a/Windows/main.cpp b/Windows/main.cpp index 9a2bcce356..50cd28534b 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -31,8 +31,9 @@ #include #include -#include "base/NativeApp.h" #include "base/display.h" +#include "base/stringutil.h" +#include "base/NativeApp.h" #include "file/vfs.h" #include "file/zip_read.h" #include "i18n/i18n.h" diff --git a/ext/native/i18n/i18n.cpp b/ext/native/i18n/i18n.cpp index eb823dc2b9..cba62a2e4b 100644 --- a/ext/native/i18n/i18n.cpp +++ b/ext/native/i18n/i18n.cpp @@ -1,4 +1,5 @@ #include "base/logging.h" +#include "base/stringutil.h" #include "i18n/i18n.h" #include "file/ini_file.h" #include "file/vfs.h" diff --git a/ext/native/i18n/i18n.h b/ext/native/i18n/i18n.h index 75d8ddd776..b184dd7975 100644 --- a/ext/native/i18n/i18n.h +++ b/ext/native/i18n/i18n.h @@ -14,6 +14,7 @@ #include #include +#include "base/basictypes.h" #include "file/ini_file.h" // Reasonably thread safe. diff --git a/ext/native/ui/ui_screen.cpp b/ext/native/ui/ui_screen.cpp index e2dba2cf60..180e271aae 100644 --- a/ext/native/ui/ui_screen.cpp +++ b/ext/native/ui/ui_screen.cpp @@ -1,6 +1,8 @@ #include #include +#include #include "base/display.h" +#include "base/stringutil.h" #include "input/input_state.h" #include "input/keycodes.h" #include "math/curves.h"