Replace all include guard ifdefs with "#pragma once"

22 files changed, 23 insertions, 95 deletions

diff --git a/Source/Core/DiscIO/BannerLoader.h b/Source/Core/DiscIO/BannerLoader.h
index da0075f7f3..0d341931e0 100644
--- a/Source/Core/DiscIO/BannerLoader.h
+++ b/Source/Core/DiscIO/BannerLoader.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _BANNER_LOADER_H_
-#define _BANNER_LOADER_H_
+#pragma once
 
 #include <vector>
 #include <string>
@@ -35,6 +34,3 @@ class IBannerLoader
 
 IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume);
 } // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/BannerLoaderGC.h b/Source/Core/DiscIO/BannerLoaderGC.h
index 7ad6d2122c..5242600525 100644
--- a/Source/Core/DiscIO/BannerLoaderGC.h
+++ b/Source/Core/DiscIO/BannerLoaderGC.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _BANNER_LOADER_GC_H_
-#define _BANNER_LOADER_GC_H_
+#pragma once
 
 #include "BannerLoader.h"
 #include "VolumeGC.h"
@@ -81,6 +80,3 @@ class CBannerLoaderGC
 };
 
 } // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/BannerLoaderWii.h b/Source/Core/DiscIO/BannerLoaderWii.h
index a6732e9bfa..bfc8f7c975 100644
--- a/Source/Core/DiscIO/BannerLoaderWii.h
+++ b/Source/Core/DiscIO/BannerLoaderWii.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _BANNER_LOADER_WII_H_
-#define _BANNER_LOADER_WII_H_
+#pragma once
 
 #include "BannerLoader.h"
 
@@ -62,6 +61,3 @@ class CBannerLoaderWii
 		bool GetStringFromComments(const CommentIndex index, std::string& s);
 };
 } // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h
index 66c21a4ca5..5fdfe26e0e 100644
--- a/Source/Core/DiscIO/Blob.h
+++ b/Source/Core/DiscIO/Blob.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _BLOB_H
-#define _BLOB_H
+#pragma once
 
 // BLOB
 
@@ -74,6 +73,3 @@ bool DecompressBlobToFile(const char *infile, const char *outfile,
 		CompressCB callback = 0, void *arg = 0);
 
 }  // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/CISOBlob.h b/Source/Core/DiscIO/CISOBlob.h
index 0039fe4f43..5cd016683a 100644
--- a/Source/Core/DiscIO/CISOBlob.h
+++ b/Source/Core/DiscIO/CISOBlob.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _CISO_BLOB_H
-#define _CISO_BLOB_H
+#pragma once
 
 #include "Blob.h"
 #include "FileUtil.h"
@@ -50,5 +49,3 @@ private:
 };
 
 }  // namespace
-
-#endif  // _FILE_BLOB_H
diff --git a/Source/Core/DiscIO/CompressedBlob.h b/Source/Core/DiscIO/CompressedBlob.h
index 843054442f..2d201deae6 100644
--- a/Source/Core/DiscIO/CompressedBlob.h
+++ b/Source/Core/DiscIO/CompressedBlob.h
@@ -12,8 +12,7 @@
 // * [Block Pointers interleaved with block hashes (hash of decompressed data)]
 // * [Data]
 
-#ifndef COMPRESSED_BLOB_H_
-#define COMPRESSED_BLOB_H_
+#pragma once
 
 #include <string>
 
@@ -68,5 +67,3 @@ private:
 };
 
 }  // namespace
-
-#endif  // COMPRESSED_BLOB_H_
diff --git a/Source/Core/DiscIO/DiscScrubber.h b/Source/Core/DiscIO/DiscScrubber.h
index de4b9a683a..c1efacb8c1 100644
--- a/Source/Core/DiscIO/DiscScrubber.h
+++ b/Source/Core/DiscIO/DiscScrubber.h
@@ -11,8 +11,7 @@
 
 // Note: the technique is inspired by Wiiscrubber, but much simpler - intentionally :)
 
-#ifndef DISC_SCRUBBER_H
-#define DISC_SCRUBBER_H
+#pragma once
 
 #include "CommonTypes.h"
 #include "Blob.h"
@@ -31,5 +30,3 @@ void Cleanup();
 } // namespace DiscScrubber
 
 } // namespace DiscIO
-
-#endif  // DISC_SCRUBBER_H
diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h
index d5c13a3b15..5f4a70a6fa 100644
--- a/Source/Core/DiscIO/DriveBlob.h
+++ b/Source/Core/DiscIO/DriveBlob.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DRIVE_BLOB_H
-#define _DRIVE_BLOB_H
+#pragma once
 
 #include "Blob.h"
 #include "FileUtil.h"
@@ -42,5 +41,3 @@ public:
 };
 
 }  // namespace
-
-#endif  // _DRIVE_BLOB_H
diff --git a/Source/Core/DiscIO/FileBlob.h b/Source/Core/DiscIO/FileBlob.h
index 464c5daa64..21778a0605 100644
--- a/Source/Core/DiscIO/FileBlob.h
+++ b/Source/Core/DiscIO/FileBlob.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _FILE_BLOB_H
-#define _FILE_BLOB_H
+#pragma once
 
 #include "Blob.h"
 #include "FileUtil.h"
@@ -27,5 +26,3 @@ public:
 };
 
 }  // namespace
-
-#endif  // _FILE_BLOB_H
diff --git a/Source/Core/DiscIO/FileHandlerARC.h b/Source/Core/DiscIO/FileHandlerARC.h
index d423c74ae0..93f5bded1c 100644
--- a/Source/Core/DiscIO/FileHandlerARC.h
+++ b/Source/Core/DiscIO/FileHandlerARC.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ARC_FILE_H
-#define _ARC_FILE_H
+#pragma once
 
 #include <string>
 #include <vector>
@@ -52,6 +51,3 @@ class CARCFile
 		const SFileInfo* FindFileInfo(std::string _rFullPath) const;
 };
 } // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/FileMonitor.h b/Source/Core/DiscIO/FileMonitor.h
index 3b40332eea..2b3559766b 100644
--- a/Source/Core/DiscIO/FileMonitor.h
+++ b/Source/Core/DiscIO/FileMonitor.h
@@ -2,6 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#pragma once
+
 #include <iostream> // System: For std
 
 #include "Common.h" // Common: For u64
diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h
index 5240c2d3fb..af8040dc3d 100644
--- a/Source/Core/DiscIO/FileSystemGCWii.h
+++ b/Source/Core/DiscIO/FileSystemGCWii.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _FILESYSTEM_GC_WII_H
-#define _FILESYSTEM_GC_WII_H
+#pragma once
 
 #include <vector>
 
@@ -43,6 +42,3 @@ private:
 };
 
 } // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h
index 0fcaa88453..10b85e2635 100644
--- a/Source/Core/DiscIO/Filesystem.h
+++ b/Source/Core/DiscIO/Filesystem.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _FILESYSTEM_H
-#define _FILESYSTEM_H
+#pragma once
 
 #include "Volume.h"
 
@@ -55,5 +54,3 @@ protected:
 IFileSystem* CreateFileSystem(const IVolume *_rVolume);
 
 } // namespace
-
-#endif
diff --git a/Source/Core/DiscIO/NANDContentLoader.h b/Source/Core/DiscIO/NANDContentLoader.h
index 0312faacaa..fa517cae64 100644
--- a/Source/Core/DiscIO/NANDContentLoader.h
+++ b/Source/Core/DiscIO/NANDContentLoader.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _NAND_CONTENT_LOADER_H
-#define _NAND_CONTENT_LOADER_H
+#pragma once
 
 #include <string>
 #include <vector>
@@ -153,5 +152,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
index 65a9167654..92112be609 100644
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
-#ifndef _VOLUME_H
-#define _VOLUME_H
+#pragma once
 
 #include <string>
 #include <vector>
@@ -65,6 +63,3 @@ IVolume::ECountry CountrySwitch(u8 CountryCode);
 u8 GetSysMenuRegion(u16 _TitleVersion);
 
 } // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/VolumeCreator.h b/Source/Core/DiscIO/VolumeCreator.h
index 1e290f3cc5..a92ec2ef8e 100644
--- a/Source/Core/DiscIO/VolumeCreator.h
+++ b/Source/Core/DiscIO/VolumeCreator.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _VOLUME_CREATOR_H
-#define _VOLUME_CREATOR_H
+#pragma once
 
 #include "Volume.h"
 
@@ -14,6 +13,3 @@ IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii,
 bool IsVolumeWiiDisc(const IVolume *_rVolume);
 bool IsVolumeWadFile(const IVolume *_rVolume);
 } // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/VolumeDirectory.h b/Source/Core/DiscIO/VolumeDirectory.h
index fbab0f18b3..c6a387b686 100644
--- a/Source/Core/DiscIO/VolumeDirectory.h
+++ b/Source/Core/DiscIO/VolumeDirectory.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _VOLUME_DIRECTORY
-#define _VOLUME_DIRECTORY
+#pragma once
 
 #include <map>
 #include <string>
@@ -142,5 +141,3 @@ private:
 };
 
 } // namespace
-
-#endif
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
index 5fc7cf892d..3ed802cffb 100644
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _VOLUME_GC
-#define _VOLUME_GC
+#pragma once
 
 #include "Volume.h"
 #include "Blob.h"
@@ -40,5 +39,3 @@ private:
 };
 
 } // namespace
-
-#endif
diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h
index 62c4d23762..cd5835c986 100644
--- a/Source/Core/DiscIO/VolumeWad.h
+++ b/Source/Core/DiscIO/VolumeWad.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _VOLUME_WAD
-#define _VOLUME_WAD
+#pragma once
 
 #include "Volume.h"
 #include "Blob.h"
@@ -39,5 +38,3 @@ private:
 };
 
 } // namespace
-
-#endif
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.h b/Source/Core/DiscIO/VolumeWiiCrypted.h
index 4756a8842a..9ff9b999b3 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.h
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _VOLUME_WII_CRYPTED
-#define _VOLUME_WII_CRYPTED
+#pragma once
 
 #include "Volume.h"
 #include "Blob.h"
@@ -48,6 +47,3 @@ private:
 };
 
 } // namespace
-
-#endif
-
diff --git a/Source/Core/DiscIO/WbfsBlob.h b/Source/Core/DiscIO/WbfsBlob.h
index b703d59931..0ac4ecf845 100644
--- a/Source/Core/DiscIO/WbfsBlob.h
+++ b/Source/Core/DiscIO/WbfsBlob.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _WBFS_BLOB_H
-#define _WBFS_BLOB_H
+#pragma once
 
 #include "Blob.h"
 #include "FileUtil.h"
@@ -65,5 +64,3 @@ bool IsWbfsBlob(const char* filename);
 
 
 }  // namespace
-
-#endif  // _FILE_BLOB_H
diff --git a/Source/Core/DiscIO/WiiWad.h b/Source/Core/DiscIO/WiiWad.h
index 0711c82cb0..cde73495e2 100644
--- a/Source/Core/DiscIO/WiiWad.h
+++ b/Source/Core/DiscIO/WiiWad.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _WII_WAD_H
-#define _WII_WAD_H
+#pragma once
 
 #include <string>
 #include <vector>
@@ -60,6 +59,3 @@ private:
 };
 
 }
-
-#endif
-