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

Reorganize File namespace

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"