rename Common/File to Common/IOFile

Source/Core/AudioCommon/WaveFile.cpp

@@ -7,8 +7,8 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
 #include "Common/FileUtil.h"
+#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"

Source/Core/AudioCommon/WaveFile.h

@@ -18,7 +18,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 
 class WaveFileWriter
 {

Source/Core/Common/CMakeLists.txt

@@ -43,8 +43,6 @@ add_library(common
   ENetUtil.cpp
   ENetUtil.h
   Event.h
-  File.cpp
-  File.h
   FileSearch.cpp
   FileSearch.h
   FileUtil.cpp
@@ -66,6 +64,8 @@ add_library(common
   IniFile.cpp
   IniFile.h
   Inline.h
+  IOFile.cpp
+  IOFile.h
   JitRegister.cpp
   JitRegister.h
   Lazy.h
@@ -106,10 +106,10 @@ add_library(common
   SDCardUtil.cpp
   SDCardUtil.h
   Semaphore.h
-  SFMLHelper.cpp
-  SFMLHelper.h
   SettingsHandler.cpp
   SettingsHandler.h
+  SFMLHelper.cpp
+  SFMLHelper.h
   SPSCQueue.h
   StringUtil.cpp
   StringUtil.h

Source/Core/Common/Common.vcxproj

@@ -53,7 +53,6 @@
     <ClInclude Include="DynamicLibrary.h" />
     <ClInclude Include="ENetUtil.h" />
     <ClInclude Include="Event.h" />
-    <ClInclude Include="File.h" />
     <ClInclude Include="FileSearch.h" />
     <ClInclude Include="FileUtil.h" />
     <ClInclude Include="FixedSizeQueue.h" />
@@ -124,6 +123,7 @@
     <ClInclude Include="HttpRequest.h" />
     <ClInclude Include="Image.h" />
     <ClInclude Include="IniFile.h" />
+    <ClInclude Include="IOFile.h" />
     <ClInclude Include="JitRegister.h" />
     <ClInclude Include="Lazy.h" />
     <ClInclude Include="LdrWatcher.h" />
@@ -194,7 +194,6 @@
     <ClCompile Include="Debug\Watches.cpp" />
     <ClCompile Include="DynamicLibrary.cpp" />
     <ClCompile Include="ENetUtil.cpp" />
-    <ClCompile Include="File.cpp" />
     <ClCompile Include="FileSearch.cpp" />
     <ClCompile Include="FileUtil.cpp" />
     <ClCompile Include="FloatUtils.cpp" />
@@ -216,6 +215,7 @@
     <ClCompile Include="HttpRequest.cpp" />
     <ClCompile Include="Image.cpp" />
     <ClCompile Include="IniFile.cpp" />
+    <ClCompile Include="IOFile.cpp" />
     <ClCompile Include="JitRegister.cpp" />
     <ClCompile Include="LdrWatcher.cpp" />
     <ClCompile Include="Logging\ConsoleListenerWin.cpp" />

Source/Core/Common/Common.vcxproj.filters

@@ -261,7 +261,7 @@
     <ClInclude Include="GL\GLExtensions\EXT_texture_compression_s3tc.h">
       <Filter>GL\GLExtensions</Filter>
     </ClInclude>
-    <ClInclude Include="File.h" />
+    <ClInclude Include="IOFile.h" />
     <ClInclude Include="Lazy.h" />
     <ClInclude Include="LdrWatcher.h" />
     <ClInclude Include="GL\GLExtensions\ARB_texture_compression_bptc.h">

Source/Core/Common/FileUtil.cpp

@@ -20,8 +20,8 @@
 #include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
 #include "Common/FileUtil.h"
+#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 
 #ifdef _WIN32

Source/Core/Common/IOFile.cpp

@@ -22,8 +22,8 @@
 #endif
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
 #include "Common/FileUtil.h"
+#include "Common/IOFile.h"
 
 namespace File
 {

Source/Core/Common/Image.cpp

@@ -10,7 +10,7 @@
 #include <png.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 
 namespace Common
 {

Source/Core/Common/JitRegister.cpp

@@ -13,7 +13,7 @@
 #include <fmt/format.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 #include "Common/StringUtil.h"
 
 #ifdef _WIN32

Source/Core/Common/LinearDiskCache.h

@@ -11,7 +11,7 @@
 #include <type_traits>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 #include "Common/Version.h"
 
 // On disk format:

Source/Core/Common/PcapFile.cpp

@@ -5,7 +5,7 @@
 #include <chrono>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 #include "Common/PcapFile.h"
 
 namespace Common

Source/Core/Common/PcapFile.h

@@ -17,7 +17,7 @@
 #include <memory>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 
 namespace Common
 {

Source/Core/Common/SDCardUtil.cpp

@@ -43,7 +43,7 @@
 
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 
 #ifndef _WIN32

Source/Core/Core/Boot/Boot.cpp

@@ -28,8 +28,8 @@ namespace fs = std::filesystem;
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
-#include "Common/File.h"
 #include "Common/FileUtil.h"
+#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"

Source/Core/Core/Boot/DolReader.cpp

@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "Common/File.h"
+#include "Common/IOFile.h"
 #include "Common/Swap.h"
 #include "Core/HW/Memmap.h"
 

Source/Core/Core/Boot/ElfReader.cpp

@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/Swap.h"

Source/Core/Core/DSP/DSPCaptureLogger.cpp

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 #include "Common/PcapFile.h"
 
 namespace DSP

Source/Core/Core/DSP/DSPCodeUtil.cpp

@@ -12,8 +12,8 @@
 #include <fmt/format.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
 #include "Common/FileUtil.h"
+#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"

Source/Core/Core/Debugger/Dump.cpp

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/File.h"
+#include "Common/IOFile.h"
 
 CDump::CDump(const std::string& filename) : m_pData(nullptr)
 {