Move IOFile to a separate file

Reduces the number of files that need to be recompiled
when making changes to FileUtil.h.
This commit is contained in:
JosJuice
2017-01-15 21:46:32 +01:00
parent 67dbbc67c0
commit f09ceaa735
93 changed files with 325 additions and 235 deletions

View File

@ -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"

View File

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

View File

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

View File

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

View File

@ -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"

View File

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

View File

@ -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"

View File

@ -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"

View File

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

View File

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

View File

@ -12,7 +12,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"

View File

@ -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"

View File

@ -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"

View File

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

View File

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

View File

@ -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>();

View File

@ -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"

View File

@ -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"

View File

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