piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up includes in DiscIO as much as possible.

Browse Source 
Also turned a long iterator declaration in VolumeDirectory.cpp to using auto in order to shorten it.
This commit is contained in:
Lioncash
2013-10-18 03:32:56 -04:00
parent 82fd579506
commit 207547b425
12 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DiscIO/Src/Blob.cpp
View File

@ -2,14 +2,13 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common.h"
#include "FileUtil.h"
#include "CDUtils.h"
#include "Blob.h" #include "Blob.h"
#include "CompressedBlob.h" #include "CDUtils.h"
#include "FileBlob.h"
#include "CISOBlob.h" #include "CISOBlob.h"
#include "CompressedBlob.h"
#include "DriveBlob.h" #include "DriveBlob.h"
#include "FileBlob.h"
#include "FileUtil.h"
#include "WbfsBlob.h" #include "WbfsBlob.h"
namespace DiscIO namespace DiscIO

2
Source/Core/DiscIO/Src/Blob.h
View File

@ -15,7 +15,7 @@
// detect whether the file is a compressed blob, or just a big hunk of data, or a drive, and // detect whether the file is a compressed blob, or just a big hunk of data, or a drive, and
// automatically do the right thing. // automatically do the right thing.
#include "Common.h" #include "CommonTypes.h"
namespace DiscIO namespace DiscIO
{ {

1
Source/Core/DiscIO/Src/CompressedBlob.cpp
View File

@ -9,7 +9,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "Common.h"
#include "CompressedBlob.h" #include "CompressedBlob.h"
#include "DiscScrubber.h" #include "DiscScrubber.h"
#include "FileUtil.h" #include "FileUtil.h"

2
Source/Core/DiscIO/Src/DiscScrubber.h
View File

@ -14,7 +14,7 @@
#ifndef DISC_SCRUBBER_H #ifndef DISC_SCRUBBER_H
#define DISC_SCRUBBER_H #define DISC_SCRUBBER_H
#include "Common.h" #include "CommonTypes.h"
#include "Blob.h" #include "Blob.h"

2
Source/Core/DiscIO/Src/FileHandlerARC.cpp
View File

@ -2,8 +2,6 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common.h"
#include "FileHandlerARC.h" #include "FileHandlerARC.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "Blob.h" #include "Blob.h"

2
Source/Core/DiscIO/Src/FileHandlerARC.h
View File

@ -8,7 +8,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "Common.h" #include "CommonTypes.h"
#include "Filesystem.h" #include "Filesystem.h"
namespace DiscIO namespace DiscIO

8
Source/Core/DiscIO/Src/VolumeDirectory.cpp
View File

@ -2,11 +2,10 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common.h"
#include "MathUtil.h"
#include "CommonPaths.h" #include "CommonPaths.h"
#include "VolumeDirectory.h"
#include "FileBlob.h" #include "FileBlob.h"
#include "MathUtil.h"
#include "VolumeDirectory.h"
namespace DiscIO namespace DiscIO
{ {
@ -484,8 +483,7 @@ static u32 ComputeNameSize(const File::FSTEntry& parentEntry)
{ {
u32 nameSize = 0; u32 nameSize = 0;
const std::vector<File::FSTEntry>& children = parentEntry.children; const std::vector<File::FSTEntry>& children = parentEntry.children;
for (std::vector<File::FSTEntry>::const_iterator it = children.begin(); for (auto it = children.cbegin(); it != children.cend(); ++it)
it != children.end(); ++it)
{ {
const File::FSTEntry& entry = *it; const File::FSTEntry& entry = *it;
if (entry.isDirectory) if (entry.isDirectory)

8
Source/Core/DiscIO/Src/VolumeDirectory.h
View File

@ -5,11 +5,11 @@
#ifndef _VOLUME_DIRECTORY #ifndef _VOLUME_DIRECTORY
#define _VOLUME_DIRECTORY #define _VOLUME_DIRECTORY
#include "Volume.h"
#include "Common.h"
#include "FileUtil.h"
#include <string>
#include <map> #include <map>
#include <string>
#include "FileUtil.h"
#include "Volume.h"
// //
// --- this volume type is used for reading files directly from the hard drive --- // --- this volume type is used for reading files directly from the hard drive ---

2
Source/Core/DiscIO/Src/VolumeGC.cpp
View File

@ -2,8 +2,6 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "stdafx.h"
#include "VolumeGC.h" #include "VolumeGC.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "FileMonitor.h" #include "FileMonitor.h"

2
Source/Core/DiscIO/Src/WiiWad.h
View File

@ -9,7 +9,7 @@
#include <vector> #include <vector>
#include <map> #include <map>
#include "Common.h" #include "CommonTypes.h"
#include "Blob.h" #include "Blob.h"
#include "Volume.h" #include "Volume.h"