From f72a559958027ac046dbb00f785bbcc33ab2d226 Mon Sep 17 00:00:00 2001
From: Stevoisiak <Stevoisiak@gmail.com>
Date: Tue, 24 Feb 2015 00:03:59 -0500
Subject: [PATCH] Rearranged Volume header files

---
 Source/Core/DiscIO/Volume.h           |  2 +-
 Source/Core/DiscIO/VolumeGC.h         |  4 +++-
 Source/Core/DiscIO/VolumeWad.h        |  4 +++-
 Source/Core/DiscIO/VolumeWiiCrypted.h | 10 ++++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
index 760e37325f..01a45b294a 100644
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@@ -35,12 +35,12 @@ public:
 	virtual std::vector<std::string> GetNames() const = 0;
 	virtual u32 GetFSTSize() const = 0;
 	virtual std::string GetApploaderDate() const = 0;
+
 	virtual bool IsDiscTwo() const { return false; }
 	virtual bool IsWiiDisc() const { return false; }
 	virtual bool IsWadFile() const { return false; }
 	virtual bool SupportsIntegrityCheck() const { return false; }
 	virtual bool CheckIntegrity() const { return false; }
-
 	virtual bool ChangePartition(u64 offset) { return false; }
 
 	// Increment CACHE_REVISION if the code below is modified (ISOFile.cpp & GameFile.cpp)
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
index fef6a8ae69..c2efcd6e9f 100644
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -30,10 +30,12 @@ public:
 	std::vector<std::string> GetNames() const override;
 	u32 GetFSTSize() const override;
 	std::string GetApploaderDate() const override;
+
+	bool IsDiscTwo() const override;
+
 	ECountry GetCountry() const override;
 	u64 GetSize() const override;
 	u64 GetRawSize() const override;
-	bool IsDiscTwo() const override;
 
 	typedef std::string(*StringDecoder)(const std::string&);
 
diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h
index 043365a6b5..3205da3a24 100644
--- a/Source/Core/DiscIO/VolumeWad.h
+++ b/Source/Core/DiscIO/VolumeWad.h
@@ -29,14 +29,16 @@ public:
 	bool GetTitleID(u8* _pBuffer) const override;
 	std::string GetUniqueID() const override;
 	std::string GetMakerID() const override;
+	int GetRevision() const override;
 	std::vector<std::string> GetNames() const override;
 	u32 GetFSTSize() const override               { return 0; }
 	std::string GetApploaderDate() const override { return "0"; }
+
 	bool IsWadFile() const override;
+
 	ECountry GetCountry() const override;
 	u64 GetSize() const override;
 	u64 GetRawSize() const override;
-	int GetRevision() const override;
 
 private:
 	std::unique_ptr<IBlobReader> m_pReader;
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h
index 5e5e1e196d..e153d83065 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.h
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.h
@@ -29,19 +29,21 @@ public:
 	virtual std::unique_ptr<u8[]> GetTMD(u32 *_sz) const override;
 	std::string GetUniqueID() const override;
 	std::string GetMakerID() const override;
+	int GetRevision() const override;
 	std::vector<std::string> GetNames() const override;
 	u32 GetFSTSize() const override;
 	std::string GetApploaderDate() const override;
+
 	bool IsWiiDisc() const override;
+	bool SupportsIntegrityCheck() const override { return true; }
+	bool CheckIntegrity() const override;
+	bool ChangePartition(u64 offset) override;
+
 	ECountry GetCountry() const override;
 	u64 GetSize() const override;
 	u64 GetRawSize() const override;
-	int GetRevision() const override;
 
-	bool SupportsIntegrityCheck() const override { return true; }
-	bool CheckIntegrity() const override;
 
-	bool ChangePartition(u64 offset) override;
 
 private:
 	static const unsigned int s_block_header_size = 0x0400;