Merge pull request #5611 from JosJuice/reorganize-file-namespace

Reorganize File namespace

Source/Core/Core/Boot/Boot.cpp

@@ -17,6 +17,7 @@
 #include "Common/CDUtils.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"

Source/Core/Core/Boot/Boot_BS2Emu.cpp

@@ -9,6 +9,7 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"

Source/Core/Core/Boot/Boot_WiiWAD.cpp

@@ -10,6 +10,7 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/MsgHandler.h"
 #include "Common/NandPaths.h"

Source/Core/Core/Boot/DolReader.cpp

@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Swap.h"
 #include "Core/HW/Memmap.h"

Source/Core/Core/Core.cpp

@@ -21,6 +21,7 @@
 #include "Common/CPUDetect.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
 #include "Common/Flag.h"
 #include "Common/Logging/LogManager.h"
 #include "Common/MemoryUtil.h"

Source/Core/Core/DSP/DSPCaptureLogger.cpp

@@ -7,7 +7,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/PcapFile.h"
 
 #include "Core/DSP/DSPCaptureLogger.h"

Source/Core/Core/DSP/DSPCodeUtil.cpp

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"

Source/Core/Core/DSP/DSPDisassembler.cpp

@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 

Source/Core/Core/Debugger/Dump.cpp

@@ -6,7 +6,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 
 #include "Core/Debugger/Dump.h"
 

Source/Core/Core/FifoPlayer/FifoDataFile.cpp

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 
 #include "Core/FifoPlayer/FifoDataFile.h"
 

Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp

@@ -6,6 +6,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MathUtil.h"

Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp

@@ -12,6 +12,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Hash.h"
 #include "Common/Logging/Log.h"

Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp

@@ -14,6 +14,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Hash.h"
 #include "Common/Logging/Log.h"

Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp

@@ -5,7 +5,7 @@
 #include <cinttypes>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 
 #include "Core/DSP/DSPCore.h"
 #include "Core/HW/DSPLLE/DSPLLEGlobals.h"

Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/StringUtil.h"
 
 #include "Core/DSP/DSPCore.h"

Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp

@@ -11,7 +11,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
 #include "Core/ConfigManager.h"

Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp

@@ -11,6 +11,7 @@
 #include "Common/ChunkFile.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MemoryUtil.h"

Source/Core/Core/HW/GCMemcard/GCMemcard.cpp

@@ -13,7 +13,7 @@
 #include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"

Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp

@@ -16,6 +16,7 @@
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"

Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp

@@ -13,6 +13,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"

Source/Core/Core/HW/Sram.cpp

@@ -5,7 +5,7 @@
 #include "Core/HW/Sram.h"
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/Logging/Log.h"
 #include "Common/Swap.h"
 #include "Core/ConfigManager.h"

Source/Core/Core/HW/WiiSaveCrypted.cpp

@@ -23,6 +23,7 @@
 #include "Common/Align.h"
 #include "Common/CommonTypes.h"
 #include "Common/Crypto/ec.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp

@@ -268,8 +268,8 @@ void Wiimote::WriteData(const wm_write_data* const wd)
     {
       // TODO Only write parts of the Mii block
       std::ofstream file;
-      OpenFStream(file, File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/mii.bin",
-                  std::ios::binary | std::ios::out);
+      File::OpenFStream(file, File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/mii.bin",
+                        std::ios::binary | std::ios::out);
       file.write((char*)m_eeprom + 0x0FCA, 0x02f0);
       file.close();
     }

Source/Core/Core/HW/WiimoteEmu/Speaker.cpp

@@ -144,7 +144,7 @@ void Wiimote::SpeakerData(const wm_speaker_data* sd)
     File::Delete("rmtdump.wav");
     File::Delete("rmtdump.bin");
     atexit(stopdamnwav);
-    OpenFStream(ofile, "rmtdump.bin", ofile.binary | ofile.out);
+    File::OpenFStream(ofile, "rmtdump.bin", ofile.binary | ofile.out);
     wav.Start("rmtdump.wav", 6000);
   }
   wav.AddMonoSamples(samples.get(), sd->length * 2);

Source/Core/Core/IOS/ES/ES.cpp

@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "Common/ChunkFile.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"

Source/Core/Core/IOS/ES/Formats.cpp

@@ -19,6 +19,7 @@
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"

Source/Core/Core/IOS/ES/NandUtils.cpp

@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/NandPaths.h"

Source/Core/Core/IOS/ES/TitleManagement.cpp

@@ -14,6 +14,7 @@
 
 #include "Common/Align.h"
 #include "Common/Crypto/AES.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/NandPaths.h"
@@ -36,6 +37,7 @@ static ReturnCode WriteTicket(const IOS::ES::TicketReader& ticket)
   const std::string ticket_path = Common::GetTicketFileName(title_id, Common::FROM_SESSION_ROOT);
   File::CreateFullPath(ticket_path);
 
+
   File::IOFile ticket_file(ticket_path, "wb");
   if (!ticket_file)
     return ES_EIO;

Source/Core/Core/IOS/FS/FS.cpp

@@ -12,6 +12,7 @@
 #include "Common/ChunkFile.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"

Source/Core/Core/IOS/FS/FileIO.cpp

@@ -11,6 +11,7 @@
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/NandPaths.h"
 #include "Core/HW/Memmap.h"

Source/Core/Core/IOS/Network/KD/NWC24Config.cpp

@@ -8,6 +8,7 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/Swap.h"

Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp

@@ -8,6 +8,7 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Core/HW/Memmap.h"

Source/Core/Core/IOS/Network/SSL.cpp

@@ -10,6 +10,7 @@
 #include <mbedtls/md.h>
 #include <mbedtls/sha256.h>
 
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"

Source/Core/Core/IOS/Network/Socket.cpp

@@ -12,6 +12,7 @@
 #include <sys/select.h>
 #endif
 
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"

Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp

@@ -9,6 +9,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/SDCardUtil.h"

Source/Core/Core/IOS/SDIO/SDIOSlot0.h

@@ -10,7 +10,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Core/IOS/Device.h"
 #include "Core/IOS/IOS.h"
 

Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp

@@ -10,6 +10,7 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/SysConf.h"

Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp

@@ -10,7 +10,6 @@
 
 #include "Common/Assert.h"
 #include "Common/CommonPaths.h"
-#include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/NandPaths.h"

Source/Core/Core/IOS/WFS/WFSI.cpp

@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Core/HW/Memmap.h"

Source/Core/Core/IOS/WFS/WFSSRV.cpp

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/NandPaths.h"

Source/Core/Core/IOS/WFS/WFSSRV.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Core/IOS/Device.h"
 #include "Core/IOS/IOS.h"
 #include "DiscIO/Volume.h"

Source/Core/Core/Movie.cpp

@@ -21,11 +21,13 @@
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonPaths.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Hash.h"
 #include "Common/NandPaths.h"
 #include "Common/StringUtil.h"
 #include "Common/Timer.h"
+
 #include "Core/Boot/Boot.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
@@ -45,8 +47,11 @@
 #include "Core/NetPlayProto.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/State.h"
+
 #include "DiscIO/Enums.h"
+
 #include "InputCommon/GCPadStatus.h"
+
 #include "VideoCommon/Fifo.h"
 #include "VideoCommon/VideoBackendBase.h"
 #include "VideoCommon/VideoConfig.h"

Source/Core/Core/PatchEngine.cpp

@@ -13,7 +13,6 @@
 #include <vector>
 
 #include "Common/Assert.h"
-#include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 #include "Common/StringUtil.h"
 

Source/Core/Core/PowerPC/Jit64/Jit.cpp

@@ -13,7 +13,7 @@
 #endif
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/Logging/Log.h"
 #include "Common/MemoryUtil.h"
 #include "Common/StringUtil.h"

Source/Core/Core/PowerPC/JitInterface.cpp

@@ -18,7 +18,7 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/MsgHandler.h"
 
 #include "Core/Core.h"

Source/Core/Core/PowerPC/PPCSymbolDB.cpp

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

Source/Core/Core/PowerPC/PPCTables.cpp

@@ -13,6 +13,7 @@
 
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"

Source/Core/Core/PowerPC/SignatureDB/CSVSignatureDB.cpp

@@ -6,6 +6,7 @@
 #include <fstream>
 #include <sstream>
 
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 
@@ -17,7 +18,7 @@ bool CSVSignatureDB::Load(const std::string& file_path)
 {
   std::string line;
   std::ifstream ifs;
-  OpenFStream(ifs, file_path, std::ios_base::in);
+  File::OpenFStream(ifs, file_path, std::ios_base::in);
 
   if (!ifs)
     return false;

Source/Core/Core/PowerPC/SignatureDB/DSYSignatureDB.cpp

@@ -7,7 +7,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/Logging/Log.h"
 
 #include "Core/PowerPC/SignatureDB/DSYSignatureDB.h"

Source/Core/Core/PowerPC/SignatureDB/MEGASignatureDB.cpp

@@ -128,7 +128,7 @@ void MEGASignatureDB::Clear()
 bool MEGASignatureDB::Load(const std::string& file_path)
 {
   std::ifstream ifs;
-  OpenFStream(ifs, file_path, std::ios_base::in);
+  File::OpenFStream(ifs, file_path, std::ios_base::in);
 
   if (!ifs)
     return false;

Source/Core/Core/State.cpp

@@ -13,6 +13,7 @@
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Event.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/MsgHandler.h"
 #include "Common/ScopeGuard.h"

Source/Core/Core/TitleDatabase.cpp

@@ -53,7 +53,7 @@ static bool LoadMap(const std::string& file_path, Map& map,
                     std::function<bool(const std::string& game_id)> predicate)
 {
   std::ifstream txt;
-  OpenFStream(txt, file_path, std::ios::in);
+  File::OpenFStream(txt, file_path, std::ios::in);
 
   if (!txt.is_open())
     return false;

Source/Core/Core/ec_wii.cpp

@@ -18,6 +18,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Crypto/ec.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/Swap.h"