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

Reorganize File namespace

Source/Core/AudioCommon/WaveFile.cpp

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

Source/Core/AudioCommon/WaveFile.h

@@ -16,8 +16,9 @@
 
 #include <array>
 #include <string>
+
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/NonCopyable.h"
 
 class WaveFileWriter : NonCopyable

Source/Core/Common/CMakeLists.txt

@@ -7,6 +7,7 @@ set(SRCS
   Config/Layer.cpp
   Config/Section.cpp
   ENetUtil.cpp
+  File.cpp
   FileSearch.cpp
   FileUtil.cpp
   GekkoDisassembler.cpp

Source/Core/Common/ChunkFile.h

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

Source/Core/Common/Common.vcxproj

@@ -63,6 +63,7 @@
     <ClInclude Include="ENetUtil.h" />
     <ClInclude Include="Event.h" />
     <ClInclude Include="FifoQueue.h" />
+    <ClInclude Include="File.h" />
     <ClInclude Include="FileSearch.h" />
     <ClInclude Include="FileUtil.h" />
     <ClInclude Include="FixedSizeQueue.h" />
@@ -166,6 +167,7 @@
     <ClCompile Include="Config\Layer.cpp" />
     <ClCompile Include="Config\Section.cpp" />
     <ClCompile Include="ENetUtil.cpp" />
+    <ClCompile Include="File.cpp" />
     <ClCompile Include="FileSearch.cpp" />
     <ClCompile Include="FileUtil.cpp" />
     <ClCompile Include="GekkoDisassembler.cpp" />

Source/Core/Common/Common.vcxproj.filters

@@ -252,6 +252,7 @@
     <ClInclude Include="GL\GLExtensions\EXT_texture_compression_s3tc.h">
       <Filter>GL\GLExtensions</Filter>
     </ClInclude>
+    <ClInclude Include="File.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CDUtils.cpp" />
@@ -319,6 +320,7 @@
     <ClCompile Include="ucrtFreadWorkaround.cpp" />
     <ClCompile Include="Analytics.cpp" />
     <ClCompile Include="MD5.cpp" />
+    <ClCompile Include="File.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

Source/Core/Common/File.cpp

@@ -0,0 +1,133 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <cstddef>
+#include <cstdio>
+#include <string>
+
+#ifdef _WIN32
+#include <io.h>
+
+#include "Common/CommonFuncs.h"
+#include "Common/StringUtil.h"
+#else
+#include <unistd.h>
+#endif
+
+#include "Common/CommonTypes.h"
+#include "Common/File.h"
+#include "Common/FileUtil.h"
+
+namespace File
+{
+IOFile::IOFile() : m_file(nullptr), m_good(true)
+{
+}
+
+IOFile::IOFile(std::FILE* file) : m_file(file), m_good(true)
+{
+}
+
+IOFile::IOFile(const std::string& filename, const char openmode[]) : m_file(nullptr), m_good(true)
+{
+  Open(filename, openmode);
+}
+
+IOFile::~IOFile()
+{
+  Close();
+}
+
+IOFile::IOFile(IOFile&& other) noexcept : m_file(nullptr), m_good(true)
+{
+  Swap(other);
+}
+
+IOFile& IOFile::operator=(IOFile&& other) noexcept
+{
+  Swap(other);
+  return *this;
+}
+
+void IOFile::Swap(IOFile& other) noexcept
+{
+  std::swap(m_file, other.m_file);
+  std::swap(m_good, other.m_good);
+}
+
+bool IOFile::Open(const std::string& filename, const char openmode[])
+{
+  Close();
+#ifdef _WIN32
+  _tfopen_s(&m_file, UTF8ToTStr(filename).c_str(), UTF8ToTStr(openmode).c_str());
+#else
+  m_file = fopen(filename.c_str(), openmode);
+#endif
+
+  m_good = IsOpen();
+  return m_good;
+}
+
+bool IOFile::Close()
+{
+  if (!IsOpen() || 0 != std::fclose(m_file))
+    m_good = false;
+
+  m_file = nullptr;
+  return m_good;
+}
+
+void IOFile::SetHandle(std::FILE* file)
+{
+  Close();
+  Clear();
+  m_file = file;
+}
+
+u64 IOFile::GetSize()
+{
+  if (IsOpen())
+    return File::GetSize(m_file);
+  else
+    return 0;
+}
+
+bool IOFile::Seek(s64 off, int origin)
+{
+  if (!IsOpen() || 0 != fseeko(m_file, off, origin))
+    m_good = false;
+
+  return m_good;
+}
+
+u64 IOFile::Tell() const
+{
+  if (IsOpen())
+    return ftello(m_file);
+  else
+    return UINT64_MAX;
+}
+
+bool IOFile::Flush()
+{
+  if (!IsOpen() || 0 != std::fflush(m_file))
+    m_good = false;
+
+  return m_good;
+}
+
+bool IOFile::Resize(u64 size)
+{
+#ifdef _WIN32
+  if (!IsOpen() || 0 != _chsize_s(_fileno(m_file), size))
+#else
+  // TODO: handle 64bit and growing
+  if (!IsOpen() || 0 != ftruncate(fileno(m_file), size))
+#endif
+    m_good = false;
+
+  return m_good;
+}
+
+}  // namespace File

Source/Core/Common/File.h

@@ -0,0 +1,93 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdio>
+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Common/NonCopyable.h"
+
+namespace File
+{
+// simple wrapper for cstdlib file functions to
+// hopefully will make error checking easier
+// and make forgetting an fclose() harder
+class IOFile : public NonCopyable
+{
+public:
+  IOFile();
+  IOFile(std::FILE* file);
+  IOFile(const std::string& filename, const char openmode[]);
+
+  ~IOFile();
+
+  IOFile(IOFile&& other) noexcept;
+  IOFile& operator=(IOFile&& other) noexcept;
+
+  void Swap(IOFile& other) noexcept;
+
+  bool Open(const std::string& filename, const char openmode[]);
+  bool Close();
+
+  template <typename T>
+  bool ReadArray(T* data, size_t length, size_t* pReadBytes = nullptr)
+  {
+    size_t read_bytes = 0;
+    if (!IsOpen() || length != (read_bytes = std::fread(data, sizeof(T), length, m_file)))
+      m_good = false;
+
+    if (pReadBytes)
+      *pReadBytes = read_bytes;
+
+    return m_good;
+  }
+
+  template <typename T>
+  bool WriteArray(const T* data, size_t length)
+  {
+    if (!IsOpen() || length != std::fwrite(data, sizeof(T), length, m_file))
+      m_good = false;
+
+    return m_good;
+  }
+
+  bool ReadBytes(void* data, size_t length)
+  {
+    return ReadArray(reinterpret_cast<char*>(data), length);
+  }
+
+  bool WriteBytes(const void* data, size_t length)
+  {
+    return WriteArray(reinterpret_cast<const char*>(data), length);
+  }
+
+  bool IsOpen() const { return nullptr != m_file; }
+  // m_good is set to false when a read, write or other function fails
+  bool IsGood() const { return m_good; }
+  explicit operator bool() const { return IsGood() && IsOpen(); }
+  std::FILE* GetHandle() { return m_file; }
+  void SetHandle(std::FILE* file);
+
+  bool Seek(s64 off, int origin);
+  u64 Tell() const;
+  u64 GetSize();
+  bool Resize(u64 size);
+  bool Flush();
+
+  // clear error state
+  void Clear()
+  {
+    m_good = true;
+    std::clearerr(m_file);
+  }
+
+private:
+  std::FILE* m_file;
+  bool m_good;
+};
+
+}  // namespace File

Source/Core/Common/FileUtil.cpp

@@ -16,6 +16,7 @@
 #include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 
@@ -901,118 +902,4 @@ bool ReadFileToString(const std::string& filename, std::string& str)
   return retval;
 }
 
-IOFile::IOFile() : m_file(nullptr), m_good(true)
-{
-}
-
-IOFile::IOFile(std::FILE* file) : m_file(file), m_good(true)
-{
-}
-
-IOFile::IOFile(const std::string& filename, const char openmode[]) : m_file(nullptr), m_good(true)
-{
-  Open(filename, openmode);
-}
-
-IOFile::~IOFile()
-{
-  Close();
-}
-
-IOFile::IOFile(IOFile&& other) noexcept : m_file(nullptr), m_good(true)
-{
-  Swap(other);
-}
-
-IOFile& IOFile::operator=(IOFile&& other) noexcept
-{
-  Swap(other);
-  return *this;
-}
-
-void IOFile::Swap(IOFile& other) noexcept
-{
-  std::swap(m_file, other.m_file);
-  std::swap(m_good, other.m_good);
-}
-
-bool IOFile::Open(const std::string& filename, const char openmode[])
-{
-  Close();
-#ifdef _WIN32
-  _tfopen_s(&m_file, UTF8ToTStr(filename).c_str(), UTF8ToTStr(openmode).c_str());
-#else
-  m_file = fopen(filename.c_str(), openmode);
-#endif
-
-  m_good = IsOpen();
-  return m_good;
-}
-
-bool IOFile::Close()
-{
-  if (!IsOpen() || 0 != std::fclose(m_file))
-    m_good = false;
-
-  m_file = nullptr;
-  return m_good;
-}
-
-void IOFile::SetHandle(std::FILE* file)
-{
-  Close();
-  Clear();
-  m_file = file;
-}
-
-u64 IOFile::GetSize()
-{
-  if (IsOpen())
-    return File::GetSize(m_file);
-  else
-    return 0;
-}
-
-bool IOFile::Seek(s64 off, int origin)
-{
-  if (!IsOpen() || 0 != fseeko(m_file, off, origin))
-    m_good = false;
-
-  return m_good;
-}
-
-u64 IOFile::Tell() const
-{
-  if (IsOpen())
-    return ftello(m_file);
-  else
-    return UINT64_MAX;
-}
-
-bool IOFile::Flush()
-{
-  if (!IsOpen() || 0 != std::fflush(m_file))
-    m_good = false;
-
-  return m_good;
-}
-
-bool IOFile::Resize(u64 size)
-{
-  if (!IsOpen() ||
-      0 !=
-#ifdef _WIN32
-          // ector: _chsize sucks, not 64-bit safe
-          // F|RES: changed to _chsize_s. i think it is 64-bit safe
-          _chsize_s(_fileno(m_file), size)
-#else
-          // TODO: handle 64bit and growing
-          ftruncate(fileno(m_file), size)
-#endif
-          )
-    m_good = false;
-
-  return m_good;
-}
-
 }  // namespace

Source/Core/Common/FileUtil.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <cstddef>
-#include <cstdio>
 #include <fstream>
 #include <string>
 #include <vector>
@@ -163,85 +162,6 @@ std::string& GetExeDirectory();
 bool WriteStringToFile(const std::string& str, const std::string& filename);
 bool ReadFileToString(const std::string& filename, std::string& str);
 
-// simple wrapper for cstdlib file functions to
-// hopefully will make error checking easier
-// and make forgetting an fclose() harder
-class IOFile : public NonCopyable
-{
-public:
-  IOFile();
-  IOFile(std::FILE* file);
-  IOFile(const std::string& filename, const char openmode[]);
-
-  ~IOFile();
-
-  IOFile(IOFile&& other) noexcept;
-  IOFile& operator=(IOFile&& other) noexcept;
-
-  void Swap(IOFile& other) noexcept;
-
-  bool Open(const std::string& filename, const char openmode[]);
-  bool Close();
-
-  template <typename T>
-  bool ReadArray(T* data, size_t length, size_t* pReadBytes = nullptr)
-  {
-    size_t read_bytes = 0;
-    if (!IsOpen() || length != (read_bytes = std::fread(data, sizeof(T), length, m_file)))
-      m_good = false;
-
-    if (pReadBytes)
-      *pReadBytes = read_bytes;
-
-    return m_good;
-  }
-
-  template <typename T>
-  bool WriteArray(const T* data, size_t length)
-  {
-    if (!IsOpen() || length != std::fwrite(data, sizeof(T), length, m_file))
-      m_good = false;
-
-    return m_good;
-  }
-
-  bool ReadBytes(void* data, size_t length)
-  {
-    return ReadArray(reinterpret_cast<char*>(data), length);
-  }
-
-  bool WriteBytes(const void* data, size_t length)
-  {
-    return WriteArray(reinterpret_cast<const char*>(data), length);
-  }
-
-  bool IsOpen() const { return nullptr != m_file; }
-  // m_good is set to false when a read, write or other function fails
-  bool IsGood() const { return m_good; }
-  explicit operator bool() const { return IsGood() && IsOpen(); }
-  std::FILE* GetHandle() { return m_file; }
-  void SetHandle(std::FILE* file);
-
-  bool Seek(s64 off, int origin);
-  u64 Tell() const;
-  u64 GetSize();
-  bool Resize(u64 size);
-  bool Flush();
-
-  // clear error state
-  void Clear()
-  {
-    m_good = true;
-    std::clearerr(m_file);
-  }
-
-private:
-  std::FILE* m_file;
-  bool m_good;
-};
-
-}  // namespace
-
 // To deal with Windows being dumb at unicode:
 template <typename T>
 void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmode openmode)
@@ -252,3 +172,5 @@ void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmod
   fstream.open(filename.c_str(), openmode);
 #endif
 }
+
+}  // namespace

Source/Core/Common/IniFile.cpp

@@ -401,7 +401,7 @@ bool IniFile::Load(const std::string& filename, bool keep_current_data)
 
   // Open file
   std::ifstream in;
-  OpenFStream(in, filename, std::ios::in);
+  File::OpenFStream(in, filename, std::ios::in);
 
   if (in.fail())
     return false;
@@ -474,7 +474,7 @@ bool IniFile::Save(const std::string& filename)
 {
   std::ofstream out;
   std::string temp = File::GetTempFilenameForAtomicWrite(filename);
-  OpenFStream(out, temp, std::ios::out);
+  File::OpenFStream(out, temp, std::ios::out);
 
   if (out.fail())
   {

Source/Core/Common/JitRegister.cpp

@@ -10,7 +10,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/JitRegister.h"
 #include "Common/StringUtil.h"
 

Source/Core/Common/LinearDiskCache.h

@@ -70,7 +70,7 @@ public:
     m_num_entries = 0;
 
     // try opening for reading/writing
-    OpenFStream(m_file, filename, ios_base::in | ios_base::out | ios_base::binary);
+    File::OpenFStream(m_file, filename, ios_base::in | ios_base::out | ios_base::binary);
 
     m_file.seekg(0, std::ios::end);
     std::fstream::pos_type end_pos = m_file.tellg();

Source/Core/Common/Logging/LogManager.cpp

@@ -170,7 +170,7 @@ LogContainer::LogContainer(const std::string& shortName, const std::string& full
 
 FileLogListener::FileLogListener(const std::string& filename)
 {
-  OpenFStream(m_logfile, filename, std::ios::app);
+  File::OpenFStream(m_logfile, filename, std::ios::app);
   SetEnable(true);
 }
 

Source/Core/Common/NandPaths.cpp

@@ -9,6 +9,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/Common/PcapFile.cpp

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

Source/Core/Common/PcapFile.h

@@ -17,7 +17,7 @@
 #include <memory>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/NonCopyable.h"
 
 class PCAP final : public NonCopyable

Source/Core/Common/SDCardUtil.cpp

@@ -41,7 +41,7 @@
 
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/Logging/Log.h"
 #include "Common/SDCardUtil.h"
 

Source/Core/Common/SettingsHandler.cpp

@@ -17,6 +17,7 @@
 #endif
 
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/SettingsHandler.h"
 #include "Common/Timer.h"

Source/Core/Common/SysConf.cpp

@@ -13,6 +13,7 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Swap.h"
 #include "Core/Movie.h"

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",
+      File::OpenFStream(file, File::GetUserPath(D_SESSION_WIIROOT_IDX) + "/mii.bin",
-                  std::ios::binary | std::ios::out);
+                        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"

Source/Core/DiscIO/Blob.cpp

@@ -11,7 +11,7 @@
 
 #include "Common/CDUtils.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 
 #include "DiscIO/Blob.h"
 #include "DiscIO/CISOBlob.h"

Source/Core/DiscIO/Blob.h

@@ -18,6 +18,7 @@
 #include <memory>
 #include <optional>
 #include <string>
+#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "Common/Swap.h"

Source/Core/DiscIO/CISOBlob.cpp

@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "DiscIO/CISOBlob.h"
 
 namespace DiscIO

Source/Core/DiscIO/CISOBlob.h

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "DiscIO/Blob.h"
 
 namespace DiscIO

Source/Core/DiscIO/CompressedBlob.cpp

@@ -18,6 +18,7 @@
 #include <zlib.h>
 
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Hash.h"
 #include "Common/Logging/Log.h"

Source/Core/DiscIO/CompressedBlob.h

@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "DiscIO/Blob.h"
 
 namespace DiscIO

Source/Core/DiscIO/DiscScrubber.cpp

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

Source/Core/DiscIO/DriveBlob.cpp

@@ -10,7 +10,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 "DiscIO/Blob.h"

Source/Core/DiscIO/DriveBlob.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "DiscIO/Blob.h"
 
 #ifdef _WIN32

Source/Core/DiscIO/FileBlob.h

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "DiscIO/Blob.h"
 
 namespace DiscIO

Source/Core/DiscIO/FileSystemGCWii.cpp

@@ -14,7 +14,7 @@
 
 #include "Common/CommonFuncs.h"
 #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/DiscIO/NANDContentLoader.cpp

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

Source/Core/DiscIO/NANDImporter.cpp

@@ -9,6 +9,7 @@
 #include <cstring>
 
 #include "Common/Crypto/AES.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"

Source/Core/DiscIO/TGCBlob.cpp

@@ -8,7 +8,7 @@
 #include <string>
 #include <utility>
 
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/Swap.h"
 
 namespace

Source/Core/DiscIO/TGCBlob.h

@@ -9,7 +9,7 @@
 #include <utility>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "DiscIO/Blob.h"
 
 namespace DiscIO

Source/Core/DiscIO/Volume.cpp

@@ -14,6 +14,7 @@
 
 #include "Common/ColorUtil.h"
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/NandPaths.h"
 #include "Common/StringUtil.h"
@@ -43,13 +44,11 @@ std::vector<u32> Volume::GetWiiBanner(int* width, int* height, u64 title_id)
 
   const std::string file_name =
       Common::GetTitleDataPath(title_id, Common::FROM_CONFIGURED_ROOT) + "banner.bin";
-  if (!File::Exists(file_name))
-    return std::vector<u32>();
-
-  if (File::GetSize(file_name) < WII_BANNER_OFFSET + WII_BANNER_SIZE)
-    return std::vector<u32>();
 
   File::IOFile file(file_name, "rb");
+  if (file.GetSize() < WII_BANNER_OFFSET + WII_BANNER_SIZE)
+    return std::vector<u32>();
+
   if (!file.Seek(WII_BANNER_OFFSET, SEEK_SET))
     return std::vector<u32>();
 

Source/Core/DiscIO/VolumeDirectory.cpp

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

Source/Core/DiscIO/WbfsBlob.cpp

@@ -15,7 +15,7 @@
 #include "Common/Align.h"
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "Common/MsgHandler.h"
 #include "Common/Swap.h"
 

Source/Core/DiscIO/WbfsBlob.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
+#include "Common/File.h"
 #include "DiscIO/Blob.h"
 
 namespace DiscIO

Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp

@@ -321,7 +321,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
     if (!path.IsEmpty())
     {
       std::ifstream f;
-      OpenFStream(f, WxStrToStr(path), std::ios_base::in);
+      File::OpenFStream(f, WxStrToStr(path), std::ios_base::in);
 
       std::string line;
       while (std::getline(f, line))

Source/Core/DolphinWX/Debugger/MemoryWindow.cpp

@@ -22,6 +22,7 @@
 #include <wx/utils.h>
 
 #include "Common/CommonTypes.h"
+#include "Common/File.h"
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 #include "Common/StringUtil.h"

Source/Core/DolphinWX/NetPlay/NetPlayLauncher.cpp

@@ -5,7 +5,6 @@
 #include <wx/gdicmn.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 #include "Common/StringUtil.h"
 #include "DolphinWX/NetPlay/NetPlayLauncher.h"

Source/Core/VideoBackends/D3D/D3DShader.cpp

@@ -54,7 +54,7 @@ bool CompileVertexShader(const std::string& code, D3DBlob** blob)
     std::string filename = StringFromFormat("%sbad_vs_%04i.txt",
                                             File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
     std::ofstream file;
-    OpenFStream(file, filename, std::ios_base::out);
+    File::OpenFStream(file, filename, std::ios_base::out);
     file << code;
     file.close();
 
@@ -112,7 +112,7 @@ bool CompileGeometryShader(const std::string& code, D3DBlob** blob,
     std::string filename = StringFromFormat("%sbad_gs_%04i.txt",
                                             File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
     std::ofstream file;
-    OpenFStream(file, filename, std::ios_base::out);
+    File::OpenFStream(file, filename, std::ios_base::out);
     file << code;
     file.close();
 
@@ -169,7 +169,7 @@ bool CompilePixelShader(const std::string& code, D3DBlob** blob, const D3D_SHADE
     std::string filename = StringFromFormat("%sbad_ps_%04i.txt",
                                             File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
     std::ofstream file;
-    OpenFStream(file, filename, std::ios_base::out);
+    File::OpenFStream(file, filename, std::ios_base::out);
     file << code;
     file.close();
 

Source/Core/VideoBackends/D3D/Render.cpp

@@ -15,7 +15,6 @@
 #include <unordered_map>
 
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MathUtil.h"
 

Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp

@@ -9,6 +9,7 @@
 
 #include "Common/Align.h"
 #include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
@@ -309,7 +310,7 @@ bool ProgramShaderCache::CompileShader(SHADER& shader, const std::string& vcode,
     std::string filename =
         StringFromFormat("%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
     std::ofstream file;
-    OpenFStream(file, filename, std::ios_base::out);
+    File::OpenFStream(file, filename, std::ios_base::out);
     file << s_glsl_header << vcode << s_glsl_header << pcode;
     if (!gcode.empty())
       file << s_glsl_header << gcode;
@@ -380,7 +381,7 @@ bool ProgramShaderCache::CompileComputeShader(SHADER& shader, const std::string&
     std::string filename =
         StringFromFormat("%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
     std::ofstream file;
-    OpenFStream(file, filename, std::ios_base::out);
+    File::OpenFStream(file, filename, std::ios_base::out);
     file << s_glsl_header << code;
     file << info_log;
     file.close();
@@ -447,7 +448,7 @@ GLuint ProgramShaderCache::CompileSingleShader(GLuint type, const std::string& c
     std::string filename = StringFromFormat(
         "%sbad_%s_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), prefix, num_failures++);
     std::ofstream file;
-    OpenFStream(file, filename, std::ios_base::out);
+    File::OpenFStream(file, filename, std::ios_base::out);
     file << s_glsl_header << code << info_log;
     file.close();
 

Source/Core/VideoBackends/OGL/Render.cpp

@@ -15,7 +15,6 @@
 
 #include "Common/Atomic.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
 #include "Common/GL/GLInterfaceBase.h"
 #include "Common/GL/GLUtil.h"
 #include "Common/Logging/LogManager.h"

Source/Core/VideoBackends/OGL/VertexManager.cpp

@@ -179,13 +179,13 @@ void VertexManager::vFlush()
     std::string filename = StringFromFormat(
         "%sps%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
     std::ofstream fps;
-    OpenFStream(fps, filename, std::ios_base::out);
+    File::OpenFStream(fps, filename, std::ios_base::out);
     fps << prog.shader.strpprog;
 
     filename = StringFromFormat("%svs%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
                                 g_ActiveConfig.iSaveTargetId);
     std::ofstream fvs;
-    OpenFStream(fvs, filename, std::ios_base::out);
+    File::OpenFStream(fvs, filename, std::ios_base::out);
     fvs << prog.shader.strvprog;
   }
 #endif