Merge pull request #58 from lioncash/reppin-pragma-city

Replace all include guard ifdefs with "#pragma once"
dolphin-emu · Feb 11, 2014 · 002c8f4 · 002c8f4
2 parents a0a65a2 + d203804
commit 002c8f4
Show file tree

Hide file tree

Showing 462 changed files with 676 additions and 2,308 deletions.
diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _AOSOUNDSTREAM_H_
-#define _AOSOUNDSTREAM_H_
+#pragma once
 
 #include "SoundStream.h"
 #include "Thread.h"
@@ -53,5 +52,3 @@ class AOSound : public SoundStream
 	AOSound(CMixer *mixer) : SoundStream(mixer) {}
 #endif
 };
-
-#endif //_AOSOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ALSA_SOUND_STREAM_H
-#define _ALSA_SOUND_STREAM_H
+#pragma once
 
 #if defined(HAVE_ALSA) && HAVE_ALSA
 #include <alsa/asoundlib.h>
@@ -52,6 +51,3 @@ class AlsaSound : public SoundStream
 	AlsaSound(CMixer *mixer) : SoundStream(mixer) {}
 #endif
 };
-
-#endif
-
diff --git a/Source/Core/AudioCommon/AudioCommon.h b/Source/Core/AudioCommon/AudioCommon.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _AUDIO_COMMON_H_
-#define _AUDIO_COMMON_H_
+#pragma once
 
 #include "Common.h"
 #include "SoundStream.h"
@@ -47,5 +46,3 @@ namespace AudioCommon
 	void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
 	void UpdateSoundStream();
 }
-
-#endif // _AUDIO_COMMON_H_
diff --git a/Source/Core/AudioCommon/CoreAudioSoundStream.h b/Source/Core/AudioCommon/CoreAudioSoundStream.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _COREAUDIO_SOUND_STREAM_H
-#define _COREAUDIO_SOUND_STREAM_H
+#pragma once
 
 #ifdef __APPLE__
 #include <AudioUnit/AudioUnit.h>
@@ -34,7 +33,7 @@ class CoreAudioSound : public SoundStream
 
 private:
 	AudioUnit audioUnit;
-    int m_volume;
+	int m_volume;
 
 	static OSStatus callback(void *inRefCon,
 		AudioUnitRenderActionFlags *ioActionFlags,
@@ -46,5 +45,3 @@ class CoreAudioSound : public SoundStream
 	CoreAudioSound(CMixer *mixer) : SoundStream(mixer) {}
 #endif
 };
-
-#endif
diff --git a/Source/Core/AudioCommon/DPL2Decoder.h b/Source/Core/AudioCommon/DPL2Decoder.h
@@ -2,10 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DPL2DECODER_H_
-#define _DPL2DECODER_H_
+#pragma once
 
 void dpl2decode(float *samples, int numsamples, float *out);
 void dpl2reset();
-
-#endif  // _DPL2DECODER_H_
diff --git a/Source/Core/AudioCommon/DSoundStream.h b/Source/Core/AudioCommon/DSoundStream.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DSOUNDSTREAM_H_
-#define _DSOUNDSTREAM_H_
+#pragma once
 
 #include "SoundStream.h"
 #include "Thread.h"
@@ -76,5 +75,3 @@ class DSound : public SoundStream
 	{}
 #endif
 };
-
-#endif //_DSOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _MIXER_H_
-#define _MIXER_H_
+#pragma once
 
 #include "WaveFile.h"
 #include "StdMutex.h"
@@ -106,5 +105,3 @@ class CMixer {
 private:
 
 };
-
-#endif // _MIXER_H_
diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _NULLSOUNDSTREAM_H_
-#define _NULLSOUNDSTREAM_H_
+#pragma once
 
 #include <stdlib.h>
 #include "SoundStream.h"
@@ -31,5 +30,3 @@ class NullSound : public SoundStream
 	virtual bool usesMixer() const { return true; }
 	virtual void Update();
 };
-
-#endif //_NULLSOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _OPENALSTREAM_H_
-#define _OPENALSTREAM_H_
+#pragma once
 
 #include "SoundStream.h"
 #include "Thread.h"
@@ -79,5 +78,3 @@ class OpenALStream: public SoundStream
 	{}
 #endif // HAVE_OPENAL
 };
-
-#endif // OPENALSTREAM
diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _OPENSLSTREAM_H_
-#define _OPENSLSTREAM_H_
+#pragma once
 
 #include "Thread.h"
 #include "SoundStream.h"
@@ -31,5 +30,3 @@ class OpenSLESStream : public SoundStream
 	OpenSLESStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {}
 #endif // HAVE_OPENSL
 };
-
-#endif
diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _PULSE_AUDIO_STREAM_H
-#define _PULSE_AUDIO_STREAM_H
+#pragma once
 
 #if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO
 #include <pulse/pulseaudio.h>
@@ -61,5 +60,3 @@ class PulseAudio : public SoundStream
 	PulseAudio(CMixer *mixer) : SoundStream(mixer) {}
 #endif
 };
-
-#endif
diff --git a/Source/Core/AudioCommon/SoundStream.h b/Source/Core/AudioCommon/SoundStream.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _SOUNDSTREAM_H_
-#define _SOUNDSTREAM_H_
+#pragma once
 
 #include "Common.h"
 #include "Mixer.h"
@@ -55,5 +54,3 @@ class SoundStream
 		}
 	}
 };
-
-#endif // _SOUNDSTREAM_H_
diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h
@@ -12,8 +12,7 @@
 // If Stop is not called when it destructs, the destructor will call Stop().
 // ---------------------------------------------------------------------------------
 
-#ifndef _WAVEFILE_H_
-#define _WAVEFILE_H_
+#pragma once
 
 #include "FileUtil.h"
 
@@ -41,5 +40,3 @@ class WaveFileWriter
 	void AddStereoSamplesBE(const short *sample_data, u32 count);  // big endian
 	u32 GetAudioSize() const { return audio_size; }
 };
-
-#endif  // _WAVEFILE_H_
diff --git a/Source/Core/AudioCommon/aldlist.h b/Source/Core/AudioCommon/aldlist.h
@@ -1,5 +1,4 @@
-#ifndef ALDEVICELIST_H
-#define ALDEVICELIST_H
+#pragma once
 
 #include "CommonTypes.h"
 #ifdef _WIN32
@@ -47,5 +46,3 @@ class ALDeviceList
 private:
 	u32 GetMaxNumSources();
 };
-
-#endif // ALDEVICELIST_H
diff --git a/Source/Core/Common/ArmEmitter.h b/Source/Core/Common/ArmEmitter.h
@@ -1,24 +1,10 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 // WARNING - THIS LIBRARY IS NOT THREAD SAFE!!!
 
-#ifndef _DOLPHIN_ARM_CODEGEN_
-#define _DOLPHIN_ARM_CODEGEN_
+#pragma once
 
 #include "Common.h"
 #include "MemoryUtil.h"
@@ -796,5 +782,3 @@ extern const VFPEnc VFPOps[16][2];
 extern const char *VFPOpNames[16];
 
 }  // namespace
-
-#endif // _DOLPHIN_INTEL_CODEGEN_
diff --git a/Source/Core/Common/Atomic.h b/Source/Core/Common/Atomic.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ATOMIC_H_
-#define _ATOMIC_H_
+#pragma once 
 
 #ifdef _WIN32
 
@@ -15,5 +14,3 @@
 #include "Atomic_GCC.h"
 
 #endif
-
-#endif
diff --git a/Source/Core/Common/Atomic_GCC.h b/Source/Core/Common/Atomic_GCC.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ATOMIC_GCC_H_
-#define _ATOMIC_GCC_H_
+#pragma once
 
 #include "Common.h"
 
@@ -86,5 +85,3 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval) {
 }
 
 }
-
-#endif
diff --git a/Source/Core/Common/Atomic_Win32.h b/Source/Core/Common/Atomic_Win32.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _ATOMIC_WIN32_H_
-#define _ATOMIC_WIN32_H_
+#pragma once
 
 #include "Common.h"
 #include <intrin.h>
@@ -79,5 +78,3 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval) {
 }
 
 }
-
-#endif
diff --git a/Source/Core/Common/BreakPoints.h b/Source/Core/Common/BreakPoints.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _DEBUGGER_BREAKPOINTS_H
-#define _DEBUGGER_BREAKPOINTS_H
+#pragma once
 
 #include <vector>
 #include <string>
@@ -97,6 +96,3 @@ class MemChecks
 
 	void Clear() { m_MemChecks.clear(); };
 };
-
-#endif
-
diff --git a/Source/Core/Common/CDUtils.h b/Source/Core/Common/CDUtils.h
@@ -1,5 +1,4 @@
-#ifndef _CDUTILS_H_
-#define _CDUTILS_H_
+#pragma once
 
 #include <vector>
 #include <string>
@@ -9,5 +8,3 @@ std::vector<std::string> cdio_get_devices();
 
 // Returns true if device is cdrom/dvd
 bool cdio_is_cdrom(std::string device);
-
-#endif // _CDUTILS_H_
diff --git a/Source/Core/Common/CPUDetect.h b/Source/Core/Common/CPUDetect.h
@@ -4,8 +4,7 @@
 
 
 // Detect the cpu, so we'll know which optimizations to use
-#ifndef _CPUDETECT_H_
-#define _CPUDETECT_H_
+#pragma once
 
 #include <string>
 
@@ -85,5 +84,3 @@ struct CPUInfo
 };
 
 extern CPUInfo cpu_info;
-
-#endif // _CPUDETECT_H_
diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h
@@ -2,9 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-
-#ifndef _POINTERWRAP_H_
-#define _POINTERWRAP_H_
+#pragma once
 
 // Extremely simple serialization framework.
 
@@ -431,5 +429,3 @@ class CChunkFileReader
 		u32 ExpectedSize;
 	};
 };
-
-#endif  // _POINTERWRAP_H_
diff --git a/Source/Core/Common/ColorUtil.h b/Source/Core/Common/ColorUtil.h
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef _COLORUTIL_H_
-#define _COLORUTIL_H_
+#pragma once
 
 namespace ColorUtil
 {
@@ -12,5 +11,3 @@ void decode5A3image(u32* dst, u16* src, int width, int height);
 void decodeCI8image(u32* dst, u8* src, u16* pal, int width, int height);
 
 }  // namespace
-
-#endif // _COLORUTIL_H_