diff options
| author | lioncash <mathew1800@gmail.com> | 2014-02-10 13:54:46 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-02-10 18:07:16 -0500 |
| commit | d2038049f51192fbb55fbde2fc08128bacfb7707 (patch) | |
| tree | 2f352e13e3d5868db072f1e75d611a90e938d0cf /Source | |
| parent | a0a65a2906af132f6da04cf552812aac6ac5f20a (diff) | |
Replace all include guard ifdefs with "#pragma once"
Diffstat (limited to 'Source')
462 files changed, 676 insertions, 2308 deletions
diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h index 1eb762492c..530108479c 100644 --- 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 @@ public: AOSound(CMixer *mixer) : SoundStream(mixer) {} #endif }; - -#endif //_AOSOUNDSTREAM_H_ diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index 56ab4176b9..defa3c408a 100644 --- 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 @@ public: AlsaSound(CMixer *mixer) : SoundStream(mixer) {} #endif }; - -#endif - diff --git a/Source/Core/AudioCommon/AudioCommon.h b/Source/Core/AudioCommon/AudioCommon.h index 9c49293a48..f1aece0b9c 100644 --- 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 index 27d8c62f7d..5ebbbb945c 100644 --- 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 @@ public: private: AudioUnit audioUnit; - int m_volume; + int m_volume; static OSStatus callback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, @@ -46,5 +45,3 @@ public: CoreAudioSound(CMixer *mixer) : SoundStream(mixer) {} #endif }; - -#endif diff --git a/Source/Core/AudioCommon/DPL2Decoder.h b/Source/Core/AudioCommon/DPL2Decoder.h index 8252918de3..e89795482b 100644 --- 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 index a872e79181..def27babb5 100644 --- 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 @@ public: {} #endif }; - -#endif //_DSOUNDSTREAM_H_ diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h index 991a2f9149..6b2c4b95f3 100644 --- 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 @@ protected: private: }; - -#endif // _MIXER_H_ diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h index aade06b9ac..bcc96a9151 100644 --- 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 @@ public: 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 index bccf3bd824..2667f90ac1 100644 --- 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 @@ public: {} #endif // HAVE_OPENAL }; - -#endif // OPENALSTREAM diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h index 839b5dc4b9..a75aab59f9 100644 --- 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 @@ public: 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 index 3164a4ee94..c9ccfb80fa 100644 --- 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 @@ public: PulseAudio(CMixer *mixer) : SoundStream(mixer) {} #endif }; - -#endif diff --git a/Source/Core/AudioCommon/SoundStream.h b/Source/Core/AudioCommon/SoundStream.h index ac2ac6bbb2..dd130e814a 100644 --- 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 @@ public: } } }; - -#endif // _SOUNDSTREAM_H_ diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h index c0ccd8136b..e96f64ab5d 100644 --- 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 @@ public: 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 index 645b759660..29d742a98b 100644 --- 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 @@ public: private: u32 GetMaxNumSources(); }; - -#endif // ALDEVICELIST_H diff --git a/Source/Core/Common/ArmEmitter.h b/Source/Core/Common/ArmEmitter.h index 99024f3b6f..9c53cb66f3 100644 --- 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 index 11ed451091..7d2f9204e8 100644 --- 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 index 22dffbe66d..e250efbdca 100644 --- 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 index 7ce1381938..5e52b0a0eb 100644 --- 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 index e9ac0b1667..285e5cd968 100644 --- 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 @@ public: void Clear() { m_MemChecks.clear(); }; }; - -#endif - diff --git a/Source/Core/Common/CDUtils.h b/Source/Core/Common/CDUtils.h index a458477fef..19ca22df1a 100644 --- 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 index 0463e11105..51dd20b8ce 100644 --- 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 @@ private: }; extern CPUInfo cpu_info; - -#endif // _CPUDETECT_H_ diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index d7aeba0558..acacca4732 100644 --- 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 @@ private: u32 ExpectedSize; }; }; - -#endif // _POINTERWRAP_H_ diff --git a/Source/Core/Common/ColorUtil.h b/Source/Core/Common/ColorUtil.h index 010d8b1a5c..bf4979e7ba 100644 --- 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_ diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index 6556f1fd17..fc326e2cc8 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COMMON_H_ -#define _COMMON_H_ +#pragma once // DO NOT EVER INCLUDE <windows.h> directly _or indirectly_ from this file // since it slows down the build a lot. @@ -174,5 +173,3 @@ enum EMUSTATE_CHANGE }; #include "CommonFuncs.h" - -#endif // _COMMON_H_ diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index 1b385859d5..b6592e3ea1 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COMMONFUNCS_H_ -#define _COMMONFUNCS_H_ +#pragma once #ifdef _WIN32 #define SLEEP(x) Sleep(x) @@ -253,5 +252,3 @@ inline T FromBigEndian(T data) } } // Namespace Common - -#endif // _COMMONFUNCS_H_ diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 456f669565..3481aca00f 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COMMON_PATHS_H_ -#define _COMMON_PATHS_H_ +#pragma once // Make sure we pick up USER_DIR if set in config.h #include "Common.h" @@ -119,5 +118,3 @@ // Subdirs in Sys #define GC_SYS_DIR "GC" #define WII_SYS_DIR "Wii" - -#endif // _COMMON_PATHS_H_ diff --git a/Source/Core/Common/CommonTypes.h b/Source/Core/Common/CommonTypes.h index 3eb131c1a1..56210da18f 100644 --- a/Source/Core/Common/CommonTypes.h +++ b/Source/Core/Common/CommonTypes.h @@ -7,8 +7,7 @@ // other parts of the code. Any definitions that are only used by the core should be // placed in "Common.h" instead. -#ifndef _COMMONTYPES_H_ -#define _COMMONTYPES_H_ +#pragma once #include <cstdint> #include <cstddef> @@ -47,5 +46,3 @@ typedef int64_t s64; #define LONG int #endif // _WIN32 - -#endif // _COMMONTYPES_H_ diff --git a/Source/Core/Common/ConsoleListener.h b/Source/Core/Common/ConsoleListener.h index 84c379eb54..ea9566aac2 100644 --- a/Source/Core/Common/ConsoleListener.h +++ b/Source/Core/Common/ConsoleListener.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CONSOLELISTENER_H -#define _CONSOLELISTENER_H +#pragma once #include "LogManager.h" @@ -37,5 +36,3 @@ private: #endif bool bUseColor; }; - -#endif // _CONSOLELISTENER_H diff --git a/Source/Core/Common/DebugInterface.h b/Source/Core/Common/DebugInterface.h index 81b2d0852b..b1df4144c2 100644 --- a/Source/Core/Common/DebugInterface.h +++ b/Source/Core/Common/DebugInterface.h @@ -1,5 +1,4 @@ -#ifndef _DEBUGINTERFACE_H -#define _DEBUGINTERFACE_H +#pragma once #include <string> @@ -34,5 +33,3 @@ public: virtual int getColor(unsigned int /*address*/){return 0xFFFFFFFF;} virtual std::string getDescription(unsigned int /*address*/) = 0; }; - -#endif diff --git a/Source/Core/Common/ExtendedTrace.h b/Source/Core/Common/ExtendedTrace.h index d4da486fd3..e0efd85200 100644 --- a/Source/Core/Common/ExtendedTrace.h +++ b/Source/Core/Common/ExtendedTrace.h @@ -12,8 +12,7 @@ // // ---------------------------------------------------------------------------------------- -#ifndef _EXTENDEDTRACE_H_INCLUDED_ -#define _EXTENDEDTRACE_H_INCLUDED_ +#pragma once #if defined(WIN32) @@ -23,9 +22,9 @@ #pragma comment( lib, "imagehlp.lib" ) -#define EXTENDEDTRACEINITIALIZE( IniSymbolPath ) InitSymInfo( IniSymbolPath ) -#define EXTENDEDTRACEUNINITIALIZE() UninitSymInfo() -#define STACKTRACE(file) StackTrace( GetCurrentThread(), "", file) +#define EXTENDEDTRACEINITIALIZE( IniSymbolPath ) InitSymInfo( IniSymbolPath ) +#define EXTENDEDTRACEUNINITIALIZE() UninitSymInfo() +#define STACKTRACE(file) StackTrace( GetCurrentThread(), "", file) #define STACKTRACE2(file, eip, esp, ebp) StackTrace(GetCurrentThread(), "", file, eip, esp, ebp) // class File; @@ -40,13 +39,12 @@ void etfprint(FILE *file, const std::string &text); #define UEFBUFSIZE 2048 extern char g_uefbuf[UEFBUFSIZE]; -#else // not WIN32 +#else // not WIN32 -#define EXTENDEDTRACEINITIALIZE( IniSymbolPath ) ((void)0) -#define EXTENDEDTRACEUNINITIALIZE() ((void)0) -#define STACKTRACE(file) ((void)0) -#define STACKTRACE2(file, eip, esp, ebp) ((void)0) +#define EXTENDEDTRACEINITIALIZE( IniSymbolPath ) ((void)0) +#define EXTENDEDTRACEUNINITIALIZE() ((void)0) +#define STACKTRACE(file) ((void)0) +#define STACKTRACE2(file, eip, esp, ebp) ((void)0) -#endif // WIN32 +#endif // WIN32 -#endif // _EXTENDEDTRACE_H_INCLUDED_ diff --git a/Source/Core/Common/FPURoundMode.h b/Source/Core/Common/FPURoundMode.h index c552ad7ff0..759aaac37c 100644 --- a/Source/Core/Common/FPURoundMode.h +++ b/Source/Core/Common/FPURoundMode.h @@ -1,21 +1,9 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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. +#pragma once -// 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/ -#ifndef FPU_ROUND_MODE_H_ -#define FPU_ROUND_MODE_H_ #include "CommonTypes.h" namespace FPURoundMode @@ -49,4 +37,3 @@ namespace FPURoundMode void LoadSIMDState(); void LoadDefaultSIMDState(); } -#endif diff --git a/Source/Core/Common/FifoQueue.h b/Source/Core/Common/FifoQueue.h index c3d15ff7d8..0e0ada1397 100644 --- a/Source/Core/Common/FifoQueue.h +++ b/Source/Core/Common/FifoQueue.h @@ -1,6 +1,4 @@ - -#ifndef _FIFO_QUEUE_H_ -#define _FIFO_QUEUE_H_ +#pragma once // a simple lockless thread-safe, // single reader, single writer queue @@ -116,5 +114,3 @@ private: }; } - -#endif diff --git a/Source/Core/Common/FileSearch.h b/Source/Core/Common/FileSearch.h index 55aaf4ebe6..3e3d3d82ef 100644 --- a/Source/Core/Common/FileSearch.h +++ b/Source/Core/Common/FileSearch.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _FILESEARCH_H_ -#define _FILESEARCH_H_ +#pragma once #include <string> #include <vector> @@ -24,5 +22,3 @@ private: XStringVector m_FileNames; }; -#endif // _FILESEARCH_H_ - diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index 4fee364a2e..e0efc42ca1 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _FILEUTIL_H_ -#define _FILEUTIL_H_ +#pragma once #include <fstream> #include <cstdio> @@ -237,5 +235,3 @@ void OpenFStream(T& fstream, const std::string& filename, std::ios_base::openmod fstream.open(filename.c_str(), openmode); #endif } - -#endif diff --git a/Source/Core/Common/FixedSizeQueue.h b/Source/Core/Common/FixedSizeQueue.h index 0fb625dd5a..2b54b631b8 100644 --- a/Source/Core/Common/FixedSizeQueue.h +++ b/Source/Core/Common/FixedSizeQueue.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _FIXED_SIZE_QUEUE_H_ -#define _FIXED_SIZE_QUEUE_H_ +#pragma once // STL-look-a-like interface, but name is mixed case to distinguish it clearly from the // real STL classes. @@ -70,6 +68,3 @@ public: return count; } }; - -#endif // _FIXED_SIZE_QUEUE_H_ - diff --git a/Source/Core/Common/Hash.h b/Source/Core/Common/Hash.h index 7bc37a5632..23a54cd47d 100644 --- a/Source/Core/Common/Hash.h +++ b/Source/Core/Common/Hash.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _HASH_H_ -#define _HASH_H_ +#pragma once #include "Common.h" @@ -17,4 +15,3 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples); u64 GetMurmurHash3(const u8 *src, int len, u32 samples); u64 GetHash64(const u8 *src, int len, u32 samples); void SetHash64Function(bool useHiresTextures); -#endif // _HASH_H_ diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h index 005f866f65..fd8de38f14 100644 --- a/Source/Core/Common/IniFile.h +++ b/Source/Core/Common/IniFile.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _INIFILE_H_ -#define _INIFILE_H_ +#pragma once #include <map> #include <string> @@ -159,5 +157,3 @@ private: std::string* GetLine(const char* section, const char* key); void CreateSection(const char* section); }; - -#endif // _INIFILE_H_ diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h index e139b064f3..34bf38165c 100644 --- a/Source/Core/Common/LinearDiskCache.h +++ b/Source/Core/Common/LinearDiskCache.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _LINEAR_DISKCACHE -#define _LINEAR_DISKCACHE +#pragma once #include "Common.h" #include <fstream> @@ -184,5 +182,3 @@ private: std::fstream m_file; u32 m_num_entries; }; - -#endif // _LINEAR_DISKCACHE diff --git a/Source/Core/Common/Log.h b/Source/Core/Common/Log.h index 8c7a1eb331..3284daabf8 100644 --- a/Source/Core/Common/Log.h +++ b/Source/Core/Common/Log.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LOG_H_ -#define _LOG_H_ +#pragma once #define NOTICE_LEVEL 1 // VERY important information that is NOT errors. Like startup and OSReports. #define ERROR_LEVEL 2 // Critical errors @@ -155,5 +154,3 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, #else // GEKKO #define _assert_msg_(_t_, _a_, _fmt_, ...) #endif - -#endif // _LOG_H_ diff --git a/Source/Core/Common/LogManager.h b/Source/Core/Common/LogManager.h index 101be5fc13..1b055e6037 100644 --- a/Source/Core/Common/LogManager.h +++ b/Source/Core/Common/LogManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LOGMANAGER_H_ -#define _LOGMANAGER_H_ +#pragma once #include "Log.h" #include "StringUtil.h" @@ -165,5 +164,3 @@ public: static void Init(); static void Shutdown(); }; - -#endif // _LOGMANAGER_H_ diff --git a/Source/Core/Common/MathUtil.h b/Source/Core/Common/MathUtil.h index 3e7b198c49..ecb264cbec 100644 --- a/Source/Core/Common/MathUtil.h +++ b/Source/Core/Common/MathUtil.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _MATH_UTIL_H_ -#define _MATH_UTIL_H_ +#pragma once #include "Common.h" @@ -206,5 +204,3 @@ public: float data[16]; }; - -#endif // _MATH_UTIL_H_ diff --git a/Source/Core/Common/MemArena.h b/Source/Core/Common/MemArena.h index 25d5c3ccbe..5cd952d23a 100644 --- a/Source/Core/Common/MemArena.h +++ b/Source/Core/Common/MemArena.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _MEMARENA_H_ -#define _MEMARENA_H_ +#pragma once #ifdef _WIN32 #include <windows.h> @@ -54,5 +52,3 @@ struct MemoryView // a passed-in list of MemoryView structures. u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena *arena); void MemoryMap_Shutdown(const MemoryView *views, int num_views, u32 flags, MemArena *arena); - -#endif // _MEMARENA_H_ diff --git a/Source/Core/Common/MemoryUtil.h b/Source/Core/Common/MemoryUtil.h index 79b35e41c4..4655c787c2 100644 --- a/Source/Core/Common/MemoryUtil.h +++ b/Source/Core/Common/MemoryUtil.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _MEMORYUTIL_H -#define _MEMORYUTIL_H +#pragma once #include <string> @@ -22,5 +20,3 @@ void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute = false); std::string MemUsage(); inline int GetPageSize() { return 4096; } - -#endif diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h index f6e2f0f1dc..36032fe09a 100644 --- a/Source/Core/Common/MsgHandler.h +++ b/Source/Core/Common/MsgHandler.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _MSGHANDLER_H_ -#define _MSGHANDLER_H_ +#pragma once #include <string> @@ -69,5 +68,3 @@ void SetEnableAlert(bool enable); #define AskYesNoT(format, ...) ; #define CriticalAlertT(format, ...) ; #endif - -#endif // _MSGHANDLER_H_ diff --git a/Source/Core/Common/NandPaths.h b/Source/Core/Common/NandPaths.h index 19228d3176..f1fd151007 100644 --- a/Source/Core/Common/NandPaths.h +++ b/Source/Core/Common/NandPaths.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __NANDPATHS_H__ -#define __NANDPATHS_H__ +#pragma once #include <string> #include "CommonTypes.h" @@ -23,5 +22,3 @@ namespace Common bool CheckTitleTIK(u64 _titleID); void ReadReplacements(replace_v& replacements); } -#endif - diff --git a/Source/Core/Common/SDCardUtil.h b/Source/Core/Common/SDCardUtil.h index 3497b4a91d..e684720987 100644 --- a/Source/Core/Common/SDCardUtil.h +++ b/Source/Core/Common/SDCardUtil.h @@ -1,19 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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 Git repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +#pragma once #include "CommonTypes.h" diff --git a/Source/Core/Common/StdConditionVariable.h b/Source/Core/Common/StdConditionVariable.h index 1a05ce45e3..d9f17ec718 100644 --- a/Source/Core/Common/StdConditionVariable.h +++ b/Source/Core/Common/StdConditionVariable.h @@ -1,6 +1,8 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -#ifndef CONDITION_VARIABLE_H_ -#define CONDITION_VARIABLE_H_ +#pragma once #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) @@ -172,4 +174,3 @@ private: } #endif -#endif diff --git a/Source/Core/Common/StdMutex.h b/Source/Core/Common/StdMutex.h index 4d3348d458..509e1d2566 100644 --- a/Source/Core/Common/StdMutex.h +++ b/Source/Core/Common/StdMutex.h @@ -1,6 +1,8 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -#ifndef MUTEX_H_ -#define MUTEX_H_ +#pragma once #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) @@ -368,4 +370,3 @@ void swap(unique_lock<Mutex>& x, unique_lock<Mutex>& y) } #endif -#endif diff --git a/Source/Core/Common/StdThread.h b/Source/Core/Common/StdThread.h index 9e589061b1..ca7d6917e1 100644 --- a/Source/Core/Common/StdThread.h +++ b/Source/Core/Common/StdThread.h @@ -1,6 +1,8 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -#ifndef STD_THREAD_H_ -#define STD_THREAD_H_ +#pragma once #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) @@ -320,4 +322,3 @@ inline thread::id get_id() #undef THREAD_HANDLE #endif -#endif diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h index 7846cbee3d..d44432837c 100644 --- a/Source/Core/Common/StringUtil.h +++ b/Source/Core/Common/StringUtil.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _STRINGUTIL_H_ -#define _STRINGUTIL_H_ +#pragma once #include <stdarg.h> @@ -114,5 +113,3 @@ inline std::string UTF8ToTStr(const std::string& str) #endif #endif - -#endif // _STRINGUTIL_H_ diff --git a/Source/Core/Common/SymbolDB.h b/Source/Core/Common/SymbolDB.h index 043d6ad22f..e0272d4274 100644 --- a/Source/Core/Common/SymbolDB.h +++ b/Source/Core/Common/SymbolDB.h @@ -5,8 +5,7 @@ // This file contains a generic symbol map implementation. For CPU-specific // magic, derive and extend. -#ifndef _SYMBOL_DB_H -#define _SYMBOL_DB_H +#pragma once #include <string> #include <map> @@ -105,5 +104,3 @@ public: void List(); void Index(); }; - -#endif diff --git a/Source/Core/Common/SysConf.h b/Source/Core/Common/SysConf.h index 30b5632cf5..f8f6ca317d 100644 --- a/Source/Core/Common/SysConf.h +++ b/Source/Core/Common/SysConf.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __SYSCONF_MANAGER_h__ -#define __SYSCONF_MANAGER_h__ +#pragma once #include <string> #include <vector> @@ -176,5 +175,3 @@ private: std::vector<SSysConfEntry> m_Entries; bool m_IsValid; }; - -#endif // __SYSCONF_MANAGER_h__ diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h index b2e9572ce5..5f3af35da5 100644 --- a/Source/Core/Common/Thread.h +++ b/Source/Core/Common/Thread.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _THREAD_H_ -#define _THREAD_H_ +#pragma once #include "StdConditionVariable.h" #include "StdMutex.h" @@ -122,5 +121,3 @@ inline void YieldCPU() void SetCurrentThreadName(const char *name); } // namespace Common - -#endif // _THREAD_H_ diff --git a/Source/Core/Common/Timer.h b/Source/Core/Common/Timer.h index 3055246f8e..851f48b7a4 100644 --- a/Source/Core/Common/Timer.h +++ b/Source/Core/Common/Timer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TIMER_H_ -#define _TIMER_H_ +#pragma once #include "CommonTypes.h" #include <string> @@ -42,5 +41,3 @@ private: }; } // Namespace Common - -#endif // _TIMER_H_ diff --git a/Source/Core/Common/x64ABI.h b/Source/Core/Common/x64ABI.h index c315c9cdd0..c08480c2b6 100644 --- a/Source/Core/Common/x64ABI.h +++ b/Source/Core/Common/x64ABI.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JIT_ABI_H_ -#define _JIT_ABI_H_ +#pragma once #include "Common.h" @@ -76,7 +75,3 @@ #endif // WIN32 #endif // X86 - -#endif // _JIT_ABI_H_ - - diff --git a/Source/Core/Common/x64Analyzer.h b/Source/Core/Common/x64Analyzer.h index 778c34738c..110e50de28 100644 --- a/Source/Core/Common/x64Analyzer.h +++ b/Source/Core/Common/x64Analyzer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _X64ANALYZER_H_ -#define _X64ANALYZER_H_ +#pragma once #include "CommonTypes.h" @@ -40,5 +39,3 @@ enum AccessType }; bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info); - -#endif // _X64ANALYZER_H_ diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index d4d3433b68..23d0343422 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -4,8 +4,7 @@ // WARNING - THIS LIBRARY IS NOT THREAD SAFE!!! -#ifndef _DOLPHIN_INTEL_CODEGEN_ -#define _DOLPHIN_INTEL_CODEGEN_ +#pragma once #include "Common.h" #include "MemoryUtil.h" @@ -774,5 +773,3 @@ public: }; } // namespace - -#endif // _DOLPHIN_INTEL_CODEGEN_ diff --git a/Source/Core/Core/ARDecrypt.h b/Source/Core/Core/ARDecrypt.h index c42cf8dc3e..792518c020 100644 --- a/Source/Core/Core/ARDecrypt.h +++ b/Source/Core/Core/ARDecrypt.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ARDECRYPT_H_ -#define _ARDECRYPT_H_ +#pragma once #include <vector> #include "Common.h" @@ -15,5 +14,3 @@ namespace ActionReplay void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry> &ops); } //namespace - -#endif //_ARDECRYPT_H_ diff --git a/Source/Core/Core/ActionReplay.h b/Source/Core/Core/ActionReplay.h index e1d4619065..484ad6e851 100644 --- a/Source/Core/Core/ActionReplay.h +++ b/Source/Core/Core/ActionReplay.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ACTIONREPLAY_H_ -#define _ACTIONREPLAY_H_ +#pragma once #include "IniFile.h" @@ -38,5 +37,3 @@ void EnableSelfLogging(bool enable); const std::vector<std::string> &GetSelfLog(); bool IsSelfLogging(); } // namespace - -#endif // _ACTIONREPLAY_H_ diff --git a/Source/Core/Core/Boot/Boot.h b/Source/Core/Core/Boot/Boot.h index b351ce5ed7..d7df3390e1 100644 --- a/Source/Core/Core/Boot/Boot.h +++ b/Source/Core/Core/Boot/Boot.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _BOOT_H -#define _BOOT_H +#pragma once #include <cstdlib> #include <string> @@ -58,5 +57,3 @@ private: static bool SetupWiiMemory(IVolume::ECountry country); }; - -#endif diff --git a/Source/Core/Core/Boot/Boot_DOL.h b/Source/Core/Core/Boot/Boot_DOL.h index af8681b302..23214ff994 100644 --- a/Source/Core/Core/Boot/Boot_DOL.h +++ b/Source/Core/Core/Boot/Boot_DOL.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _BOOT_DOL_H -#define _BOOT_DOL_H +#pragma once #include "CommonTypes.h" @@ -53,5 +52,3 @@ private: // Copy sections to internal buffers void Initialize(u8* _pBuffer, u32 _Size); }; - -#endif diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.h b/Source/Core/Core/Boot/Boot_WiiWAD.h index de90c5a148..75f6872f4e 100644 --- a/Source/Core/Core/Boot/Boot_WiiWAD.h +++ b/Source/Core/Core/Boot/Boot_WiiWAD.h @@ -1,19 +1,6 @@ -// 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 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #pragma once diff --git a/Source/Core/Core/Boot/ElfReader.h b/Source/Core/Core/Boot/ElfReader.h index bb60d683db..0d2890e1f1 100644 --- a/Source/Core/Core/Boot/ElfReader.h +++ b/Source/Core/Core/Boot/ElfReader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ELFREADER_H -#define _ELFREADER_H +#pragma once #include "ElfTypes.h" @@ -74,6 +73,3 @@ public: return bRelocate; } }; - -#endif - diff --git a/Source/Core/Core/Boot/ElfTypes.h b/Source/Core/Core/Boot/ElfTypes.h index f851298088..f1bf3db722 100644 --- a/Source/Core/Core/Boot/ElfTypes.h +++ b/Source/Core/Core/Boot/ElfTypes.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ELFTYPES_H -#define _ELFTYPES_H +#pragma once // ELF Header Constants @@ -280,6 +279,3 @@ struct Elf32_Dyn Elf32_Addr d_ptr; } d_un; }; - -#endif - diff --git a/Source/Core/Core/BootManager.h b/Source/Core/Core/BootManager.h index 41f3b3f8d0..20dd85f8ab 100644 --- a/Source/Core/Core/BootManager.h +++ b/Source/Core/Core/BootManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _BOOTMANAGER_H -#define _BOOTMANAGER_H +#pragma once #include <string> @@ -15,5 +14,3 @@ bool BootCore(const std::string& _rFilename); void Stop(); }; - -#endif diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 8cc4c37e0c..01cf23d4e8 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CONFIGMANAGER_H -#define _CONFIGMANAGER_H +#pragma once #include <string> #include <vector> @@ -104,6 +103,3 @@ private: static SConfig* m_Instance; }; - -#endif // endif config manager - diff --git a/Source/Core/Core/Console.h b/Source/Core/Core/Console.h index 00b0a83f71..64779aad26 100644 --- a/Source/Core/Core/Console.h +++ b/Source/Core/Core/Console.h @@ -5,10 +5,6 @@ // Simple debugging console currently residing in the Logging window. Not used much. -#ifndef _CONSOLE_H -#define _CONSOLE_H +#pragma once void Console_Submit(const char *cmd); - -#endif - diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h index 2b966ea1db..e24a7e7ac8 100644 --- a/Source/Core/Core/Core.h +++ b/Source/Core/Core/Core.h @@ -9,8 +9,7 @@ // This is another part of the emu that needs cleaning - Core.cpp really has // too much random junk inside. -#ifndef _CORE_H -#define _CORE_H +#pragma once #include <vector> #include <string> @@ -87,6 +86,3 @@ void UpdateTitle(); bool PauseAndLock(bool doLock, bool unpauseOnUnlock=true); } // namespace - -#endif - diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index caef1d4bbb..ee3b11bd79 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COREPARAMETER_H -#define _COREPARAMETER_H +#pragma once #include "IniFile.h" #include <string> @@ -213,5 +212,3 @@ struct SCoreStartupParameter IniFile LoadLocalGameIni() const; IniFile LoadGameIni() const; }; - -#endif diff --git a/Source/Core/Core/CoreTiming.h b/Source/Core/Core/CoreTiming.h index cd8321c10c..21d0e1c2a3 100644 --- a/Source/Core/Core/CoreTiming.h +++ b/Source/Core/Core/CoreTiming.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CORETIMING_H -#define _CORETIMING_H +#pragma once // This is a system to schedule events into the emulated machine's future. Time is measured // in main CPU clock cycles. @@ -84,5 +83,3 @@ extern int downcount; extern int slicelength; }; // end of namespace - -#endif diff --git a/Source/Core/Core/DSP/DSPAccelerator.h b/Source/Core/Core/DSP/DSPAccelerator.h index 05a8db63b2..e9a88aeeb7 100644 --- a/Source/Core/Core/DSP/DSPAccelerator.h +++ b/Source/Core/Core/DSP/DSPAccelerator.h @@ -2,12 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSP_ACCELERATOR_H -#define _DSP_ACCELERATOR_H +#pragma once u16 dsp_read_accelerator(); u16 dsp_read_aram_d3(); void dsp_write_aram_d3(u16 value); - -#endif diff --git a/Source/Core/Core/DSP/DSPAnalyzer.h b/Source/Core/Core/DSP/DSPAnalyzer.h index 61a7d28703..5af1db370d 100644 --- a/Source/Core/Core/DSP/DSPAnalyzer.h +++ b/Source/Core/Core/DSP/DSPAnalyzer.h @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -// Basic code analysis. +#pragma once #include "DSPInterpreter.h" -namespace DSPAnalyzer { - +// Basic code analysis. +namespace DSPAnalyzer +{ #define ISPACE 65536 // Useful things to detect: diff --git a/Source/Core/Core/DSP/DSPBreakpoints.h b/Source/Core/Core/DSP/DSPBreakpoints.h index 6c3eb8be45..e83540f6ad 100644 --- a/Source/Core/Core/DSP/DSPBreakpoints.h +++ b/Source/Core/Core/DSP/DSPBreakpoints.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSP_BREAKPOINTS -#define _DSP_BREAKPOINTS +#pragma once #include "Common.h" @@ -60,5 +59,3 @@ public: private: u8 b[65536]; }; - -#endif diff --git a/Source/Core/Core/DSP/DSPCodeUtil.h b/Source/Core/Core/DSP/DSPCodeUtil.h index b1b05c5329..004cc884c3 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.h +++ b/Source/Core/Core/DSP/DSPCodeUtil.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPCODEUTIL_H -#define _DSPCODEUTIL_H +#pragma once #include <string> #include <vector> @@ -26,5 +25,3 @@ void BinaryStringBEToCode(const std::string &str, std::vector<u16> &code); // Load code (big endian binary). bool LoadBinary(const char *filename, std::vector<u16> &code); bool SaveBinary(const std::vector<u16> &code, const char *filename); - -#endif // _DSPCODEUTIL_H diff --git a/Source/Core/Core/DSP/DSPCommon.h b/Source/Core/Core/DSP/DSPCommon.h index f8abd6ed8a..db171f3154 100644 --- a/Source/Core/Core/DSP/DSPCommon.h +++ b/Source/Core/Core/DSP/DSPCommon.h @@ -2,10 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __DSPCOMMON_H -#define __DSPCOMMON_H +#pragma once #include "CommonTypes.h" typedef u16 UDSPInstruction; - -#endif diff --git a/Source/Core/Core/DSP/DSPCore.h b/Source/Core/Core/DSP/DSPCore.h index 7b6805bd52..6bd1e959a6 100644 --- a/Source/Core/Core/DSP/DSPCore.h +++ b/Source/Core/Core/DSP/DSPCore.h @@ -23,8 +23,7 @@ ====================================================================*/ -#ifndef _DSPCORE_H -#define _DSPCORE_H +#pragma once #include "Thread.h" @@ -301,5 +300,3 @@ void DSPCore_Step(); u16 DSPCore_ReadRegister(int reg); void DSPCore_WriteRegister(int reg, u16 val); - -#endif // _DSPCORE_H diff --git a/Source/Core/Core/DSP/DSPEmitter.h b/Source/Core/Core/DSP/DSPEmitter.h index f44dcc6774..78855553e2 100644 --- a/Source/Core/Core/DSP/DSPEmitter.h +++ b/Source/Core/Core/DSP/DSPEmitter.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPEMITTER_H -#define _DSPEMITTER_H +#pragma once #include <list> @@ -286,7 +285,3 @@ private: void get_ax_h(int _reg, Gen::X64Reg acc = Gen::EAX); void get_long_acc(int _reg, Gen::X64Reg acc = Gen::EAX); }; - - -#endif // _DSPEMITTER_H - diff --git a/Source/Core/Core/DSP/DSPHWInterface.h b/Source/Core/Core/DSP/DSPHWInterface.h index 13ea8cf7a1..b1d226d94c 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.h +++ b/Source/Core/Core/DSP/DSPHWInterface.h @@ -23,8 +23,7 @@ ====================================================================*/ -#ifndef _GDSP_INTERFACE_H -#define _GDSP_INTERFACE_H +#pragma once #include "Common.h" @@ -41,5 +40,3 @@ void gdsp_ifx_init(); void gdsp_ifx_write(u32 addr, u32 val); u16 gdsp_ifx_read(u16 addr); - -#endif diff --git a/Source/Core/Core/DSP/DSPHost.h b/Source/Core/Core/DSP/DSPHost.h index 18ba5ec447..bfe1bd885c 100644 --- a/Source/Core/Core/DSP/DSPHost.h +++ b/Source/Core/Core/DSP/DSPHost.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPHOST_H -#define _DSPHOST_H +#pragma once // The user of the DSPCore library must supply a few functions so that the // emulation core can access the environment it runs in. If the emulation @@ -18,5 +17,3 @@ bool DSPHost_Wii(); void DSPHost_InterruptRequest(); void DSPHost_CodeLoaded(const u8 *ptr, int size); void DSPHost_UpdateDebugger(); - -#endif diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.h b/Source/Core/Core/DSP/DSPIntCCUtil.h index 0f747cf2f0..31e3bbf608 100644 --- a/Source/Core/Core/DSP/DSPIntCCUtil.h +++ b/Source/Core/Core/DSP/DSPIntCCUtil.h @@ -4,8 +4,7 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#ifndef _GDSP_CONDITION_CODES_H -#define _GDSP_CONDITION_CODES_H +#pragma once // Anything to do with SR and conditions goes here. @@ -38,5 +37,3 @@ inline bool isOverS32(s64 acc) { } } // namespace - -#endif // _GDSP_CONDITION_CODES_H diff --git a/Source/Core/Core/DSP/DSPIntExtOps.h b/Source/Core/Core/DSP/DSPIntExtOps.h index d4f3a8dd01..bcd554e6ba 100644 --- a/Source/Core/Core/DSP/DSPIntExtOps.h +++ b/Source/Core/Core/DSP/DSPIntExtOps.h @@ -23,8 +23,7 @@ ====================================================================*/ -#ifndef _GDSP_EXT_OP_H -#define _GDSP_EXT_OP_H +#pragma once #include "DSPTables.h" @@ -64,5 +63,3 @@ void nop(const UDSPInstruction opc); } // end namespace Ext } // end namespace DSPinterpeter - -#endif diff --git a/Source/Core/Core/DSP/DSPIntUtil.h b/Source/Core/Core/DSP/DSPIntUtil.h index 0e48ee77e4..f1e228da38 100644 --- a/Source/Core/Core/DSP/DSPIntUtil.h +++ b/Source/Core/Core/DSP/DSPIntUtil.h @@ -23,8 +23,7 @@ ====================================================================*/ -#ifndef _DSP_INT_UTIL_H -#define _DSP_INT_UTIL_H +#pragma once #include "Common.h" @@ -381,5 +380,3 @@ inline s16 dsp_get_ax_h(int _reg) { return (s16)g_dsp.r.ax[_reg].h; } - -#endif diff --git a/Source/Core/Core/DSP/DSPInterpreter.h b/Source/Core/Core/DSP/DSPInterpreter.h index 7252cd4760..6ceb077ef0 100644 --- a/Source/Core/Core/DSP/DSPInterpreter.h +++ b/Source/Core/Core/DSP/DSPInterpreter.h @@ -2,15 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPINTERPRETER_H -#define _DSPINTERPRETER_H +#pragma once #include "DSPTables.h" #define DSP_REG_MASK 0x1f -namespace DSPInterpreter { - +namespace DSPInterpreter +{ void Step(); // See: DspIntBranch.cpp @@ -152,5 +151,3 @@ void tstprod(const UDSPInstruction opc); void abs(const UDSPInstruction opc); } // namespace - -#endif // _DSPINTERPRETER_H diff --git a/Source/Core/Core/DSP/DSPMemoryMap.h b/Source/Core/Core/DSP/DSPMemoryMap.h index c271537130..55de7f1734 100644 --- a/Source/Core/Core/DSP/DSPMemoryMap.h +++ b/Source/Core/Core/DSP/DSPMemoryMap.h @@ -23,8 +23,7 @@ ====================================================================*/ -#ifndef _GDSP_MEMORY_H -#define _GDSP_MEMORY_H +#pragma once #include "Common.h" #include "DSPInterpreter.h" @@ -51,5 +50,3 @@ inline void dsp_skip_inst() { g_dsp.pc += opTable[dsp_peek_code()]->size; } - -#endif diff --git a/Source/Core/Core/DSP/DSPStacks.h b/Source/Core/Core/DSP/DSPStacks.h index cb808ee8a7..6bb621d085 100644 --- a/Source/Core/Core/DSP/DSPStacks.h +++ b/Source/Core/Core/DSP/DSPStacks.h @@ -23,12 +23,9 @@ ====================================================================*/ -#ifndef _DSP_STACKS_H -#define _DSP_STACKS_H +#pragma once #include "Common.h" void dsp_reg_store_stack(int stack_reg, u16 val); u16 dsp_reg_load_stack(int stack_reg); - -#endif diff --git a/Source/Core/Core/DSP/DSPTables.h b/Source/Core/Core/DSP/DSPTables.h index c57493d6a3..66f29f9fef 100644 --- a/Source/Core/Core/DSP/DSPTables.h +++ b/Source/Core/Core/DSP/DSPTables.h @@ -4,8 +4,7 @@ // Additional copyrights go to Duddie (c) 2005 (duddie@walla.com) -#ifndef _DSPTABLES_H -#define _DSPTABLES_H +#pragma once //nclude "Common.h" #include "DSPEmitter.h" @@ -145,5 +144,3 @@ inline void ExecuteInstruction(const UDSPInstruction inst) applyWriteBackLog(); } } - -#endif // _DSPTABLES_H diff --git a/Source/Core/Core/DSP/Jit/DSPJitRegCache.h b/Source/Core/Core/DSP/Jit/DSPJitRegCache.h index 075be9d99d..c2e27a359c 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitRegCache.h +++ b/Source/Core/Core/DSP/Jit/DSPJitRegCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPJITREGCACHE_H -#define _DSPJITREGCACHE_H +#pragma once #include "x64Emitter.h" @@ -186,5 +185,3 @@ public: //unreserve the given host reg void putXReg(Gen::X64Reg reg); }; - -#endif /*_DSPJITREGCACHE_H*/ diff --git a/Source/Core/Core/DSP/Jit/DSPJitUtil.h b/Source/Core/Core/DSP/Jit/DSPJitUtil.h index a1a43e7047..013cbd45db 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitUtil.h +++ b/Source/Core/Core/DSP/Jit/DSPJitUtil.h @@ -2,7 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __DSPJITUTIL_H__ -#define __DSPJITUTIL_H__ - -#endif /*__DSPJITUTIL_H__*/ +#pragma once diff --git a/Source/Core/Core/DSP/LabelMap.h b/Source/Core/Core/DSP/LabelMap.h index 4f700bb632..c0a822de81 100644 --- a/Source/Core/Core/DSP/LabelMap.h +++ b/Source/Core/Core/DSP/LabelMap.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LABELMAP_H -#define _LABELMAP_H +#pragma once #include <string> #include <vector> @@ -38,5 +37,3 @@ public: bool GetLabelValue(const std::string &label, u16 *value, LabelType type = LABEL_ANY) const; void Clear(); }; - -#endif // _LABELMAP_H diff --git a/Source/Core/Core/DSP/assemble.h b/Source/Core/Core/DSP/assemble.h index 25795c8153..8f77622052 100644 --- a/Source/Core/Core/DSP/assemble.h +++ b/Source/Core/Core/DSP/assemble.h @@ -22,8 +22,7 @@ ====================================================================*/ -#ifndef _DSP_ASSEMBLE_H -#define _DSP_ASSEMBLE_H +#pragma once #include <string> #include <map> @@ -135,5 +134,3 @@ private: int m_current_param; const AssemblerSettings settings_; }; - -#endif // _DSP_ASSEMBLE_H diff --git a/Source/Core/Core/DSP/disassemble.h b/Source/Core/Core/DSP/disassemble.h index c9c0a304c1..3c31695125 100644 --- a/Source/Core/Core/DSP/disassemble.h +++ b/Source/Core/Core/DSP/disassemble.h @@ -22,8 +22,7 @@ ====================================================================*/ -#ifndef _DSP_DISASSEMBLE_H -#define _DSP_DISASSEMBLE_H +#pragma once #include <map> #include <vector> @@ -82,6 +81,3 @@ private: LabelMap labels; }; - -#endif // _DSP_DISASSEMBLE_H - diff --git a/Source/Core/Core/DSPEmulator.h b/Source/Core/Core/DSPEmulator.h index 45b2b30c8c..caf90b0032 100644 --- a/Source/Core/Core/DSPEmulator.h +++ b/Source/Core/Core/DSPEmulator.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPEMULATOR_H_ -#define _DSPEMULATOR_H_ +#pragma once #include "ChunkFile.h" #include "SoundStream.h" @@ -39,5 +38,3 @@ protected: }; DSPEmulator *CreateDSPEmulator(bool HLE); - -#endif // _DSPEMULATOR_H_ diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h index dde4ba0b04..acf92f4243 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.h +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DEBUGGER_SYMBOLMAP_H -#define _DEBUGGER_SYMBOLMAP_H +#pragma once #include <vector> #include <string> @@ -27,6 +26,3 @@ void AddAutoBreakpoints(); } // end of namespace Debugger - -#endif - diff --git a/Source/Core/Core/Debugger/Dump.h b/Source/Core/Core/Debugger/Dump.h index 9908bbb99a..70b6286aea 100644 --- a/Source/Core/Core/Debugger/Dump.h +++ b/Source/Core/Core/Debugger/Dump.h @@ -6,8 +6,7 @@ // Purpose: uncompress the dumps from costis GC-Debugger tool // // -#ifndef _DUMP_H -#define _DUMP_H +#pragma once #include "Common.h" @@ -36,5 +35,3 @@ private: u32 Read32(u32 _pos); }; - -#endif diff --git a/Source/Core/Core/Debugger/GCELF.h b/Source/Core/Core/Debugger/GCELF.h index f47c9bf6a5..cc49c7492c 100644 --- a/Source/Core/Core/Debugger/GCELF.h +++ b/Source/Core/Core/Debugger/GCELF.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef GCELF_H -#define GCELF_H +#pragma once // ELF File Types #define ET_NONE 0 // No file type @@ -111,6 +110,3 @@ typedef struct } Rela_Header; const char ELFID[4] = {0x7F, 'E', 'L', 'F'}; - -#endif - diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h index 71ab0d79c6..7b16f6bb77 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.h +++ b/Source/Core/Core/Debugger/PPCDebugInterface.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PPCDEBUGINTERFACE_H -#define _PPCDEBUGINTERFACE_H +#pragma once #include <string> @@ -43,6 +42,3 @@ public: virtual std::string getDescription(unsigned int address) override; virtual void showJitResults(u32 address) override; }; - -#endif - diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h index fea45007b8..a4c696f7d7 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FIFOANALYZER_H -#define _FIFOANALYZER_H +#pragma once #include "Common.h" @@ -37,5 +36,3 @@ namespace FifoAnalyzer u32 CalculateVertexSize(int vatIndex, const CPMemory &cpMem); void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMem); } - -#endif diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.h b/Source/Core/Core/FifoPlayer/FifoDataFile.h index cb90670252..bddd5469c0 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.h +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FIFODATAFILE_H_ -#define _FIFODATAFILE_H_ +#pragma once #include "Common.h" #include <vector> @@ -95,5 +94,3 @@ private: std::vector<FifoFrameInfo> m_Frames; }; - -#endif diff --git a/Source/Core/Core/FifoPlayer/FifoFileStruct.h b/Source/Core/Core/FifoPlayer/FifoFileStruct.h index 8c8a441fb0..daa4f41f80 100644 --- a/Source/Core/Core/FifoPlayer/FifoFileStruct.h +++ b/Source/Core/Core/FifoPlayer/FifoFileStruct.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FIFOFILESTRUCT_H_ -#define _FIFOFILESTRUCT_H_ +#pragma once #include "Common.h" @@ -68,5 +67,3 @@ struct FileMemoryUpdate #pragma pack(pop) } - -#endif diff --git a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h index e58acbd62a..0db01cea82 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FIFOPLAYBACKANALYZER_H_ -#define _FIFOPLAYBACKANALYZER_H_ +#pragma once #include "FifoAnalyzer.h" #include "FifoDataFile.h" @@ -47,5 +46,3 @@ private: BPMemory m_BpMem; FifoAnalyzer::CPMemory m_CpMem; }; - -#endif diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.h b/Source/Core/Core/FifoPlayer/FifoPlayer.h index 982cd0643f..c6e3318d23 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.h +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FIFOPLAYER_H_ -#define _FIFOPLAYER_H_ +#pragma once #include "FifoPlaybackAnalyzer.h" #include <string> @@ -108,5 +107,3 @@ private: std::vector<AnalyzedFrameInfo> m_FrameInfo; }; - -#endif diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h index af7d1c997d..06edc81114 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FIFORECORDANALYZER_H_ -#define _FIFORECORDANALYZER_H_ +#pragma once #include "FifoAnalyzer.h" @@ -40,5 +39,3 @@ private: BPMemory *m_BpMem; FifoAnalyzer::CPMemory m_CpMem; }; - -#endif diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.h b/Source/Core/Core/FifoPlayer/FifoRecorder.h index 25cad32579..4cee4191e4 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.h +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FIFORECORDER_H_ -#define _FIFORECORDER_H_ +#pragma once #include "FifoDataFile.h" #include "FifoRecordAnalyzer.h" @@ -63,5 +62,3 @@ private: u8 *m_ExRam; FifoRecordAnalyzer m_RecordAnalyzer; }; - -#endif diff --git a/Source/Core/Core/GeckoCode.h b/Source/Core/Core/GeckoCode.h index ec027dcd9d..0ceb9b72c3 100644 --- a/Source/Core/Core/GeckoCode.h +++ b/Source/Core/Core/GeckoCode.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __GECKOCODE_h__ -#define __GECKOCODE_h__ +#pragma once #include "Common.h" @@ -47,5 +46,3 @@ namespace Gecko void RunCodeHandler(); } // namespace Gecko - -#endif diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h index b4902f4574..2878650009 100644 --- a/Source/Core/Core/GeckoCodeConfig.h +++ b/Source/Core/Core/GeckoCodeConfig.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __GECKOCODECONFIG_h__ -#define __GECKOCODECONFIG_h__ +#pragma once #include "GeckoCode.h" @@ -16,5 +15,3 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, std::vector<Ge void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes); }; - -#endif diff --git a/Source/Core/Core/HLE/HLE.h b/Source/Core/Core/HLE/HLE.h index 6c4c46ff4b..6deea0117e 100644 --- a/Source/Core/Core/HLE/HLE.h +++ b/Source/Core/Core/HLE/HLE.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _HLE_H -#define _HLE_H +#pragma once #include <map> #include "CommonTypes.h" @@ -40,6 +39,3 @@ namespace HLE static std::map<u32, u32> orig_instruction; } - -#endif - diff --git a/Source/Core/Core/HLE/HLE_Misc.h b/Source/Core/Core/HLE/HLE_Misc.h index bc3acd143f..3a75edb118 100644 --- a/Source/Core/Core/HLE/HLE_Misc.h +++ b/Source/Core/Core/HLE/HLE_Misc.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef HLE_MISC_H -#define HLE_MISC_H +#pragma once namespace HLE_Misc { @@ -14,5 +13,3 @@ namespace HLE_Misc void OSGetResetCode(); void HLEGeckoCodehandler(); } - -#endif diff --git a/Source/Core/Core/HLE/HLE_OS.h b/Source/Core/Core/HLE/HLE_OS.h index 59e3cf021a..c55f27f456 100644 --- a/Source/Core/Core/HLE/HLE_OS.h +++ b/Source/Core/Core/HLE/HLE_OS.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef HLE_OS_H -#define HLE_OS_H +#pragma once #include "Common.h" @@ -13,5 +12,3 @@ namespace HLE_OS void HLE_write_console(); void HLE_OSPanic(); } - -#endif diff --git a/Source/Core/Core/HW/AudioInterface.h b/Source/Core/Core/HW/AudioInterface.h index 6893cff20f..25086b3df4 100644 --- a/Source/Core/Core/HW/AudioInterface.h +++ b/Source/Core/Core/HW/AudioInterface.h @@ -4,8 +4,7 @@ // See CPP file for comments. -#ifndef _AUDIOINTERFACE_H -#define _AUDIOINTERFACE_H +#pragma once #include "CommonTypes.h" @@ -33,5 +32,3 @@ unsigned int GetAIDSampleRate(); void GenerateAISInterrupt(); } // namespace - -#endif diff --git a/Source/Core/Core/HW/CPU.h b/Source/Core/Core/HW/CPU.h index 219df48370..bba52b6bfc 100644 --- a/Source/Core/Core/HW/CPU.h +++ b/Source/Core/Core/HW/CPU.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CPU_H -#define _CPU_H +#pragma once #include "Common.h" @@ -51,6 +50,3 @@ public: // the return value is whether the cpu was unpaused before the call. static bool PauseAndLock(bool doLock, bool unpauseOnUnlock=true); }; - -#endif - diff --git a/Source/Core/Core/HW/DSP.h b/Source/Core/Core/HW/DSP.h index 2734c659c3..002207c842 100644 --- a/Source/Core/Core/HW/DSP.h +++ b/Source/Core/Core/HW/DSP.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPINTERFACE_H -#define _DSPINTERFACE_H +#pragma once #include "Common.h" class PointerWrap; @@ -55,7 +54,3 @@ void UpdateAudioDMA(); void UpdateDSPSlice(int cycles); }// end of namespace DSP - -#endif - - diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/HW/DSPHLE/DSPHLE.h index 6627b9dc2a..a5c784cb79 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.h +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPHLE_H -#define _DSPHLE_H +#pragma once #include "AudioCommon.h" #include "SoundStream.h" @@ -79,5 +78,3 @@ private: bool m_bHalt; bool m_bAssertInt; }; - -#endif // _DSPHLE_H diff --git a/Source/Core/Core/HW/DSPHLE/HLEMixer.h b/Source/Core/Core/HW/DSPHLE/HLEMixer.h index d19291d567..1e5c21d93e 100644 --- a/Source/Core/Core/HW/DSPHLE/HLEMixer.h +++ b/Source/Core/Core/HW/DSPHLE/HLEMixer.h @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef HLEMIXER_H -#define HLEMIXER_H +#pragma once + #include "AudioCommon.h" #include "Mixer.h" @@ -19,7 +19,3 @@ public: private: DSPHLE *m_DSPHLE; }; - -#endif // HLEMIXER_H - - diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.h b/Source/Core/Core/HW/DSPHLE/MailHandler.h index b203c8c587..b54c163d87 100644 --- a/Source/Core/Core/HW/DSPHLE/MailHandler.h +++ b/Source/Core/Core/HW/DSPHLE/MailHandler.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _MAILHANDLER_H -#define _MAILHANDLER_H +#pragma once #include <queue> @@ -42,6 +41,3 @@ private: // mail handler std::queue<u32> m_Mails; }; - -#endif - diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h index 177e64adb0..53c9328dc4 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h @@ -10,8 +10,7 @@ // * Polyphase sample interpolation support (not very useful) // * Dolby Pro 2 mixing with recent AX versions -#ifndef _UCODE_AX_H -#define _UCODE_AX_H +#pragma once #include "UCodes.h" #include "UCode_AXStructs.h" @@ -179,5 +178,3 @@ private: CMD_SEND_AUX_AND_MIX = 0x13, }; }; - -#endif // !_UCODE_AX_H diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXStructs.h index e4c538bfc5..95c7ad328f 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXStructs.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXStructs.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _UCODE_AX_STRUCTS_H -#define _UCODE_AX_STRUCTS_H +#pragma once struct PBMixer { @@ -332,5 +331,3 @@ enum FILTER_LOWPASS = 1, FILTER_BIQUAD = 2, }; - -#endif // _UCODE_AX_STRUCTS_H diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h index e95d4799d1..713b95e1c8 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _UCODE_AXWII_H -#define _UCODE_AXWII_H +#pragma once #include "UCode_AX.h" @@ -111,5 +110,3 @@ private: CMD_END_OLD = 0x0F }; }; - -#endif // _UCODE_AXWII diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h index 1c08113af2..645dfe3e70 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h @@ -6,8 +6,7 @@ // Wii version of AX. Maybe it would be better to abstract away the parts that // can be made common. -#ifndef _UCODE_AX_VOICE_H -#define _UCODE_AX_VOICE_H +#pragma once #if !defined(AX_GC) && !defined(AX_WII) #error UCode_AX_Voice.h included without specifying version @@ -555,5 +554,3 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl } } // namespace - -#endif // !_UCODE_AX_VOICE_H diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h index a1e1bd901a..64031a104c 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _UCODE_CARD_H -#define _UCODE_CARD_H +#pragma once #include "UCodes.h" @@ -18,5 +17,3 @@ public: void Update(int cycles) override; }; -#endif - diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h index 79d59ac1bc..6d18114b28 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _UCODE_INITAUDIOSYSTEM -#define _UCODE_INITAUDIOSYSTEM +#pragma once #include "UCodes.h" @@ -18,6 +17,3 @@ public: void Update(int cycles) override; void Init(); }; - -#endif - diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h index 791ba588d5..51d5fec866 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _UCODE_ROM -#define _UCODE_ROM +#pragma once #include "UCodes.h" @@ -35,6 +34,3 @@ private: void BootUCode(); }; - -#endif - diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h index 1f33a08a7a..11227d4c67 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _UCODE_ZELDA_H -#define _UCODE_ZELDA_H +#pragma once #include "Common.h" #include "UCodes.h" @@ -293,6 +292,3 @@ private: // Renders a voice and mixes it into LeftBuffer, RightBuffer void RenderAddVoice(ZeldaVoicePB& PB, s32* _LeftBuffer, s32* _RightBuffer, int _Size); }; - -#endif - diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h index 7d0e086bdd..f1995df1ea 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _UCODES_H -#define _UCODES_H +#pragma once #include "Common.h" #include "ChunkFile.h" @@ -140,5 +139,3 @@ private: }; extern IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii); - -#endif diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h index ac34991149..1eca065104 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h +++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPDEBUGINTERFACE_H -#define _DSPDEBUGINTERFACE_H +#pragma once #include <string> #include <string.h> @@ -36,5 +35,3 @@ public: virtual int getColor(unsigned int address); virtual std::string getDescription(unsigned int address); }; - -#endif // _DSPDEBUGINTERFACE_H diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h index 71addf77b0..7197d8f69e 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.h @@ -2,15 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPLLE_H -#define _DSPLLE_H +#pragma once #include "Thread.h" #include "SoundStream.h" #include "DSPLLEGlobals.h" // Local #include "../../DSPEmulator.h" -class DSPLLE : public DSPEmulator { +class DSPLLE : public DSPEmulator +{ public: DSPLLE(); @@ -45,5 +45,3 @@ private: bool m_bIsRunning; volatile u32 m_cycle_count; }; - -#endif // _DSPLLE_H diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h index 4b3902c635..ee845d69ac 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GLOBALS_H -#define _GLOBALS_H +#pragma once #include "Common.h" #include "AudioCommon.h" @@ -18,6 +17,3 @@ void ProfilerAddDelta(int _addr, int _delta); void ProfilerStart(); #endif - -#endif - diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLETools.h b/Source/Core/Core/HW/DSPLLE/DSPLLETools.h index 80545a0b25..4cbfc993d6 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLETools.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLETools.h @@ -2,10 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPLLE_TOOLS_H -#define _DSPLLE_TOOLS_H +#pragma once bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc); bool DumpCWCode(u32 _Address, u32 _Length); - -#endif //_DSPLLE_TOOLS_H diff --git a/Source/Core/Core/HW/DSPLLE/DSPSymbols.h b/Source/Core/Core/HW/DSPLLE/DSPSymbols.h index c9b8214157..1939731796 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPSymbols.h +++ b/Source/Core/Core/HW/DSPLLE/DSPSymbols.h @@ -2,13 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSPSYMBOLS_H -#define _DSPSYMBOLS_H +#pragma once #include "Common.h" #include "SymbolDB.h" -namespace DSPSymbols { +namespace DSPSymbols +{ class DSPSymbolDB : public SymbolDB { @@ -33,6 +33,3 @@ int Line2Addr(int line); // -1 for not found const char *GetLineText(int line); } // namespace DSPSymbols - -#endif - diff --git a/Source/Core/Core/HW/DVDInterface.h b/Source/Core/Core/HW/DVDInterface.h index 61dfb4aeb5..a51a474604 100644 --- a/Source/Core/Core/HW/DVDInterface.h +++ b/Source/Core/Core/HW/DVDInterface.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DVDINTERFACE_H -#define _DVDINTERFACE_H +#pragma once #include "CommonTypes.h" class PointerWrap; @@ -105,5 +104,3 @@ enum DICommand }; } // end of namespace DVDInterface - -#endif diff --git a/Source/Core/Core/HW/EXI.h b/Source/Core/Core/HW/EXI.h index f93af36f43..b60dbda105 100644 --- a/Source/Core/Core/HW/EXI.h +++ b/Source/Core/Core/HW/EXI.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXIINTERFACE_H -#define _EXIINTERFACE_H +#pragma once #include "CommonTypes.h" #include "EXI_Channel.h" @@ -34,5 +33,3 @@ void Read32(u32& _uReturnValue, const u32 _iAddress); void Write32(const u32 _iValue, const u32 _iAddress); } // end of namespace ExpansionInterface - -#endif diff --git a/Source/Core/Core/HW/EXI_Channel.h b/Source/Core/Core/HW/EXI_Channel.h index d47e1be7da..582ea48513 100644 --- a/Source/Core/Core/HW/EXI_Channel.h +++ b/Source/Core/Core/HW/EXI_Channel.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXICHANNEL_H -#define _EXICHANNEL_H +#pragma once #include "CommonTypes.h" @@ -122,5 +121,3 @@ public: // This should only be used to transition interrupts from SP1 to Channel 2 void SetEXIINT(bool exiint) { m_Status.EXIINT = !!exiint; } }; - -#endif diff --git a/Source/Core/Core/HW/EXI_Device.h b/Source/Core/Core/HW/EXI_Device.h index 0b48405033..f83f45d8d4 100644 --- a/Source/Core/Core/HW/EXI_Device.h +++ b/Source/Core/Core/HW/EXI_Device.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXIDEVICE_H -#define _EXIDEVICE_H +#pragma once #include "CommonTypes.h" #include "ChunkFile.h" @@ -56,5 +55,3 @@ public: }; extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int channel_num); - -#endif diff --git a/Source/Core/Core/HW/EXI_DeviceAD16.h b/Source/Core/Core/HW/EXI_DeviceAD16.h index 46a5bf0604..fa35490e31 100644 --- a/Source/Core/Core/HW/EXI_DeviceAD16.h +++ b/Source/Core/Core/HW/EXI_DeviceAD16.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXIDEVICE_AD16_H -#define _EXIDEVICE_AD16_H +#pragma once class CEXIAD16 : public IEXIDevice { @@ -34,6 +33,3 @@ private: virtual void TransferByte(u8& _uByte) override; }; - -#endif - diff --git a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h index 7ac6e9b624..a12b650bf7 100644 --- a/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h +++ b/Source/Core/Core/HW/EXI_DeviceAMBaseboard.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXIDEVICE_AMBASEBOARD_H -#define _EXIDEVICE_AMBASEBOARD_H +#pragma once class CEXIAMBaseboard : public IEXIDevice { @@ -21,5 +20,3 @@ private: bool m_have_irq; unsigned char m_command[4]; }; - -#endif diff --git a/Source/Core/Core/HW/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI_DeviceEthernet.h index 39e6f5c694..803e6f0ac9 100644 --- a/Source/Core/Core/HW/EXI_DeviceEthernet.h +++ b/Source/Core/Core/HW/EXI_DeviceEthernet.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXIDEVICE_ETHERNET_H -#define _EXIDEVICE_ETHERNET_H +#pragma once #ifdef _WIN32 #include <Windows.h> @@ -327,5 +326,3 @@ public: #endif }; - -#endif diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.h b/Source/Core/Core/HW/EXI_DeviceGecko.h index 97bb1b6829..c1d1f7fd07 100644 --- a/Source/Core/Core/HW/EXI_DeviceGecko.h +++ b/Source/Core/Core/HW/EXI_DeviceGecko.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXIDEVICE_GECKO_H -#define _EXIDEVICE_GECKO_H +#pragma once #include "SFML/Network.hpp" #include "Thread.h" @@ -65,6 +64,3 @@ private: static const u32 ident = 0x04700000; }; - -#endif - diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI_DeviceIPL.h index 3198d0b1bd..d821967c4c 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.h +++ b/Source/Core/Core/HW/EXI_DeviceIPL.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXIDEVICE_IPL_H -#define _EXIDEVICE_IPL_H +#pragma once #include "EXI_Device.h" #include "Sram.h" @@ -69,6 +68,3 @@ private: void LoadFileToIPL(std::string filename, u32 offset); }; - -#endif - diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h index 49ab2a55aa..070c519742 100644 --- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXI_DEVICEMEMORYCARD_H -#define _EXI_DEVICEMEMORYCARD_H +#pragma once #include "Thread.h" @@ -91,6 +90,3 @@ private: protected: virtual void TransferByte(u8 &byte) override; }; - -#endif - diff --git a/Source/Core/Core/HW/EXI_DeviceMic.h b/Source/Core/Core/HW/EXI_DeviceMic.h index 3305362934..3ae9d60158 100644 --- a/Source/Core/Core/HW/EXI_DeviceMic.h +++ b/Source/Core/Core/HW/EXI_DeviceMic.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EXI_DEVICEMIC_H -#define _EXI_DEVICEMIC_H +#pragma once #if HAVE_PORTAUDIO @@ -106,5 +105,3 @@ public: }; #endif - -#endif // _EXI_DEVICEMIC_H diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h index ad001de03c..08ca5cef4b 100644 --- a/Source/Core/Core/HW/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __GCMEMCARD_h__ -#define __GCMEMCARD_h__ +#pragma once #include "Common.h" #include "CommonPaths.h" @@ -252,5 +251,3 @@ public: s32 FZEROGX_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &FileBuffer); s32 PSO_MakeSaveGameValid(DEntry& direntry, std::vector<GCMBlock> &FileBuffer); }; -#endif - diff --git a/Source/Core/Core/HW/GCPad.h b/Source/Core/Core/HW/GCPad.h index 4bbe2df41b..e687208b4e 100644 --- a/Source/Core/Core/HW/GCPad.h +++ b/Source/Core/Core/HW/GCPad.h @@ -6,8 +6,7 @@ #include "GCPadStatus.h" #include "../InputCommon/InputConfig.h" -#ifndef _GCPAD_H_ -#define _GCPAD_H_ +#pragma once namespace Pad { @@ -23,5 +22,3 @@ void Motor(u8 _numPAD, unsigned int _uType, unsigned int _uStrength); bool GetMicButton(u8 pad); } - -#endif diff --git a/Source/Core/Core/HW/GCPadEmu.h b/Source/Core/Core/HW/GCPadEmu.h index 94d07b539f..c81f73b276 100644 --- a/Source/Core/Core/HW/GCPadEmu.h +++ b/Source/Core/Core/HW/GCPadEmu.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CONEMU_GCPAD_H_ -#define _CONEMU_GCPAD_H_ +#pragma once #include <string> @@ -37,5 +36,3 @@ private: const unsigned int m_index; }; - -#endif diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h index 973d4eabab..3a895a7bf8 100644 --- a/Source/Core/Core/HW/GPFifo.h +++ b/Source/Core/Core/HW/GPFifo.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GPFIFO_H -#define _GPFIFO_H +#pragma once #include "Common.h" class PointerWrap; @@ -45,5 +44,3 @@ void FastWrite16(const u16 _iValue); void FastWrite32(const u32 _iValue); void FastWrite64(const u64 _iValue); }; - -#endif diff --git a/Source/Core/Core/HW/HW.h b/Source/Core/Core/HW/HW.h index 1fb760dbf4..3ce3bab320 100644 --- a/Source/Core/Core/HW/HW.h +++ b/Source/Core/Core/HW/HW.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _HW_H -#define _HW_H +#pragma once #include "Common.h" #include "ChunkFile.h" @@ -14,5 +13,3 @@ namespace HW void Shutdown(); void DoState(PointerWrap &p); } - -#endif diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h index f7d07b7d7e..1f89148c56 100644 --- a/Source/Core/Core/HW/Memmap.h +++ b/Source/Core/Core/HW/Memmap.h @@ -15,8 +15,7 @@ // Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _MEMMAP_H -#define _MEMMAP_H +#pragma once // Includes #include <string> @@ -186,6 +185,3 @@ extern u32 pagetable_base; extern u32 pagetable_hashmask; }; - -#endif - diff --git a/Source/Core/Core/HW/MemoryInterface.h b/Source/Core/Core/HW/MemoryInterface.h index 2a4fa2a8e1..ad35aef0dd 100644 --- a/Source/Core/Core/HW/MemoryInterface.h +++ b/Source/Core/Core/HW/MemoryInterface.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _MEMORYINTERFACE_H -#define _MEMORYINTERFACE_H +#pragma once #include "Common.h" class PointerWrap; @@ -17,7 +16,3 @@ void Read32(u32& _uReturnValue, const u32 _iAddress); void Write32(const u32 _iValue, const u32 _iAddress); void Write16(const u16 _iValue, const u32 _iAddress); } // end of namespace MemoryInterface - -#endif - - diff --git a/Source/Core/Core/HW/ProcessorInterface.h b/Source/Core/Core/HW/ProcessorInterface.h index 2c0a9d7012..ca7953fa0b 100644 --- a/Source/Core/Core/HW/ProcessorInterface.h +++ b/Source/Core/Core/HW/ProcessorInterface.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PROCESSORINTERFACE_H -#define _PROCESSORINTERFACE_H +#pragma once #include "CommonTypes.h" class PointerWrap; @@ -58,5 +57,3 @@ void SetInterrupt(u32 _causemask, bool _bSet=true); void ResetButton_Tap(); } // namespace ProcessorInterface - -#endif diff --git a/Source/Core/Core/HW/SI.h b/Source/Core/Core/HW/SI.h index 792f63063e..c2225a231e 100644 --- a/Source/Core/Core/HW/SI.h +++ b/Source/Core/Core/HW/SI.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _SERIALINTERFACE_H -#define _SERIALINTERFACE_H +#pragma once #include "Common.h" #include "SI_Device.h" @@ -38,5 +37,3 @@ void Write32(const u32 _iValue, const u32 _iAddress); int GetTicksToNextSIPoll(); }; // end of namespace SerialInterface - -#endif diff --git a/Source/Core/Core/HW/SI_Device.h b/Source/Core/Core/HW/SI_Device.h index 5faefa8d55..a0912988e1 100644 --- a/Source/Core/Core/HW/SI_Device.h +++ b/Source/Core/Core/HW/SI_Device.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _SIDEVICE_H -#define _SIDEVICE_H +#pragma once #include "Common.h" @@ -97,5 +96,3 @@ public: }; extern ISIDevice* SIDevice_Create(const SIDevices device, const int port_number); - -#endif diff --git a/Source/Core/Core/HW/SI_DeviceAMBaseboard.h b/Source/Core/Core/HW/SI_DeviceAMBaseboard.h index e847568b4d..0344e46edb 100644 --- a/Source/Core/Core/HW/SI_DeviceAMBaseboard.h +++ b/Source/Core/Core/HW/SI_DeviceAMBaseboard.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _SIDEVICE_AMBASEBOARD_H -#define _SIDEVICE_AMBASEBOARD_H +#pragma once // triforce (GC-AM) baseboard class CSIDevice_AMBaseboard : public ISIDevice @@ -28,5 +27,3 @@ public: // send a command directly virtual void SendCommand(u32 _Cmd, u8 _Poll) override; }; - -#endif // _SIDEVICE_AMBASEBOARD_H diff --git a/Source/Core/Core/HW/SI_DeviceDanceMat.h b/Source/Core/Core/HW/SI_DeviceDanceMat.h index 14636c0b4e..6fd73c3c64 100644 --- a/Source/Core/Core/HW/SI_DeviceDanceMat.h +++ b/Source/Core/Core/HW/SI_DeviceDanceMat.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _SI_DEVICEDANCEMAT_H -#define _SI_DEVICEDANCEMAT_H +#pragma once #include "SI_Device.h" #include "GCPadStatus.h" @@ -101,5 +100,3 @@ public: // Savestate support virtual void DoState(PointerWrap& p) override; }; - -#endif diff --git a/Source/Core/Core/HW/SI_DeviceGBA.h b/Source/Core/Core/HW/SI_DeviceGBA.h index 2e9a4ae075..9611c50d21 100644 --- a/Source/Core/Core/HW/SI_DeviceGBA.h +++ b/Source/Core/Core/HW/SI_DeviceGBA.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _SI_DEVICEGBA_H -#define _SI_DEVICEGBA_H +#pragma once #include "SFML/Network.hpp" @@ -44,5 +43,3 @@ public: virtual bool GetData(u32& _Hi, u32& _Low) override { return true; } virtual void SendCommand(u32 _Cmd, u8 _Poll) override {} }; - -#endif diff --git a/Source/Core/Core/HW/SI_DeviceGCController.h b/Source/Core/Core/HW/SI_DeviceGCController.h index 30087ca4ed..e5b1405fc4 100644 --- a/Source/Core/Core/HW/SI_DeviceGCController.h +++ b/Source/Core/Core/HW/SI_DeviceGCController.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _SI_DEVICEGCCONTROLLER_H -#define _SI_DEVICEGCCONTROLLER_H +#pragma once #include "SI_Device.h" #include "GCPadStatus.h" @@ -116,5 +115,3 @@ public: return true; } }; - -#endif diff --git a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h index 8bf9f4fe70..2a677288ba 100644 --- a/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h +++ b/Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _SI_DEVICEGCSTEERINGWHEEL_H -#define _SI_DEVICEGCSTEERINGWHEEL_H +#pragma once #include "SI_Device.h" #include "GCPadStatus.h" @@ -102,5 +101,3 @@ public: // Savestate support virtual void DoState(PointerWrap& p); }; - -#endif diff --git a/Source/Core/Core/HW/Sram.h b/Source/Core/Core/HW/Sram.h index 4c9b3d3c05..f678cd8f1d 100644 --- a/Source/Core/Core/HW/Sram.h +++ b/Source/Core/Core/HW/Sram.h @@ -33,8 +33,7 @@ distribution. -------------------------------------------------------------*/ -#ifndef __SRAM_h__ -#define __SRAM_h__ +#pragma once #include "CommonTypes.h" @@ -69,4 +68,3 @@ void SetCardFlashID(u8* buffer, u8 card_index); extern SRAM sram_dump; extern SRAM g_SRAM; -#endif diff --git a/Source/Core/Core/HW/StreamADPCM.h b/Source/Core/Core/HW/StreamADPCM.h index 797eca1d5f..5a1f836d9d 100644 --- a/Source/Core/Core/HW/StreamADPCM.h +++ b/Source/Core/Core/HW/StreamADPCM.h @@ -4,8 +4,7 @@ // Adapted from in_cube by hcs & destop -#ifndef _STREAMADPCM_H -#define _STREAMADPCM_H +#pragma once #include "Common.h" @@ -21,6 +20,3 @@ public: static void InitFilter(); static void DecodeBlock(s16 *pcm, const u8 *adpcm); }; - -#endif - diff --git a/Source/Core/Core/HW/SystemTimers.h b/Source/Core/Core/HW/SystemTimers.h index ef69f6e65a..ff7e59f530 100644 --- a/Source/Core/Core/HW/SystemTimers.h +++ b/Source/Core/Core/HW/SystemTimers.h @@ -15,8 +15,7 @@ // Official Git repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _SYSTEMTIMERS_H -#define _SYSTEMTIMERS_H +#pragma once #include "CommonTypes.h" @@ -36,5 +35,3 @@ void TimeBaseSet(); u64 GetFakeTimeBase(); } - -#endif diff --git a/Source/Core/Core/HW/VideoInterface.h b/Source/Core/Core/HW/VideoInterface.h index 6ea32d265a..b7e5f62a7e 100644 --- a/Source/Core/Core/HW/VideoInterface.h +++ b/Source/Core/Core/HW/VideoInterface.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VIDEOINTERFACE_H -#define _VIDEOINTERFACE_H +#pragma once #include "CommonTypes.h" class PointerWrap; @@ -350,5 +349,3 @@ union UVIDTVStatus int GetNumFields(); }; - -#endif // _VIDEOINTERFACE_H diff --git a/Source/Core/Core/HW/WII_IOB.h b/Source/Core/Core/HW/WII_IOB.h index cdca7f6c8f..ccfd29c3e0 100644 --- a/Source/Core/Core/HW/WII_IOB.h +++ b/Source/Core/Core/HW/WII_IOB.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IOBRIDGE_H_ -#define _WII_IOBRIDGE_H_ +#pragma once #include "Common.h" class PointerWrap; @@ -28,7 +27,3 @@ void Write32(const u32 _Value, const u32 _Address); void Write64(const u64 _Value, const u32 _Address); } // end of namespace AudioInterface - -#endif - - diff --git a/Source/Core/Core/HW/WII_IPC.h b/Source/Core/Core/HW/WII_IPC.h index 4cc6c369b9..1f598418b7 100644 --- a/Source/Core/Core/HW/WII_IPC.h +++ b/Source/Core/Core/HW/WII_IPC.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_H_ -#define _WII_IPC_H_ +#pragma once #include "Common.h" class PointerWrap; @@ -47,5 +46,3 @@ void GenerateReply(u32 _Address); bool IsReady(); } - -#endif diff --git a/Source/Core/Core/HW/Wiimote.h b/Source/Core/Core/HW/Wiimote.h index 0772dc7b0b..434a3beb23 100644 --- a/Source/Core/Core/HW/Wiimote.h +++ b/Source/Core/Core/HW/Wiimote.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WIIMOTE_H_ -#define _WIIMOTE_H_ +#pragma once #include "../InputCommon/InputConfig.h" #include "ChunkFile.h" @@ -63,5 +62,3 @@ void Refresh(); void LoadSettings(); } - -#endif diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h index 4ddb5e86f0..ba49885c86 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ATTACHMENT_EMU_H_ -#define _ATTACHMENT_EMU_H_ +#pragma once #include "ControllerEmu.h" #include "../WiimoteEmu.h" @@ -34,5 +33,3 @@ public: }; } - -#endif diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h index 75452d58c0..edcd57c877 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#pragma once + #include "Attachment.h" namespace WiimoteEmu @@ -41,5 +43,4 @@ private: AnalogStick* m_right_stick; }; - } diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h index 0ed6a540fa..1228a98e81 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#pragma once + #include "Attachment.h" namespace WiimoteEmu @@ -32,5 +34,4 @@ private: AnalogStick* m_stick; }; - } diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h index 952fcde165..3ab4fae65f 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#pragma once + #include "Attachment.h" namespace WiimoteEmu @@ -35,5 +37,4 @@ private: AnalogStick* m_stick; }; - } diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h index 13d85ba889..beb65949ce 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef NUNCHUCK_H -#define NUNCHUCK_H +#pragma once #include "Attachment.h" @@ -42,5 +41,3 @@ private: }; } - -#endif diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h index b593b89cae..8275961eb4 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#pragma once + #include "Attachment.h" namespace WiimoteEmu @@ -38,5 +40,4 @@ private: Slider* m_crossfade; }; - } diff --git a/Source/Core/Core/HW/WiimoteEmu/Encryption.h b/Source/Core/Core/HW/WiimoteEmu/Encryption.h index 7088367d51..828433db0d 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Encryption.h +++ b/Source/Core/Core/HW/WiimoteEmu/Encryption.h @@ -4,10 +4,7 @@ // // Copyright (C) Hector Martin "marcan" (hector@marcansoft.com) - -#ifndef WIIMOTE_EXTENSION_ENCRYPTION_H -#define WIIMOTE_EXTENSION_ENCRYPTION_H - +#pragma once // =================================================== /* They key structure to use with wiimote_gen_key() */ @@ -23,7 +20,3 @@ void wiimote_encrypt(const wiimote_key* const key, u8* const data, int addr, con void wiimote_decrypt(const wiimote_key* const key, u8* const data, int addr, const u8 len); void wiimote_gen_key(wiimote_key* const key, const u8* const keydata); - - -#endif - diff --git a/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h b/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h index 867b944b48..42944cdfd1 100644 --- a/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h +++ b/Source/Core/Core/HW/WiimoteEmu/MatrixMath.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef MATRIXMATH_H -#define MATRIXMATH_H +#pragma once #include <math.h> @@ -89,5 +88,3 @@ inline void MatrixTransformVertex(Matrix const & m, Vertex & v) v.z/=w; } } - -#endif diff --git a/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h b/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h index e7d9cb94f8..8e9ac254ea 100644 --- a/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h +++ b/Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h @@ -4,8 +4,7 @@ //UDP Wiimote Translation Layer -#ifndef UDPTLAYER_H -#define UDPTLAYER_H +#pragma once #include "UDPWiimote.h" #include "WiimoteEmu.h" @@ -53,5 +52,3 @@ namespace UDPTLayer *z = 0; } } - -#endif diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h index 674b33fd62..8b24fcfac5 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CONEMU_WIIMOTE_H_ -#define _CONEMU_WIIMOTE_H_ +#pragma once #include "../../Core.h" @@ -248,5 +247,3 @@ private: void Spy(Wiimote* wm_, const void* data_, size_t size_); } - -#endif diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h index 11c8d0be66..01b4018356 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteHid.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef WIIMOTE_HID_H -#define WIIMOTE_HID_H +#pragma once #include "CommonTypes.h" @@ -408,5 +407,3 @@ struct gh3_cal }; #pragma pack(pop) - -#endif //WIIMOTE_HID_H diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index 36cd3a6b81..90b124772b 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef WIIMOTE_REAL_H -#define WIIMOTE_REAL_H +#pragma once #include <functional> #include <vector> @@ -185,5 +183,3 @@ bool IsValidBluetoothName(const std::string& name); bool IsBalanceBoardName(const std::string& name); }; // WiimoteReal - -#endif diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteRealBase.h b/Source/Core/Core/HW/WiimoteReal/WiimoteRealBase.h index 82c18f6ec2..f9997a38ff 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteRealBase.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteRealBase.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef WIIMOTE_COMM_H -#define WIIMOTE_COMM_H +#pragma once #ifdef _WIN32 #include <windows.h> @@ -60,5 +59,3 @@ enum win_bt_stack_t MSBT_STACK_BLUESOLEIL }; #endif - -#endif // WIIMOTE_COMM_H diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h index 67c74faba8..94d4b42261 100644 --- a/Source/Core/Core/Host.h +++ b/Source/Core/Core/Host.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _HOST_H -#define _HOST_H +#pragma once // Host - defines an interface for the emulator core to communicate back to the @@ -45,5 +44,3 @@ void Host_UpdateTitle(const char* title); // TODO (neobrain): Remove these from host! void* Host_GetInstance(); void* Host_GetRenderHandle(); - -#endif diff --git a/Source/Core/Core/IPC_HLE/ICMP.h b/Source/Core/Core/IPC_HLE/ICMP.h index b446c63336..de7e9294fa 100644 --- a/Source/Core/Core/IPC_HLE/ICMP.h +++ b/Source/Core/Core/IPC_HLE/ICMP.h @@ -1,5 +1,4 @@ -#ifndef _ICMP_H_ -#define _ICMP_H_ +#pragma once #ifdef _WIN32 #include <winsock2.h> @@ -11,5 +10,3 @@ int icmp_echo_req(const u32 s, const sockaddr_in *addr, const u8 *data, const u32 data_length); int icmp_echo_rep(const u32 s, sockaddr_in *addr, const u32 timeout, const u32 data_length); - -#endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h index 5f492015f5..7d18cb4498 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_H_ -#define _WII_IPC_HLE_H_ +#pragma once #include "ChunkFile.h" @@ -65,6 +64,3 @@ enum ECommandType }; } // end of namespace WII_IPC_HLE_Interface - -#endif - diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h index 9e220a85d2..37c14746f8 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_H_ -#define _WII_IPC_HLE_DEVICE_H_ +#pragma once #include <string> #include <queue> @@ -253,5 +252,3 @@ public: return true; } }; - -#endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h index e5b19e4ab7..fb9b466a4a 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_DI_H_ -#define _WII_IPC_HLE_DEVICE_DI_H_ +#pragma once #include "WII_IPC_HLE_Device.h" @@ -38,5 +37,3 @@ private: // This flag seems to only be reset with poweron/off, not sure u32 m_CoverStatus; }; - -#endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h index df059208c6..0b7ac92d8b 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_FILEIO_H_ -#define _WII_IPC_HLE_DEVICE_FILEIO_H_ +#pragma once #include "WII_IPC_HLE_Device.h" #include "FileUtil.h" @@ -67,6 +66,3 @@ private: std::string m_filepath; }; - -#endif - diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h index 63b4fac225..2dd22dfc58 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_ES_H_ -#define _WII_IPC_HLE_DEVICE_ES_H_ +#pragma once #include <map> #include "WII_IPC_HLE_Device.h" @@ -156,5 +155,3 @@ private: u8 padding [0x3c]; } ecc_cert_t; }; - -#endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h index 7604afed8d..05c6569b52 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_FS_H_ -#define _WII_IPC_HLE_DEVICE_FS_H_ +#pragma once #include "WII_IPC_HLE_Device.h" @@ -65,6 +64,3 @@ private: s32 ExecuteCommand(u32 Parameter, u32 _BufferIn, u32 _BufferInSize, u32 _BufferOut, u32 _BufferOutSize); }; - -#endif - diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h index 0b4551d530..a33459244a 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_HID_H_ -#define _WII_IPC_HLE_DEVICE_HID_H_ +#pragma once #include "WII_IPC_HLE.h" #include "WII_IPC_HLE_Device.h" @@ -138,5 +137,3 @@ private: std::list<_hidevent> event_list; }; - -#endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h index 10446f299d..38d4728af4 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_NET_H_ -#define _WII_IPC_HLE_DEVICE_NET_H_ +#pragma once #include "WII_IPC_HLE_Device.h" @@ -733,5 +732,3 @@ private: }; #pragma pack(pop) }; - -#endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h index d8901f987d..25b1abdef0 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_NET_SSL_H_ -#define _WII_IPC_HLE_DEVICE_NET_SSL_H_ +#pragma once #include "WII_IPC_HLE_Device.h" @@ -54,7 +53,8 @@ enum SSL_IOCTL IOCTLV_NET_SSL_DEBUGGETTIME = 0x15, }; -typedef struct { +typedef struct +{ ssl_context ctx; ssl_session session; havege_state hs; @@ -83,7 +83,4 @@ public: int getSSLFreeID(); static WII_SSL _SSL[NET_SSL_MAXINSTANCES]; - }; - -#endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h index fb56eef715..6987fdf465 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h @@ -4,8 +4,7 @@ // PRELIMINARY - seems to fully work with libogc, writing has yet to be tested -#ifndef _WII_IPC_HLE_DEVICE_SDIO_SLOT0_H_ -#define _WII_IPC_HLE_DEVICE_SDIO_SLOT0_H_ +#pragma once #include "WII_IPC_HLE_Device.h" @@ -125,5 +124,3 @@ private: u32 _BufferOut, u32 BufferOutSize); void OpenInternal(); }; - -#endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h index 8c796a458c..7af9a5ab48 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_STM_H_ -#define _WII_IPC_HLE_DEVICE_STM_H_ +#pragma once #include "WII_IPC_HLE_Device.h" @@ -189,5 +188,3 @@ public: // STATE_TO_SAVE u32 m_EventHookAddress; }; - -#endif diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h index 6f7e496e85..e9034db38f 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_DEVICE_USB_KBD_H_ -#define _WII_IPC_HLE_DEVICE_USB_KBD_H_ +#pragma once class CWII_IPC_HLE_Device_usb_kbd : public IWII_IPC_HLE_Device { @@ -64,5 +63,3 @@ private: static u8 m_KeyCodesQWERTY[256]; static u8 m_KeyCodesAZERTY[256]; }; - -#endif // _WII_IPC_HLE_DEVICE_USB_KBD_H_ diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h index 7c9444f1f0..5e4bd85beb 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_IPC_HLE_WII_MOTE_ -#define _WII_IPC_HLE_WII_MOTE_ +#pragma once #include <map> #include <string> @@ -144,6 +143,3 @@ private: u16 AddAttribToList(int _AttribID, u8* _pBuffer); }; - -#endif - diff --git a/Source/Core/Core/IPC_HLE/WII_Socket.h b/Source/Core/Core/IPC_HLE/WII_Socket.h index 07d05d02e1..5bfaa5a172 100644 --- a/Source/Core/Core/IPC_HLE/WII_Socket.h +++ b/Source/Core/Core/IPC_HLE/WII_Socket.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_SOCKET_H_ -#define _WII_SOCKET_H_ - +#pragma once #ifdef _WIN32 #include <ws2tcpip.h> @@ -244,5 +242,3 @@ private: s32 errono_last; }; - -#endif diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h index ac21d4cd48..13633aaf01 100644 --- a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h +++ b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef WIIMOTE_HID_ATTR_H_ -#define WIIMOTE_HID_ATTR_H_ +#pragma once #if 0 struct SAttrib @@ -25,6 +24,3 @@ const CAttribTable& GetAttribTable(); #endif const u8* GetAttribPacket(u32 serviceHandle, u32 cont, u32& _size); - -#endif - diff --git a/Source/Core/Core/MemTools.h b/Source/Core/Core/MemTools.h index 2bdd088377..7dc7e20600 100644 --- a/Source/Core/Core/MemTools.h +++ b/Source/Core/Core/MemTools.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _MEMTOOLS_H -#define _MEMTOOLS_H +#pragma once #include "CommonTypes.h" @@ -13,5 +12,3 @@ namespace EMM typedef u32 EAddr; void InstallExceptionHandler(); } - -#endif diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index 346c2682a3..912b8cb633 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __MOVIE_H -#define __MOVIE_H +#pragma once #include "Common.h" #include "../InputCommon/GCPadStatus.h" @@ -184,5 +183,3 @@ typedef void(*ManipFunction)(SPADStatus *, int); void SetInputManip(ManipFunction); void CallInputManip(SPADStatus *PadStatus, int controllerID); }; - -#endif // __MOVIE_H diff --git a/Source/Core/Core/NetPlayClient.h b/Source/Core/Core/NetPlayClient.h index 1a3ec64df8..933072c292 100644 --- a/Source/Core/Core/NetPlayClient.h +++ b/Source/Core/Core/NetPlayClient.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _NETPLAY_H -#define _NETPLAY_H +#pragma once #include "Common.h" #include "CommonTypes.h" @@ -131,5 +130,3 @@ private: void NetPlay_Enable(NetPlayClient* const np); void NetPlay_Disable(); - -#endif diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index e887dc482a..be99a8860a 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _NETPLAY_PROTO_H -#define _NETPLAY_PROTO_H +#pragma once #include "Common.h" #include "CommonTypes.h" @@ -76,5 +75,3 @@ enum namespace NetPlay { bool IsNetPlayRunning(); }; - -#endif diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h index 12f4dbc372..b08ab98b51 100644 --- a/Source/Core/Core/NetPlayServer.h +++ b/Source/Core/Core/NetPlayServer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _NETPLAY_SERVER_H -#define _NETPLAY_SERVER_H +#pragma once #include "Common.h" #include "CommonTypes.h" @@ -111,5 +110,3 @@ private: static std::thread m_upnp_thread; #endif }; - -#endif diff --git a/Source/Core/Core/PatchEngine.h b/Source/Core/Core/PatchEngine.h index ba3d155bf4..e347a0758c 100644 --- a/Source/Core/Core/PatchEngine.h +++ b/Source/Core/Core/PatchEngine.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PATCHENGINE_H -#define _PATCHENGINE_H +#pragma once #include "IniFile.h" @@ -65,5 +64,3 @@ inline int GetPatchTypeCharLength(PatchType type) } } // namespace - -#endif //_PATCHENGINE_H diff --git a/Source/Core/Core/PowerPC/CPUCoreBase.h b/Source/Core/Core/PowerPC/CPUCoreBase.h index c8465f7707..2e4848f690 100644 --- a/Source/Core/Core/PowerPC/CPUCoreBase.h +++ b/Source/Core/Core/PowerPC/CPUCoreBase.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CPUCOREBASE_H -#define _CPUCOREBASE_H +#pragma once class CPUCoreBase { @@ -17,5 +16,3 @@ public: virtual void SingleStep() = 0; virtual const char *GetName() = 0; }; - -#endif diff --git a/Source/Core/Core/PowerPC/GDBStub.h b/Source/Core/Core/PowerPC/GDBStub.h index 300f74bf91..93330ce05d 100644 --- a/Source/Core/Core/PowerPC/GDBStub.h +++ b/Source/Core/Core/PowerPC/GDBStub.h @@ -1,24 +1,10 @@ -// Copyright (C) 2010 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 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. // Originally written by Sven Peter <sven@fail0verflow.com> for anergistic. -#ifndef GDB_H__ -#define GDB_H__ +#pragma once #include <signal.h> #include "Common.h" @@ -55,5 +41,3 @@ int gdb_bp_w(u32 addr); int gdb_bp_a(u32 addr); bool gdb_add_bp(u32 type, u32 addr, u32 len); - -#endif diff --git a/Source/Core/Core/PowerPC/Gekko.h b/Source/Core/Core/PowerPC/Gekko.h index 5c631a5b28..2695b9a004 100644 --- a/Source/Core/Core/PowerPC/Gekko.h +++ b/Source/Core/Core/PowerPC/Gekko.h @@ -5,8 +5,7 @@ // Gekko related unions, structs, ... -#ifndef _GEKKO_H -#define _GEKKO_H +#pragma once #include "Common.h" @@ -787,6 +786,3 @@ enum inline s32 SignExt16(s16 x) {return (s32)(s16)x;} inline s32 SignExt26(u32 x) {return x & 0x2000000 ? (s32)(x | 0xFC000000) : (s32)(x);} - -#endif - diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h index dfbe4eb003..b6b68bfcd5 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _INTERPRETER_H -#define _INTERPRETER_H +#pragma once #include "Atomic.h" #include "../Gekko.h" @@ -332,5 +331,3 @@ private: static bool g_bReserve; static u32 g_reserveAddr; }; - -#endif diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h index 9190a18ed7..2c1b0f7076 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _INTERPRETER_FPUTILS_H -#define _INTERPRETER_FPUTILS_H +#pragma once #include "CPUDetect.h" #include "Interpreter.h" @@ -232,5 +231,3 @@ inline u32 ConvertToSingleFTZ(u64 x) return (x >> 32) & 0x80000000; } } - -#endif diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h index c9f193b4df..fe96067840 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.h @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef INTERPRETER_TABLES_H -#define INTERPRETER_TABLES_H +#pragma once + #include "../Gekko.h" #include "../PPCTables.h" #include "Interpreter.h" @@ -12,4 +12,3 @@ namespace InterpreterTables { void InitTables(); } -#endif diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index 0c8132e823..dbec3e0174 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -16,8 +16,7 @@ // Settings // ---------- -#ifndef _JIT64_H -#define _JIT64_H +#pragma once #include "../JitCommon/JitBackpatch.h" #include "../JitCommon/JitBase.h" @@ -221,5 +220,3 @@ public: void icbi(UGeckoInstruction inst); }; - -#endif // _JIT64_H diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h index e77343c496..4a45405a9f 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef JIT64_TABLES_H -#define JIT64_TABLES_H +#pragma once #include "../Gekko.h" #include "../PPCTables.h" @@ -14,4 +13,3 @@ namespace Jit64Tables void CompileInstruction(PPCAnalyst::CodeOp & op); void InitTables(); } -#endif diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.h b/Source/Core/Core/PowerPC/Jit64/JitAsm.h index 7dc55b475d..4399663f80 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitAsm.h +++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JIT64ASM_H -#define _JIT64ASM_H +#pragma once #include "../JitCommon/JitAsmCommon.h" @@ -40,5 +39,3 @@ public: }; extern Jit64AsmRoutineManager asm_routines; - -#endif // _JIT64ASM_H diff --git a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h index f27dcae91c..db9c377633 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitRegCache.h +++ b/Source/Core/Core/PowerPC/Jit64/JitRegCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JIT64REGCACHE_H -#define _JIT64REGCACHE_H +#pragma once #include "x64Emitter.h" @@ -144,5 +143,3 @@ public: const int *GetAllocationOrder(int &count) override; OpArg GetDefaultLocation(int reg) const override; }; - -#endif // _JIT64REGCACHE_H diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h index f22d4202cc..2e5e382e5d 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h @@ -14,8 +14,7 @@ // * A flush simply does a conditional write to the appropriate CRx. // * If flag available, branch code can become absolutely trivial. -#ifndef _JITIL_H -#define _JITIL_H +#pragma once #include "JitILAsm.h" #include "x64Emitter.h" @@ -126,5 +125,3 @@ public: void DynaRunTable59(UGeckoInstruction _inst) override; void DynaRunTable63(UGeckoInstruction _inst) override; }; - -#endif // _JITIL_H diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h index f2c30a78e8..6af6b441f9 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h +++ b/Source/Core/Core/PowerPC/Jit64IL/JitILAsm.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JITASM_H -#define _JITASM_H +#pragma once #include "x64Emitter.h" #include "../JitCommon/JitAsmCommon.h" @@ -41,5 +40,3 @@ public: }; extern JitILAsmRoutineManager jitil_asm_routines; - -#endif diff --git a/Source/Core/Core/PowerPC/JitArm32/Jit.h b/Source/Core/Core/PowerPC/JitArm32/Jit.h index 9655ae73a8..7e29964645 100644 --- a/Source/Core/Core/PowerPC/JitArm32/Jit.h +++ b/Source/Core/Core/PowerPC/JitArm32/Jit.h @@ -29,8 +29,8 @@ // Settings // ---------- -#ifndef _JITARM_H -#define _JITARM_H +#pragma once + #include "../CPUCoreBase.h" #include "../PPCAnalyst.h" #include "JitArmCache.h" @@ -255,5 +255,3 @@ public: void psq_st(UGeckoInstruction _inst); void psq_stx(UGeckoInstruction _inst); }; - -#endif // _JIT64_H diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArmCache.h b/Source/Core/Core/PowerPC/JitArm32/JitArmCache.h index 103947d5ad..8f0cc4997b 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArmCache.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitArmCache.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef _JITARMCACHE_H -#define _JITARMCACHE_H +#pragma once #include "../JitCommon/JitCache.h" @@ -29,5 +15,3 @@ private: void WriteLinkBlock(u8* location, const u8* address); void WriteDestroyBlock(const u8* location, u32 address); }; - -#endif diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_FPUtils.h b/Source/Core/Core/PowerPC/JitArm32/JitArm_FPUtils.h index 52815f571b..41b794aea5 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_FPUtils.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_FPUtils.h @@ -1,6 +1,8 @@ // Copyright 2013 Dolphin Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. +#pragma once + #include "../Interpreter/Interpreter_FPUtils.h" #include "Jit.h" diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.h b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.h index 4904ce3984..c858d771f6 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_Tables.h @@ -15,8 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef JITARM_TABLES_H -#define JITARM_TABLES_H +#pragma once #include "../Gekko.h" #include "../PPCTables.h" @@ -26,4 +25,3 @@ namespace JitArmTables void CompileInstruction(PPCAnalyst::CodeOp & op); void InitTables(); } -#endif diff --git a/Source/Core/Core/PowerPC/JitArm32/JitAsm.h b/Source/Core/Core/PowerPC/JitArm32/JitAsm.h index 9fcf49d4ec..a7cabda1dc 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitAsm.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitAsm.h @@ -15,8 +15,8 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#ifndef _JITARMASM_H -#define _JITARMASM_H +#pragma once + #include "ArmEmitter.h" #include "../JitCommon/JitAsmCommon.h" using namespace ArmGen; @@ -39,5 +39,3 @@ public: }; extern JitArmAsmRoutineManager asm_routines; - -#endif // _JIT64ASM_H diff --git a/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.h b/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.h index 233b201b7c..807e200cdb 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitFPRCache.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef _JITARMFPRCACHE_H -#define _JITARMFPRCACHE_H +#pragma once #include "ArmEmitter.h" #include "../Gekko.h" @@ -61,4 +47,3 @@ public: ARMReg R0(u32 preg, bool preLoad = true); // Returns a cached register ARMReg R1(u32 preg, bool preLoad = true); }; -#endif diff --git a/Source/Core/Core/PowerPC/JitArm32/JitRegCache.h b/Source/Core/Core/PowerPC/JitArm32/JitRegCache.h index e1ac5fe0b7..6271f58116 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitRegCache.h +++ b/Source/Core/Core/PowerPC/JitArm32/JitRegCache.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef _JITARMREGCACHE_H -#define _JITARMREGCACHE_H +#pragma once #include "ArmEmitter.h" #include "../Gekko.h" @@ -139,8 +125,3 @@ public: void SetImmediate(u32 preg, u32 imm); ARMReg BindToRegister(u32 preg); }; - - - - -#endif diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL.h b/Source/Core/Core/PowerPC/JitArmIL/JitIL.h index 5aaa7c583e..595e1dc526 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL.h +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JITARMIL_H -#define _JITARMIL_H +#pragma once #include "../PPCAnalyst.h" #include "ArmEmitter.h" @@ -90,5 +89,3 @@ public: void bclrx(UGeckoInstruction inst); void bcctrx(UGeckoInstruction inst); }; - -#endif diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.h b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.h index e8e401445a..884baf20e4 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.h +++ b/Source/Core/Core/PowerPC/JitArmIL/JitILAsm.h @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JITARMILASM_H -#define _JITARMILASM_H +#pragma once + #include "ArmEmitter.h" #include "../JitCommon/JitAsmCommon.h" using namespace ArmGen; @@ -26,7 +26,3 @@ public: }; extern JitArmILAsmRoutineManager armil_asm_routines; - -#endif - - diff --git a/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.h b/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.h index 9402b9d444..8e6e0bcd25 100644 --- a/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.h +++ b/Source/Core/Core/PowerPC/JitArmIL/JitIL_Tables.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef JITARMIL_TABLES_H -#define JITARMIL_TABLES_H +#pragma once #include "../Gekko.h" #include "../PPCTables.h" @@ -13,4 +12,3 @@ namespace JitArmILTables void CompileInstruction(PPCAnalyst::CodeOp & op); void InitTables(); } -#endif diff --git a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h index c593909c76..a25df9889e 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h @@ -2,12 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JITASMCOMMON_H -#define _JITASMCOMMON_H +#pragma once #include "Jit_Util.h" -class CommonAsmRoutinesBase { +class CommonAsmRoutinesBase +{ public: const u8 *fifoDirectWrite8; @@ -65,5 +65,3 @@ public: void GenFifoFloatWrite(); }; - -#endif diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h index a937ffd0eb..1d6a031b24 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JITBACKPATCH_H -#define _JITBACKPATCH_H +#pragma once #include "Common.h" #include "x64Emitter.h" @@ -248,5 +247,3 @@ public: const u8 *GetReadTrampoline(const InstructionInfo &info, u32 registersInUse); const u8 *GetWriteTrampoline(const InstructionInfo &info, u32 registersInUse); }; - -#endif diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h index 05c877df6f..920d4611e3 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JITBASE_H -#define _JITBASE_H +#pragma once //#define JIT_LOG_X86 // Enables logging of the generated x86 code //#define JIT_LOG_GPR // Enables logging of the PPC general purpose regs @@ -119,5 +118,3 @@ void Jit(u32 em_address); // Merged routines that should be moved somewhere better u32 Helper_Mask(u8 mb, u8 me); void LogGeneratedX86(int size, PPCAnalyst::CodeBuffer *code_buffer, const u8 *normalEntry, JitBlock *b); - -#endif diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.h b/Source/Core/Core/PowerPC/JitCommon/JitCache.h index b81c5d837a..f795a020a7 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JITCACHE_H -#define _JITCACHE_H +#pragma once #include <bitset> #include <map> @@ -131,4 +130,3 @@ private: void WriteLinkBlock(u8* location, const u8* address) override; void WriteDestroyBlock(const u8* location, u32 address) override; }; -#endif diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h index a321ddd117..278b9d7352 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included./ -#ifndef _JITUTIL_H -#define _JITUTIL_H +#pragma once #include "x64Emitter.h" #include <unordered_map> @@ -51,5 +50,3 @@ public: protected: std::unordered_map<u8 *, u32> registersInUseAtLoc; }; - -#endif // _JITUTIL_H diff --git a/Source/Core/Core/PowerPC/JitILCommon/IR.h b/Source/Core/Core/PowerPC/JitILCommon/IR.h index f3246e77b0..49a1e4e341 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/IR.h +++ b/Source/Core/Core/PowerPC/JitILCommon/IR.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef IR_H -#define IR_H +#pragma once #include "x64Emitter.h" #include <vector> @@ -590,5 +589,3 @@ private: }; }; - -#endif diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h index 37529c1613..e92e27cfd0 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _JITILBASE_H -#define _JITILBASE_H +#pragma once #include "IR.h" #include "../PowerPC.h" @@ -143,4 +142,3 @@ public: void subfex(UGeckoInstruction inst); }; -#endif diff --git a/Source/Core/Core/PowerPC/JitInterface.h b/Source/Core/Core/PowerPC/JitInterface.h index 288330c707..2b6b970631 100644 --- a/Source/Core/Core/PowerPC/JitInterface.h +++ b/Source/Core/Core/PowerPC/JitInterface.h @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#pragma once + #include "ChunkFile.h" #include "CPUCoreBase.h" diff --git a/Source/Core/Core/PowerPC/LUT_frsqrtex.h b/Source/Core/Core/PowerPC/LUT_frsqrtex.h index 4785eda56f..72d641c8ff 100644 --- a/Source/Core/Core/PowerPC/LUT_frsqrtex.h +++ b/Source/Core/Core/PowerPC/LUT_frsqrtex.h @@ -2,12 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - // Gekko related unions, structs, ... -#ifndef _LUT_frsqrtex_h_ -#define _LUT_frsqrtex_h_ +#pragma once extern const unsigned int frsqrtex_lut[65536]; - -#endif //_LUT_frsqrtex_h_ diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.h b/Source/Core/Core/PowerPC/PPCAnalyst.h index db7a52c812..21b192f514 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.h +++ b/Source/Core/Core/PowerPC/PPCAnalyst.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PPCANALYST_H -#define _PPCANALYST_H +#pragma once #include <algorithm> #include <vector> @@ -105,6 +104,3 @@ void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB *func_db); bool AnalyzeFunction(u32 startAddr, Symbol &func, int max_size = 0); } // namespace - -#endif - diff --git a/Source/Core/Core/PowerPC/PPCCache.h b/Source/Core/Core/PowerPC/PPCCache.h index b2ff2471e3..b38692d728 100644 --- a/Source/Core/Core/PowerPC/PPCCache.h +++ b/Source/Core/Core/PowerPC/PPCCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PPCCACHE_H -#define _PPCCACHE_H +#pragma once #include "CommonTypes.h" @@ -44,5 +43,3 @@ namespace PowerPC }; } - -#endif diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.h b/Source/Core/Core/PowerPC/PPCSymbolDB.h index 27b80eb683..fc732575c2 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.h +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.h @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#pragma once + #include "CommonTypes.h" #include <map> diff --git a/Source/Core/Core/PowerPC/PPCTables.h b/Source/Core/Core/PowerPC/PPCTables.h index 4cdf2e113f..b54260f3cd 100644 --- a/Source/Core/Core/PowerPC/PPCTables.h +++ b/Source/Core/Core/PowerPC/PPCTables.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PPCTABLES_H -#define _PPCTABLES_H +#pragma once #include "Gekko.h" #include "Interpreter/Interpreter.h" @@ -113,4 +112,3 @@ void LogCompiledInstructions(); const char *GetInstructionName(UGeckoInstruction _inst); } // namespace -#endif diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h index a5c2bac0d5..2b5c58f09e 100644 --- a/Source/Core/Core/PowerPC/PowerPC.h +++ b/Source/Core/Core/PowerPC/PowerPC.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _POWERPC_H -#define _POWERPC_H +#pragma once #include "Common.h" #include "CPUCoreBase.h" @@ -206,5 +205,3 @@ inline void SetXER_SO(int value) { } void UpdateFPRF(double dvalue); - -#endif diff --git a/Source/Core/Core/PowerPC/Profiler.h b/Source/Core/Core/PowerPC/Profiler.h index d70483b2de..420b4244d4 100644 --- a/Source/Core/Core/PowerPC/Profiler.h +++ b/Source/Core/Core/PowerPC/Profiler.h @@ -3,8 +3,7 @@ // Refer to the license.txt file included. -#ifndef _PROFILER_H -#define _PROFILER_H +#pragma once #ifdef _WIN32 @@ -61,5 +60,3 @@ extern bool g_ProfileInstructions; void WriteProfileResults(const char *filename); } - -#endif // _PROFILER_H diff --git a/Source/Core/Core/PowerPC/SignatureDB.h b/Source/Core/Core/PowerPC/SignatureDB.h index c2e83dca83..4d0e451d18 100644 --- a/Source/Core/Core/PowerPC/SignatureDB.h +++ b/Source/Core/Core/PowerPC/SignatureDB.h @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#pragma once + #include "CommonTypes.h" #include <map> diff --git a/Source/Core/Core/State.h b/Source/Core/Core/State.h index 8da3a4d537..b24e31424f 100644 --- a/Source/Core/Core/State.h +++ b/Source/Core/Core/State.h @@ -5,8 +5,7 @@ // Emulator state saving support. -#ifndef _STATE_H_ -#define _STATE_H_ +#pragma once #include <string> #include <vector> @@ -62,5 +61,3 @@ typedef void(*CallbackFunc)(void); void SetOnAfterLoadCallback(CallbackFunc callback); } - -#endif diff --git a/Source/Core/Core/Tracer.h b/Source/Core/Core/Tracer.h index 8f06a8966b..013cbd45db 100644 --- a/Source/Core/Core/Tracer.h +++ b/Source/Core/Core/Tracer.h @@ -2,9 +2,4 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TRACER_H_ -#define _TRACER_H_ - - -#endif - +#pragma once diff --git a/Source/Core/Core/VolumeHandler.h b/Source/Core/Core/VolumeHandler.h index 11387d115c..ca47074bb0 100644 --- a/Source/Core/Core/VolumeHandler.h +++ b/Source/Core/Core/VolumeHandler.h @@ -6,8 +6,7 @@ // Disc volume handler. It's here because Wii discs can consist of multiple volumes. // GC discs are seen as one big volume. -#ifndef _VOLUMEHANDLER_H_ -#define _VOLUMEHANDLER_H_ +#pragma once #include <string> #include "CommonTypes.h" @@ -31,5 +30,3 @@ DiscIO::IVolume *GetVolume(); void EjectVolume(); } // end of namespace VolumeHandler - -#endif diff --git a/Source/Core/Core/ec_wii.h b/Source/Core/Core/ec_wii.h index 0cf73d7d82..0874fe5cef 100644 --- a/Source/Core/Core/ec_wii.h +++ b/Source/Core/Core/ec_wii.h @@ -22,8 +22,7 @@ * # see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt */ -#ifndef _ECWII_H -#define _ECWII_H +#pragma once #include "Common.h" @@ -109,5 +108,3 @@ private: #pragma pack(pop) }; - -#endif 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 - diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.h b/Source/Core/DolphinWX/ARCodeAddEdit.h index cdc9e95077..e621308613 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.h +++ b/Source/Core/DolphinWX/ARCodeAddEdit.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __ARCODE_ADDEDIT_h__ -#define __ARCODE_ADDEDIT_h__ +#pragma once #include <wx/wx.h> #include <wx/spinctrl.h> @@ -40,4 +39,3 @@ class CARCodeAddEdit : public wxDialog int selection; }; -#endif // __PATCH_ADDEDIT_h__ diff --git a/Source/Core/DolphinWX/AboutDolphin.h b/Source/Core/DolphinWX/AboutDolphin.h index 4c31f6493a..c9fd71495f 100644 --- a/Source/Core/DolphinWX/AboutDolphin.h +++ b/Source/Core/DolphinWX/AboutDolphin.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _ABOUTDOLPHIN_H_ -#define _ABOUTDOLPHIN_H_ +#pragma once #include <wx/wx.h> #include <wx/dialog.h> @@ -23,5 +22,3 @@ class AboutDolphin : public wxDialog const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE); }; - -#endif //_ABOUTDOLPHIN_H_ diff --git a/Source/Core/DolphinWX/CheatsWindow.h b/Source/Core/DolphinWX/CheatsWindow.h index c7cdb7f151..6ebbbad1a1 100644 --- a/Source/Core/DolphinWX/CheatsWindow.h +++ b/Source/Core/DolphinWX/CheatsWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __CHEATSWINDOW_H__ -#define __CHEATSWINDOW_H__ +#pragma once #include <wx/wx.h> #include <wx/sizer.h> @@ -158,6 +157,3 @@ class wxCheatsWindow : public wxDialog // $ Enable Logging Checkbox void OnEvent_CheckBoxEnableLogging_StateChange(wxCommandEvent& event); }; - -#endif - diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h index b2f30b17dc..04ccc965fe 100644 --- a/Source/Core/DolphinWX/ConfigMain.h +++ b/Source/Core/DolphinWX/ConfigMain.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __CONFIG_MAIN_h__ -#define __CONFIG_MAIN_h__ +#pragma once #include <wx/wx.h> #include <wx/gbsizer.h> @@ -254,4 +253,3 @@ private: static bool SupportsVolumeChanges(std::string backend); }; -#endif diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.h b/Source/Core/DolphinWX/Debugger/BreakpointDlg.h index 208f1038b9..3699fc9212 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointDlg.h +++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __BREAKPOINTDLG_h__ -#define __BREAKPOINTDLG_h__ - +#pragma once #include <wx/wx.h> @@ -23,5 +21,3 @@ private: DECLARE_EVENT_TABLE(); }; - -#endif diff --git a/Source/Core/DolphinWX/Debugger/BreakpointView.h b/Source/Core/DolphinWX/Debugger/BreakpointView.h index 08c38de97e..564760fd16 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointView.h +++ b/Source/Core/DolphinWX/Debugger/BreakpointView.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __BREAKPOINTVIEW_h__ -#define __BREAKPOINTVIEW_h__ +#pragma once #include <wx/listctrl.h> #include "Common.h" @@ -16,5 +15,3 @@ public: void Update(); void DeleteCurrentSelection(); }; - -#endif diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h index 4f54e823aa..9efccb7149 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h +++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __BREAKPOINTWINDOW_h__ -#define __BREAKPOINTWINDOW_h__ +#pragma once #include <wx/wx.h> #include <wx/listctrl.h> @@ -45,5 +44,3 @@ private: void OnClose(wxCloseEvent& event); void OnSelectBP(wxListEvent& event); }; - -#endif diff --git a/Source/Core/DolphinWX/Debugger/CodeView.h b/Source/Core/DolphinWX/Debugger/CodeView.h index fcd3164eec..18bed46557 100644 --- a/Source/Core/DolphinWX/Debugger/CodeView.h +++ b/Source/Core/DolphinWX/Debugger/CodeView.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef CODEVIEW_H_ -#define CODEVIEW_H_ +#pragma once #define wxUSE_XPM_IN_MSW 1 #define USE_XPM_BITMAPS 1 @@ -81,5 +80,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif /*CODEVIEW_H_*/ diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h index 2b5b24d6eb..59ad2bb2c8 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.h +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef CODEWINDOW_H_ -#define CODEWINDOW_H_ +#pragma once #include <wx/dialog.h> #include <wx/textctrl.h> @@ -141,5 +140,3 @@ class CCodeWindow DECLARE_EVENT_TABLE() }; - -#endif // CODEWINDOW_H_ diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h index 6f5f68a060..3f71321fb0 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DSP_DEBUGGER_LLE_H -#define _DSP_DEBUGGER_LLE_H +#pragma once // general things #include <iostream> @@ -85,5 +84,3 @@ private: }; extern DSPDebuggerLLE* m_DebuggerFrame; - -#endif //_DSP_DEBUGGER_LLE_H diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h index fbafb08b03..946a540b30 100644 --- a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h +++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __DSPREGISTERVIEW_h__ -#define __DSPREGISTERVIEW_h__ +#pragma once #include <wx/grid.h> @@ -39,5 +38,3 @@ public: DSPRegisterView(wxWindow* parent, wxWindowID id); void Update(); }; - -#endif //__DSPREGISTERVIEW_h__ diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h index 90d4773841..3d9e65ef2b 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GFX_DEBUGGER_PANEL_H_ -#define _GFX_DEBUGGER_PANEL_H_ +#pragma once #include <wx/wx.h> #include <wx/notebook.h> @@ -96,5 +95,3 @@ private: void OnClearPixelShaderCacheButton(wxCommandEvent& event); void OnCountEnter(wxCommandEvent& event); }; - -#endif // _GFX_DEBUGGER_PANEL_H_ diff --git a/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.h b/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.h index fb268fcd54..783a1fdbfe 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.h +++ b/Source/Core/DolphinWX/Debugger/DebuggerUIUtil.h @@ -2,11 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DEBUGGER_UI_UTIL_H -#define _DEBUGGER_UI_UTIL_H +#pragma once #include <wx/wx.h> extern wxFont DebuggerFont; - -#endif diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.h b/Source/Core/DolphinWX/Debugger/JitWindow.h index 3860241531..e91f7d7893 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.h +++ b/Source/Core/DolphinWX/Debugger/JitWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef JITWINDOW_H_ -#define JITWINDOW_H_ +#pragma once #include <vector> @@ -55,5 +54,3 @@ private: void OnAddrBoxChange(wxCommandEvent& event); void OnHostMessage(wxCommandEvent& event); }; - -#endif /*MEMORYWINDOW_*/ diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h index cc212fb88b..f53a90ef60 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h +++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __MEMORYCHECKDLG_h__ -#define __MEMORYCHECKDLG_h__ +#pragma once #include <wx/wx.h> @@ -27,5 +26,3 @@ class MemoryCheckDlg : public wxDialog DECLARE_EVENT_TABLE(); }; - -#endif diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.h b/Source/Core/DolphinWX/Debugger/MemoryView.h index 3bfdc03db5..327efc6c42 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.h +++ b/Source/Core/DolphinWX/Debugger/MemoryView.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef MEMORYVIEW_H_ -#define MEMORYVIEW_H_ +#pragma once #include "DebuggerUIUtil.h" #include "Common.h" @@ -57,5 +56,3 @@ private: DECLARE_EVENT_TABLE() }; - -#endif // MEMORYVIEW_H_ diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h index b480934526..9cd74399c8 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef MEMORYWINDOW_H_ -#define MEMORYWINDOW_H_ +#pragma once #include <wx/dialog.h> #include <wx/textctrl.h> @@ -68,5 +67,3 @@ class CMemoryWindow void OnDumpMem2(wxCommandEvent& event); void OnDumpFakeVMEM(wxCommandEvent& event); }; - -#endif /*MEMORYWINDOW_*/ diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.h b/Source/Core/DolphinWX/Debugger/RegisterView.h index 18b1d96bc3..9cb046bd4e 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.h +++ b/Source/Core/DolphinWX/Debugger/RegisterView.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __REGISTERVIEW_h__ -#define __REGISTERVIEW_h__ +#pragma once #include <wx/grid.h> @@ -65,5 +64,3 @@ public: CRegisterView(wxWindow* parent, wxWindowID id); void Update(); }; - -#endif diff --git a/Source/Core/DolphinWX/Debugger/RegisterWindow.h b/Source/Core/DolphinWX/Debugger/RegisterWindow.h index dad48088ed..f1d8db1125 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterWindow.h +++ b/Source/Core/DolphinWX/Debugger/RegisterWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __REGISTERWINDOW_h__ -#define __REGISTERWINDOW_h__ +#pragma once class CRegisterView; class IniFile; @@ -33,5 +32,3 @@ private: CRegisterView* m_GPRGridView; void CreateGUIControls(); }; - -#endif diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.h b/Source/Core/DolphinWX/FifoPlayerDlg.h index 1d6b8e3895..774991b2d9 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.h +++ b/Source/Core/DolphinWX/FifoPlayerDlg.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __FIFO_PLAYER_DLG_h__ -#define __FIFO_PLAYER_DLG_h__ +#pragma once #include <vector> #include <wx/wx.h> @@ -116,4 +115,3 @@ private: s32 m_FramesToRecord; }; -#endif diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index 4abf453041..0f54002fb7 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __FRAME_H_ -#define __FRAME_H_ +#pragma once #include <wx/wx.h> // wxWidgets #include <wx/busyinfo.h> @@ -352,6 +351,3 @@ void OnAfterLoadCallback(); // For TASInputDlg void TASManipFunction(SPADStatus *PadStatus, int controllerID); bool TASInputHasFocus(); - -#endif // __FRAME_H_ - diff --git a/Source/Core/DolphinWX/GLInterface/AGL.cpp b/Source/Core/DolphinWX/GLInterface/AGL.cpp index c0be0c18b0..ffe3b68dd2 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp @@ -1,19 +1,6 @@ -// 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 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "VideoConfig.h" #include "Host.h" diff --git a/Source/Core/DolphinWX/GLInterface/AGL.h b/Source/Core/DolphinWX/GLInterface/AGL.h index cc35f81477..1554f71b36 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.h +++ b/Source/Core/DolphinWX/GLInterface/AGL.h @@ -1,21 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ -#ifndef _INTERFACEAGL_H_ -#define _INTERFACEAGL_H_ +#pragma once #ifdef __APPLE__ #import <AppKit/AppKit.h> @@ -35,5 +22,3 @@ public: void SwapInterval(int interval); }; -#endif - diff --git a/Source/Core/DolphinWX/GLInterface/EGL.h b/Source/Core/DolphinWX/GLInterface/EGL.h index 2a26e65f12..f3e8e5bb88 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.h +++ b/Source/Core/DolphinWX/GLInterface/EGL.h @@ -1,21 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ -#ifndef _INTERFACEEGL_H_ -#define _INTERFACEEGL_H_ +#pragma once #include <EGL/egl.h> #include "InterfaceBase.h" @@ -59,5 +46,3 @@ public: bool MakeCurrent(); void Shutdown(); }; -#endif - diff --git a/Source/Core/DolphinWX/GLInterface/GLInterface.h b/Source/Core/DolphinWX/GLInterface/GLInterface.h index f3dc32c4b8..96cf56134d 100644 --- a/Source/Core/DolphinWX/GLInterface/GLInterface.h +++ b/Source/Core/DolphinWX/GLInterface/GLInterface.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GLINTERFACE_H_ -#define _GLINTERFACE_H_ +#pragma once #include "Thread.h" @@ -111,5 +110,3 @@ typedef struct { extern cInterfaceBase *GLInterface; extern GLWindow GLWin; - -#endif diff --git a/Source/Core/DolphinWX/GLInterface/GLX.cpp b/Source/Core/DolphinWX/GLInterface/GLX.cpp index 47ae9ece94..d124b1dbda 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp @@ -1,19 +1,6 @@ -// 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 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "Host.h" #include "RenderBase.h" diff --git a/Source/Core/DolphinWX/GLInterface/GLX.h b/Source/Core/DolphinWX/GLInterface/GLX.h index 4f09a63d08..92cabf3829 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.h +++ b/Source/Core/DolphinWX/GLInterface/GLX.h @@ -1,21 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ -#ifndef _INTERFACEGLX_H_ -#define _INTERFACEGLX_H_ +#pragma once #include "X11_Util.h" #include "InterfaceBase.h" @@ -35,5 +22,3 @@ public: bool ClearCurrent(); void Shutdown(); }; -#endif - diff --git a/Source/Core/DolphinWX/GLInterface/InterfaceBase.h b/Source/Core/DolphinWX/GLInterface/InterfaceBase.h index 895b496580..c13bfe8421 100644 --- a/Source/Core/DolphinWX/GLInterface/InterfaceBase.h +++ b/Source/Core/DolphinWX/GLInterface/InterfaceBase.h @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GLINTERFACEBASE_H_ -#define _GLINTERFACEBASE_H_ +#pragma once + enum GLInterfaceMode { MODE_DETECT = 0, MODE_OPENGL, @@ -37,4 +37,3 @@ public: virtual void Update() { } virtual bool PeekMessages() { return false; } }; -#endif diff --git a/Source/Core/DolphinWX/GLInterface/WGL.h b/Source/Core/DolphinWX/GLInterface/WGL.h index d355221bbb..22f7b3e9cd 100644 --- a/Source/Core/DolphinWX/GLInterface/WGL.h +++ b/Source/Core/DolphinWX/GLInterface/WGL.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _INTERFACEWGL_H_ -#define _INTERFACEWGL_H_ +#pragma once #include "InterfaceBase.h" @@ -22,5 +21,3 @@ public: void Update(); bool PeekMessages(); }; -#endif - diff --git a/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp b/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp index 3f6475e4ef..f2e0fb1a40 100644 --- a/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp +++ b/Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp @@ -1,19 +1,6 @@ // Copyright (C) 2013 Scott Moreau <oreaus@gmail.com> - -// 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/ +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "Core.h" #include "State.h" diff --git a/Source/Core/DolphinWX/GLInterface/Wayland_Util.h b/Source/Core/DolphinWX/GLInterface/Wayland_Util.h index 6c3a10a7d6..db38c5c953 100644 --- a/Source/Core/DolphinWX/GLInterface/Wayland_Util.h +++ b/Source/Core/DolphinWX/GLInterface/Wayland_Util.h @@ -1,21 +1,8 @@ // Copyright (C) 2013 Scott Moreau <oreaus@gmail.com> +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ -#ifndef _WAYLAND_UTIL_H_ -#define _WAYLAND_UTIL_H_ +#pragma once #include <wayland-client.h> #include <wayland-egl.h> diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.h b/Source/Core/DolphinWX/GLInterface/X11_Util.h index 1e62375fbb..94ebce38f1 100644 --- a/Source/Core/DolphinWX/GLInterface/X11_Util.h +++ b/Source/Core/DolphinWX/GLInterface/X11_Util.h @@ -1,21 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ -#ifndef _X11_UTIL_H_ -#define _X11_UTIL_H_ +#pragma once #include <X11/Xlib.h> #include <X11/keysym.h> @@ -45,5 +32,3 @@ public: void DestroyXWindow(void); }; #endif - -#endif diff --git a/Source/Core/DolphinWX/GameListCtrl.h b/Source/Core/DolphinWX/GameListCtrl.h index 7ac02eae16..114f1484bc 100644 --- a/Source/Core/DolphinWX/GameListCtrl.h +++ b/Source/Core/DolphinWX/GameListCtrl.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __GAMELIST_CTRL_H_ -#define __GAMELIST_CTRL_H_ +#pragma once #include <memory> #include <vector> @@ -109,6 +108,3 @@ private: static void CompressCB(const char* text, float percent, void* arg); static void MultiCompressCB(const char* text, float percent, void* arg); }; - -#endif - diff --git a/Source/Core/DolphinWX/GeckoCodeDiag.h b/Source/Core/DolphinWX/GeckoCodeDiag.h index c961e221e3..356e1c747f 100644 --- a/Source/Core/DolphinWX/GeckoCodeDiag.h +++ b/Source/Core/DolphinWX/GeckoCodeDiag.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __GECKOCODEDIAG_h__ -#define __GECKOCODEDIAG_h__ +#pragma once #include "GeckoCode.h" #include "GeckoCodeConfig.h" @@ -47,9 +46,4 @@ private: wxButton* btn_download; }; - - } - -#endif - diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 2cb8a41519..0bdde92e3b 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -5,9 +5,7 @@ // This file holds global data for DolphinWx and DebuggerWx - -#ifndef _WX_GLOBALS_H -#define _WX_GLOBALS_H +#pragma once #include "Common.h" @@ -281,5 +279,3 @@ enum ), extern const wxEventType wxEVT_HOST_COMMAND; - -#endif // _WX_GLOBALS_H diff --git a/Source/Core/DolphinWX/HotkeyDlg.h b/Source/Core/DolphinWX/HotkeyDlg.h index 0bf31d4739..4c389ea534 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.h +++ b/Source/Core/DolphinWX/HotkeyDlg.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __HOTKEYDIALOG_h__ -#define __HOTKEYDIALOG_h__ +#pragma once #include <wx/wx.h> #include <wx/textctrl.h> @@ -57,5 +56,3 @@ class HotkeyConfigDialog : public wxDialog int GetButtonWaitingID, GetButtonWaitingTimer, g_Pressed, g_Modkey; }; -#endif - diff --git a/Source/Core/DolphinWX/ISOFile.h b/Source/Core/DolphinWX/ISOFile.h index ffab089a1d..724413f340 100644 --- a/Source/Core/DolphinWX/ISOFile.h +++ b/Source/Core/DolphinWX/ISOFile.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __ISOFILE_H_ -#define __ISOFILE_H_ +#pragma once #include <vector> #include <string> @@ -91,6 +90,3 @@ private: std::string CreateCacheFilename(); }; - - -#endif diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index 6e73ea119a..82c8bd48a2 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __ISOPROPERTIES_h__ -#define __ISOPROPERTIES_h__ +#pragma once #include <wx/wx.h> #include <wx/sizer.h> @@ -214,4 +213,3 @@ private: void SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox); void SaveGameIniValueFrom3StateCheckbox(const char* section, const char* key, wxCheckBox* checkbox); }; -#endif diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index cf88046aeb..f84adc36ac 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CONFIGBOX_H_ -#define _CONFIGBOX_H_ +#pragma once #define SLIDER_TICK_COUNT 100 #define DETECT_WAIT_TIME 1500 @@ -240,5 +239,3 @@ private: InputPlugin& m_plugin; wxTimer* m_update_timer; }; - -#endif diff --git a/Source/Core/DolphinWX/LogConfigWindow.h b/Source/Core/DolphinWX/LogConfigWindow.h index c246bb169c..a08e3884ca 100644 --- a/Source/Core/DolphinWX/LogConfigWindow.h +++ b/Source/Core/DolphinWX/LogConfigWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LOG_CONFIG_DIAG_H_ -#define _LOG_CONFIG_DIAG_H_ +#pragma once #include <vector> #include <wx/wx.h> @@ -42,5 +41,3 @@ private: void ToggleLog(int _logType, bool enable); void OnLogCheck(wxCommandEvent& event); }; - -#endif // _LOG_CONFIG_DIAG_H_ diff --git a/Source/Core/DolphinWX/LogWindow.h b/Source/Core/DolphinWX/LogWindow.h index 451c90cba8..f2957d5abf 100644 --- a/Source/Core/DolphinWX/LogWindow.h +++ b/Source/Core/DolphinWX/LogWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef LOGWINDOW_H_ -#define LOGWINDOW_H_ +#pragma once #include "LogManager.h" #include "Frame.h" @@ -79,5 +78,3 @@ private: // LogListener const char *getName() const { return "LogWindow"; } }; - -#endif /*LOGWINDOW_H_*/ diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h index 08d67e4dda..cb932c1424 100644 --- a/Source/Core/DolphinWX/Main.h +++ b/Source/Core/DolphinWX/Main.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __MAIN_H_ -#define __MAIN_H_ +#pragma once #include "Frame.h" @@ -37,5 +36,3 @@ private: }; DECLARE_APP(DolphinApp); - -#endif diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index 4310fbcfcf..df05e9245a 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __MEMCARD_MANAGER_h__ -#define __MEMCARD_MANAGER_h__ +#pragma once #include <wx/wx.h> #include <wx/sizer.h> @@ -151,5 +150,3 @@ class CMemcardManager : public wxDialog CMemcardListCtrl *m_MemcardList[2]; }; - -#endif diff --git a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h index 9132adf2f9..b2a3f7ee51 100644 --- a/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h +++ b/Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _WII_SAVE_CRYPTED -#define _WII_SAVE_CRYPTED +#pragma once #include "StringUtil.h" #include "Crypto/tools.h" @@ -125,5 +124,3 @@ private: }; #pragma pack(pop) }; - -#endif diff --git a/Source/Core/DolphinWX/NetWindow.h b/Source/Core/DolphinWX/NetWindow.h index 0e55862259..a645c0a9bf 100644 --- a/Source/Core/DolphinWX/NetWindow.h +++ b/Source/Core/DolphinWX/NetWindow.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _NETWINDOW_H_ -#define _NETWINDOW_H_ +#pragma once #include "CommonTypes.h" @@ -142,6 +141,3 @@ namespace NetPlay { void StopGame(); } - -#endif // _NETWINDOW_H_ - diff --git a/Source/Core/DolphinWX/PHackSettings.h b/Source/Core/DolphinWX/PHackSettings.h index 336f26886d..efa7d00b1d 100644 --- a/Source/Core/DolphinWX/PHackSettings.h +++ b/Source/Core/DolphinWX/PHackSettings.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __PHACK_SETTINGS_h__ -#define __PHACK_SETTINGS_h__ +#pragma once #include <wx/wx.h> #include <wx/spinctrl.h> @@ -47,5 +46,3 @@ class CPHackSettings : public wxDialog void SavePHackData(wxCommandEvent& event); void LoadPHackData(); }; - -#endif // __PHACK_SETTINGS_h__ diff --git a/Source/Core/DolphinWX/PatchAddEdit.h b/Source/Core/DolphinWX/PatchAddEdit.h index cb64c40c67..a5bc1f3791 100644 --- a/Source/Core/DolphinWX/PatchAddEdit.h +++ b/Source/Core/DolphinWX/PatchAddEdit.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __PATCH_ADDEDIT_h__ -#define __PATCH_ADDEDIT_h__ +#pragma once #include <wx/wx.h> #include <wx/spinctrl.h> @@ -56,4 +55,3 @@ class CPatchAddEdit : public wxDialog std::vector<PatchEngine::PatchEntry>::iterator itCurEntry; }; -#endif // __PATCH_ADDEDIT_h__ diff --git a/Source/Core/DolphinWX/TASInputDlg.h b/Source/Core/DolphinWX/TASInputDlg.h index a133def0d4..7d5b183e18 100644 --- a/Source/Core/DolphinWX/TASInputDlg.h +++ b/Source/Core/DolphinWX/TASInputDlg.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __TASINPUT_H__ -#define __TASINPUT_H__ +#pragma once #include <wx/wx.h> @@ -84,5 +83,3 @@ class TASInputDlg : public wxDialog DECLARE_EVENT_TABLE(); }; - -#endif diff --git a/Source/Core/DolphinWX/UDPConfigDiag.h b/Source/Core/DolphinWX/UDPConfigDiag.h index 8071e36978..3c495c0686 100644 --- a/Source/Core/DolphinWX/UDPConfigDiag.h +++ b/Source/Core/DolphinWX/UDPConfigDiag.h @@ -1,5 +1,4 @@ -#ifndef UDPCONFIGDIAG_H -#define UDPCONFIGDIAG_H +#pragma once #include "UDPWrapper.h" @@ -31,5 +30,3 @@ private: wxCheckBox * nunaccel; wxTextCtrl * port_tbox; }; - -#endif diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h index 95a5e488a5..f2cc9d3071 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/VideoConfigDiag.h @@ -1,6 +1,4 @@ - -#ifndef _CONFIG_DIAG_H_ -#define _CONFIG_DIAG_H_ +#pragma once #include <vector> #include <string> @@ -205,5 +203,3 @@ protected: VideoConfig &vconfig; std::string ininame; }; - -#endif diff --git a/Source/Core/DolphinWX/WXInputBase.h b/Source/Core/DolphinWX/WXInputBase.h index 4d6f57911d..704bc02b7b 100644 --- a/Source/Core/DolphinWX/WXInputBase.h +++ b/Source/Core/DolphinWX/WXInputBase.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef WXINPUTBASE_H -#define WXINPUTBASE_H +#pragma once #include "Common.h" #if defined(HAVE_WX) && HAVE_WX @@ -17,5 +16,3 @@ const wxString WXKeyToString(int keycode); const wxString WXKeymodToString(int modifier); #endif } -#endif - diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.h b/Source/Core/DolphinWX/WiimoteConfigDiag.h index 977760f579..9329c571ac 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.h @@ -1,6 +1,4 @@ - -#ifndef WIIMOTE_CONFIG_DIAG_H -#define WIIMOTE_CONFIG_DIAG_H +#pragma once #include <wx/wx.h> #include <wx/listbox.h> @@ -75,6 +73,3 @@ private: wxButton* wiimote_configure_bt[MAX_WIIMOTES]; std::map<wxWindowID, unsigned int> m_wiimote_index_from_conf_bt_id; }; - - -#endif diff --git a/Source/Core/DolphinWX/WxUtils.h b/Source/Core/DolphinWX/WxUtils.h index b14bc614ca..a3bd1ec620 100644 --- a/Source/Core/DolphinWX/WxUtils.h +++ b/Source/Core/DolphinWX/WxUtils.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef WXUTILS_H -#define WXUTILS_H +#pragma once #include <string> #include <wx/string.h> @@ -23,5 +22,3 @@ double GetCurrentBitmapLogicalScale(); std::string WxStrToStr(const wxString& str); wxString StrToWxStr(const std::string& str); - -#endif // WXUTILS diff --git a/Source/Core/DolphinWX/X11Utils.h b/Source/Core/DolphinWX/X11Utils.h index 1525e8ec09..27c0442d28 100644 --- a/Source/Core/DolphinWX/X11Utils.h +++ b/Source/Core/DolphinWX/X11Utils.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef __X11UTILS_H_ -#define __X11UTILS_H_ +#pragma once #include "Common.h" @@ -82,5 +68,3 @@ class XRRConfiguration #endif } -#endif - diff --git a/Source/Core/DolphinWX/stdafx.h b/Source/Core/DolphinWX/stdafx.h index 63a82873e1..c66951d4f0 100644 --- a/Source/Core/DolphinWX/stdafx.h +++ b/Source/Core/DolphinWX/stdafx.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef __STDAFX_H_ -#define __STDAFX_H_ +#pragma once #ifdef _WIN32 @@ -35,5 +34,3 @@ #endif #endif - -#endif diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h index 9fe227fddb..e7ccabd8ca 100644 --- a/Source/Core/InputCommon/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CONTROLLEREMU_H_ -#define _CONTROLLEREMU_H_ +#pragma once // windows crap #define NOMINMAX @@ -451,6 +450,3 @@ public: DeviceQualifier default_device; }; - - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index 5213b196d1..6ad7b13ad7 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -1,19 +1,6 @@ -// 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. #include "Android.h" diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h index 93e528f013..992bec80b1 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h @@ -1,21 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ -#ifndef _CIFACE_ANDROID_H_ -#define _CIFACE_ANDROID_H_ +#pragma once #include "../Device.h" #include "Android/ButtonManager.h" @@ -67,5 +54,3 @@ private: } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 9eca17118d..f1e2136ba9 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -1,3 +1,7 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + #include "ControllerInterface.h" #if USE_EGL diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 5e0cd9db8b..b63ee9f793 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -1,5 +1,8 @@ -#ifndef _DEVICEINTERFACE_H_ -#define _DEVICEINTERFACE_H_ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once #include <vector> #include <string> @@ -129,5 +132,3 @@ private: }; extern ControllerInterface g_controller_interface; - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index 6b7b492ea9..7f107812ec 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -1,3 +1,6 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "DInput.h" diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h index 86452c23ab..939f9d6da3 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h @@ -1,5 +1,8 @@ -#ifndef _CIFACE_DINPUT_H_ -#define _CIFACE_DINPUT_H_ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once #include "../Device.h" @@ -27,5 +30,3 @@ void Init(std::vector<Core::Device*>& devices, HWND hwnd); } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index 89500b2b2f..8b11bb181f 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -1,3 +1,6 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "DInputJoystick.h" #include "DInput.h" diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index 25fc745c8e..045a8febc6 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -1,5 +1,8 @@ -#ifndef _CIFACE_DINPUT_JOYSTICK_H_ -#define _CIFACE_DINPUT_JOYSTICK_H_ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once #include "../Device.h" #include "../ForceFeedback/ForceFeedbackDevice.h" @@ -71,5 +74,3 @@ private: } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index 50f065f92f..c79f4e3365 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -1,3 +1,6 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "DInputKeyboardMouse.h" #include "DInput.h" diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index 4973979052..aeeacca5e2 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -1,5 +1,8 @@ -#ifndef _CIFACE_DINPUT_KBM_H_ -#define _CIFACE_DINPUT_KBM_H_ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once #include "../Device.h" @@ -109,5 +112,3 @@ private: } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index 1a7295c2c5..1b402e9b23 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -1,3 +1,6 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "Device.h" diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index a2cdc7cf01..f61099f6fb 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -1,6 +1,8 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -#ifndef _DEVICE_H_ -#define _DEVICE_H_ +#pragma once #include <string> #include <vector> @@ -167,5 +169,3 @@ protected: } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp index b313559907..7f7954d3d8 100644 --- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp @@ -1,3 +1,6 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "ExpressionParser.h" diff --git a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h index 70cc51373b..deab16829e 100644 --- a/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h +++ b/Source/Core/InputCommon/ControllerInterface/ExpressionParser.h @@ -1,6 +1,8 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -#ifndef _EXPRESSIONPARSER_H_ -#define _EXPRESSIONPARSER_H_ +#pragma once #include <string> #include "Device.h" @@ -65,5 +67,3 @@ ExpressionParseStatus ParseExpression(std::string expr, ControlFinder &finder, E } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h index 3035273fa8..8eea274182 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FORCEFEEDBACKDEVICE_H_ -#define _FORCEFEEDBACKDEVICE_H_ +#pragma once #include "../Device.h" @@ -65,5 +64,3 @@ private: } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h index 367af395ef..3ac954c9ad 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h @@ -10,8 +10,7 @@ * for these differences on OS X. */ -#ifndef _DIRECTINPUTADAPTER_H_ -#define _DIRECTINPUTADAPTER_H_ +#pragma once typedef LONG* LPLONG; // Missing type for ForceFeedback.h #include <CoreFoundation/CoreFoundation.h> @@ -217,8 +216,5 @@ public: } }; - } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputConstants.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputConstants.h index 3fdee28971..b8d47552d1 100644 --- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputConstants.h +++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputConstants.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DIRECTINPUTCONSTANTS_H_ -#define _DIRECTINPUTCONSTANTS_H_ +#pragma once /* * Define all constants from ForceFeedbackConstants.h with DirectInput prefixes. @@ -146,5 +145,3 @@ #define DIGFFS_USERFFSWITCHON FFGFFS_USERFFSWITCHON #define DIGFFS_USERFFSWITCHOFF FFGFFS_USERFFSWITCHOFF #define DIGFFS_DEVICELOST FFGFFS_DEVICELOST - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h index a922e3f2dd..4217ae0169 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h @@ -1,3 +1,7 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + #pragma once #include "../Device.h" diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm index 8a859f46c8..93100a91f0 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm @@ -1,3 +1,7 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + #include <Foundation/Foundation.h> #include <IOKit/hid/IOHIDLib.h> #include <Cocoa/Cocoa.h> diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h index f53fc14cb5..72087f82a7 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h @@ -1,3 +1,9 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + #include <IOKit/hid/IOHIDLib.h> #include "../Device.h" diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm index 2a26e35447..dbf5beff3c 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm @@ -1,3 +1,7 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + #include <Foundation/Foundation.h> #include <IOKit/hid/IOHIDLib.h> diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h index e5c2c1b3d4..b18113bc38 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h @@ -1,3 +1,9 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + #include <IOKit/hid/IOHIDLib.h> #include "../Device.h" diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm index 93de15daa4..9fb832c340 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm @@ -1,3 +1,7 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + #include <Foundation/Foundation.h> #include <IOKit/hid/IOHIDLib.h> #include <Cocoa/Cocoa.h> diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index 24e0d0de58..c4cdae71bc 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -1,3 +1,6 @@ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "SDL.h" #include <StringUtil.h> diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h index 02c7e6d5d0..2d0c1c20ea 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h @@ -1,5 +1,8 @@ -#ifndef _CIFACE_SDL_H_ -#define _CIFACE_SDL_H_ +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once #include "../Device.h" @@ -153,5 +156,3 @@ private: } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h index 17e49e5e2b..39704821d7 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h @@ -3,8 +3,7 @@ // compile against the latest version and fall back to dynamically loading the // old DLL. -#ifndef _CIFACE_XINPUT_H_ -#define _CIFACE_XINPUT_H_ +#pragma once #include "../Device.h" @@ -96,6 +95,3 @@ private: } } - - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index dfb8fa285d..b5bb8442a6 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -4,8 +4,7 @@ // See XInput2.cpp for extensive documentation. -#ifndef _CIFACE_X11_XINPUT2_H_ -#define _CIFACE_X11_XINPUT2_H_ +#pragma once #include "../Device.h" @@ -120,5 +119,3 @@ private: } } - -#endif diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h index 35b6100081..6ccdf73a6a 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h @@ -1,5 +1,4 @@ -#ifndef _CIFACE_XLIB_H_ -#define _CIFACE_XLIB_H_ +#pragma once #include "../Device.h" @@ -89,5 +88,3 @@ private: } } - -#endif diff --git a/Source/Core/InputCommon/GCPadStatus.h b/Source/Core/InputCommon/GCPadStatus.h index 7c1bcbc738..73d63a902f 100644 --- a/Source/Core/InputCommon/GCPadStatus.h +++ b/Source/Core/InputCommon/GCPadStatus.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GCPAD_H_INCLUDED__ -#define _GCPAD_H_INCLUDED__ +#pragma once #define PAD_ERR_NONE 0 #define PAD_ERR_NO_CONTROLLER -1 @@ -38,5 +37,3 @@ typedef struct unsigned char analogB; // 0 <= analogB <= 255 signed char err; // one of PAD_ERR_* number } SPADStatus; - -#endif diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h index 1abed6bb2c..8fb284fc66 100644 --- a/Source/Core/InputCommon/InputConfig.h +++ b/Source/Core/InputCommon/InputConfig.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CONFIG_H_ -#define _CONFIG_H_ +#pragma once #include "Thread.h" #include "FileUtil.h" @@ -38,5 +37,3 @@ public: const char* const gui_name; const char* const profile_name; }; - -#endif diff --git a/Source/Core/InputCommon/UDPWiimote.cpp b/Source/Core/InputCommon/UDPWiimote.cpp index 5419cb61ce..35380a29b6 100644 --- a/Source/Core/InputCommon/UDPWiimote.cpp +++ b/Source/Core/InputCommon/UDPWiimote.cpp @@ -1,3 +1,6 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "UDPWiimote.h" diff --git a/Source/Core/InputCommon/UDPWiimote.h b/Source/Core/InputCommon/UDPWiimote.h index 877cb87473..8d57c703ce 100644 --- a/Source/Core/InputCommon/UDPWiimote.h +++ b/Source/Core/InputCommon/UDPWiimote.h @@ -1,5 +1,8 @@ -#ifndef UDPWIIMOTE_H -#define UDPWIIMOTE_H +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once #include "Common.h" #include <string> @@ -56,4 +59,3 @@ private: void initBroadcastIPv4(); void initBroadcastIPv6(); }; -#endif diff --git a/Source/Core/InputCommon/UDPWrapper.cpp b/Source/Core/InputCommon/UDPWrapper.cpp index 7fc77c4f44..3194ec5a8d 100644 --- a/Source/Core/InputCommon/UDPWrapper.cpp +++ b/Source/Core/InputCommon/UDPWrapper.cpp @@ -1,3 +1,7 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + #include "UDPWrapper.h" #include <stdio.h> diff --git a/Source/Core/InputCommon/UDPWrapper.h b/Source/Core/InputCommon/UDPWrapper.h index 420e425e25..42b23f45d5 100644 --- a/Source/Core/InputCommon/UDPWrapper.h +++ b/Source/Core/InputCommon/UDPWrapper.h @@ -1,5 +1,8 @@ -#ifndef UDPWRAPPER_H -#define UDPWRAPPER_H +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once #include "UDPWiimote.h" @@ -22,5 +25,3 @@ public: void Refresh(); virtual ~UDPWrapper(); }; - -#endif diff --git a/Source/Core/InputCommon/X11InputBase.cpp b/Source/Core/InputCommon/X11InputBase.cpp index b555a21449..9b39f31d58 100644 --- a/Source/Core/InputCommon/X11InputBase.cpp +++ b/Source/Core/InputCommon/X11InputBase.cpp @@ -1,19 +1,6 @@ -// 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. #include "X11InputBase.h" #include <string.h> diff --git a/Source/Core/InputCommon/X11InputBase.h b/Source/Core/InputCommon/X11InputBase.h index 7d0339d046..b2b917a7cf 100644 --- a/Source/Core/InputCommon/X11InputBase.h +++ b/Source/Core/InputCommon/X11InputBase.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef XINPUTBASE_H -#define XINPUTBASE_H +#pragma once #include "Common.h" @@ -34,4 +20,3 @@ namespace InputCommon #endif void XKeyToString(unsigned int keycode, char *keyStr); } -#endif diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.h b/Source/Core/VideoBackends/D3D/FramebufferManager.h index 8327b0369c..c55ec3c696 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.h +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FBMANAGER_D3D_H_ -#define _FBMANAGER_D3D_H_ +#pragma once #include "d3d11.h" @@ -105,5 +104,3 @@ private: }; } // namespace DX11 - -#endif diff --git a/Source/Core/VideoBackends/D3D/Globals.h b/Source/Core/VideoBackends/D3D/Globals.h index 89800694e8..5717baee93 100644 --- a/Source/Core/VideoBackends/D3D/Globals.h +++ b/Source/Core/VideoBackends/D3D/Globals.h @@ -2,13 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GLOBALS_H_ -#define _GLOBALS_H_ +#pragma once #include "Common.h" #include "VideoConfig.h" #include "main.h" #include "VideoCommon.h" - -#endif // _GLOBALS_H_
\ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D/LineGeometryShader.h b/Source/Core/VideoBackends/D3D/LineGeometryShader.h index a92e7983fc..987016fe9d 100644 --- a/Source/Core/VideoBackends/D3D/LineGeometryShader.h +++ b/Source/Core/VideoBackends/D3D/LineGeometryShader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LINEGEOMETRYSHADER_H -#define _LINEGEOMETRYSHADER_H +#pragma once #include "VideoCommon.h" @@ -41,5 +40,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h index ff33e22c0a..48832535e6 100644 --- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PSTEXTUREENCODER_H -#define _PSTEXTUREENCODER_H +#pragma once #include "TextureEncoder.h" @@ -102,5 +101,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.h b/Source/Core/VideoBackends/D3D/PerfQuery.h index b3709d1013..e9c526b6c2 100644 --- a/Source/Core/VideoBackends/D3D/PerfQuery.h +++ b/Source/Core/VideoBackends/D3D/PerfQuery.h @@ -1,5 +1,4 @@ -#ifndef _PERFQUERY_H_ -#define _PERFQUERY_H_ +#pragma once #include "PerfQueryBase.h" @@ -42,5 +41,3 @@ private: }; } // namespace - -#endif // _PERFQUERY_H_ diff --git a/Source/Core/VideoBackends/D3D/PointGeometryShader.h b/Source/Core/VideoBackends/D3D/PointGeometryShader.h index 4fc59801c7..1b1c5812c1 100644 --- a/Source/Core/VideoBackends/D3D/PointGeometryShader.h +++ b/Source/Core/VideoBackends/D3D/PointGeometryShader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _POINTGEOMETRYSHADER_H -#define _POINTGEOMETRYSHADER_H +#pragma once #include "VideoCommon.h" @@ -41,5 +40,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/Render.h b/Source/Core/VideoBackends/D3D/Render.h index 12e5b595d3..f391e4b47d 100644 --- a/Source/Core/VideoBackends/D3D/Render.h +++ b/Source/Core/VideoBackends/D3D/Render.h @@ -1,6 +1,4 @@ - -#ifndef _RENDER_H_ -#define _RENDER_H_ +#pragma once #include "RenderBase.h" @@ -54,5 +52,3 @@ public: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/Television.h b/Source/Core/VideoBackends/D3D/Television.h index a33ae7112d..e6f0c42f84 100644 --- a/Source/Core/VideoBackends/D3D/Television.h +++ b/Source/Core/VideoBackends/D3D/Television.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TELEVISION_H -#define _TELEVISION_H +#pragma once #include "VideoCommon.h" @@ -50,5 +49,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/TextureEncoder.h b/Source/Core/VideoBackends/D3D/TextureEncoder.h index d97434d380..d43f4cefeb 100644 --- a/Source/Core/VideoBackends/D3D/TextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/TextureEncoder.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTUREENCODER_H -#define _TEXTUREENCODER_H +#pragma once #include "VideoCommon.h" @@ -118,5 +117,3 @@ public: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/VertexManager.h index 644d13ae3f..db8be6de62 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.h +++ b/Source/Core/VideoBackends/D3D/VertexManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXMANAGER_H -#define _VERTEXMANAGER_H +#pragma once #include "VertexManagerBase.h" #include "LineGeometryShader.h" @@ -51,5 +50,3 @@ private: }; } // namespace - -#endif diff --git a/Source/Core/VideoBackends/D3D/VertexShaderCache.h b/Source/Core/VideoBackends/D3D/VertexShaderCache.h index 5fe81a11d5..8b28790157 100644 --- a/Source/Core/VideoBackends/D3D/VertexShaderCache.h +++ b/Source/Core/VideoBackends/D3D/VertexShaderCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXSHADERCACHE_H -#define _VERTEXSHADERCACHE_H +#pragma once #include "VertexShaderGen.h" @@ -64,5 +63,3 @@ private: }; } // namespace DX11 - -#endif // _VERTEXSHADERCACHE_H diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h index f714dbe05a..15224c478b 100644 --- a/Source/Core/VideoBackends/D3D/VideoBackend.h +++ b/Source/Core/VideoBackends/D3D/VideoBackend.h @@ -1,6 +1,4 @@ - -#ifndef DX11_VIDEO_BACKEND_H_ -#define DX11_VIDEO_BACKEND_H_ +#pragma once #include "VideoBackendBase.h" @@ -26,4 +24,3 @@ class VideoBackend : public VideoBackendHardware } -#endif diff --git a/Source/Core/VideoBackends/D3D/XFBEncoder.h b/Source/Core/VideoBackends/D3D/XFBEncoder.h index c96e683ceb..655059cd56 100644 --- a/Source/Core/VideoBackends/D3D/XFBEncoder.h +++ b/Source/Core/VideoBackends/D3D/XFBEncoder.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _XFBENCODER_H -#define _XFBENCODER_H +#pragma once #include "VideoCommon.h" @@ -51,5 +50,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/main.h b/Source/Core/VideoBackends/D3D/main.h index 061ed8ef3f..4932c0e367 100644 --- a/Source/Core/VideoBackends/D3D/main.h +++ b/Source/Core/VideoBackends/D3D/main.h @@ -2,10 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef MAIN_H -#define MAIN_H +#pragma once #include "Render.h" #include "MainBase.h" - -#endif diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h index 3d67bff610..34c8b80a8c 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.h +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FRAMEBUFFERMANAGER_H_ -#define _FRAMEBUFFERMANAGER_H_ +#pragma once #include "GLUtil.h" #include "FramebufferManagerBase.h" @@ -117,5 +116,3 @@ private: }; } // namespace OGL - -#endif diff --git a/Source/Core/VideoBackends/OGL/GLUtil.h b/Source/Core/VideoBackends/OGL/GLUtil.h index 7d15399930..67fa8f237e 100644 --- a/Source/Core/VideoBackends/OGL/GLUtil.h +++ b/Source/Core/VideoBackends/OGL/GLUtil.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GLINIT_H_ -#define _GLINIT_H_ +#pragma once #include "VideoConfig.h" #include "MathUtil.h" @@ -40,5 +39,3 @@ __forceinline GLenum GL_REPORT_ERROR() { return GL_NO_ERROR; } #else #define DEBUG_GLSL 0 #endif - -#endif // _GLINIT_H_ diff --git a/Source/Core/VideoBackends/OGL/Globals.h b/Source/Core/VideoBackends/OGL/Globals.h index ab90d8e279..268322335b 100644 --- a/Source/Core/VideoBackends/OGL/Globals.h +++ b/Source/Core/VideoBackends/OGL/Globals.h @@ -2,12 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GLOBALS_H_ -#define _GLOBALS_H_ +#pragma once #include "Common.h" #include "VideoConfig.h" #include "VideoCommon.h" - -#endif // _GLOBALS_H_ diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h b/Source/Core/VideoBackends/OGL/PerfQuery.h index c47fa194d1..1f93c99d83 100644 --- a/Source/Core/VideoBackends/OGL/PerfQuery.h +++ b/Source/Core/VideoBackends/OGL/PerfQuery.h @@ -1,5 +1,4 @@ -#ifndef _PERFQUERY_H_ -#define _PERFQUERY_H_ +#pragma once #include "PerfQueryBase.h" @@ -42,5 +41,3 @@ private: }; } // namespace - -#endif // _PERFQUERY_H_ diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.h b/Source/Core/VideoBackends/OGL/PostProcessing.h index 1deb050a75..0cd93116f4 100644 --- a/Source/Core/VideoBackends/OGL/PostProcessing.h +++ b/Source/Core/VideoBackends/OGL/PostProcessing.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _POSTPROCESSING_H_ -#define _POSTPROCESSING_H_ +#pragma once #include "VideoCommon.h" #include "GLUtil.h" @@ -28,5 +27,3 @@ void ApplyShader(); } // namespace } // namespace - -#endif // _POSTPROCESSING_H_ diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index a7b21a929d..ee3c174ec6 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef PROGRAM_SHADER_CACHE_H_ -#define PROGRAM_SHADER_CACHE_H_ +#pragma once #include "GLUtil.h" @@ -112,4 +111,3 @@ private: }; } // namespace OGL -#endif diff --git a/Source/Core/VideoBackends/OGL/RasterFont.h b/Source/Core/VideoBackends/OGL/RasterFont.h index 7f3cff1414..9a7732d353 100644 --- a/Source/Core/VideoBackends/OGL/RasterFont.h +++ b/Source/Core/VideoBackends/OGL/RasterFont.h @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _RASTERFONT_H_ -#define _RASTERFONT_H_ +#pragma once -namespace OGL { +namespace OGL +{ -class RasterFont { +class RasterFont +{ public: RasterFont(); ~RasterFont(void); @@ -24,5 +25,3 @@ private: }; } - -#endif // _RASTERFONT_H_ diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h index 58ba086d18..feaad32aa1 100644 --- a/Source/Core/VideoBackends/OGL/Render.h +++ b/Source/Core/VideoBackends/OGL/Render.h @@ -1,6 +1,4 @@ - -#ifndef _RENDER_H_ -#define _RENDER_H_ +#pragma once #include "RenderBase.h" @@ -87,5 +85,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h index 4de716b27d..ef470e0758 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.h +++ b/Source/Core/VideoBackends/OGL/SamplerCache.h @@ -1,6 +1,4 @@ - -#ifndef INCLUDE_SAMPLER_CACHE_H_ -#define INCLUDE_SAMPLER_CACHE_H_ +#pragma once #include <map> @@ -76,5 +74,3 @@ private: extern SamplerCache *g_sampler_cache; } - -#endif diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.h b/Source/Core/VideoBackends/OGL/StreamBuffer.h index 8e57b81d17..00e8579a15 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.h +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef STREAMBUFFER_H -#define STREAMBUFFER_H +#pragma once #include <utility> #include "VideoCommon.h" @@ -51,5 +50,3 @@ private: }; } - -#endif // STREAMBUFFER_H diff --git a/Source/Core/VideoBackends/OGL/TextureCache.h b/Source/Core/VideoBackends/OGL/TextureCache.h index ca3b857190..3c0e421bc7 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.h +++ b/Source/Core/VideoBackends/OGL/TextureCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTUREMNGR_H_ -#define _TEXTUREMNGR_H_ +#pragma once #include <map> @@ -64,5 +63,3 @@ private: bool SaveTexture(const std::string filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level); } - -#endif // _TEXTUREMNGR_H_ diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.h b/Source/Core/VideoBackends/OGL/TextureConverter.h index 24bfbbc2d2..f86241e5ff 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.h +++ b/Source/Core/VideoBackends/OGL/TextureConverter.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTURECONVERTER_H_ -#define _TEXTURECONVERTER_H_ +#pragma once #include "VideoCommon.h" #include "GLUtil.h" @@ -30,5 +29,3 @@ int EncodeToRamFromTexture(u32 address, GLuint source_texture, bool bFromZBuffer } } // namespace OGL - -#endif // _TEXTURECONVERTER_H_ diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h index 11001ff1ca..db0573e8f6 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.h +++ b/Source/Core/VideoBackends/OGL/VertexManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXMANAGER_H_ -#define _VERTEXMANAGER_H_ +#pragma once #include "CPMemory.h" @@ -50,5 +49,3 @@ private: }; } - -#endif // _VERTEXMANAGER_H_ diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h index ed4a748eb4..761772a8ed 100644 --- a/Source/Core/VideoBackends/OGL/VideoBackend.h +++ b/Source/Core/VideoBackends/OGL/VideoBackend.h @@ -1,6 +1,4 @@ - -#ifndef OGL_VIDEO_BACKEND_H_ -#define OGL_VIDEO_BACKEND_H_ +#pragma once #include "VideoBackendBase.h" @@ -25,5 +23,3 @@ class VideoBackend : public VideoBackendHardware }; } - -#endif diff --git a/Source/Core/VideoBackends/OGL/main.h b/Source/Core/VideoBackends/OGL/main.h index 03cc6fc174..7ea6077d30 100644 --- a/Source/Core/VideoBackends/OGL/main.h +++ b/Source/Core/VideoBackends/OGL/main.h @@ -2,9 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _MAIN_H_ -#define _MAIN_H_ +#pragma once #include "MainBase.h" - -#endif // _MAIN_H_ diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.h b/Source/Core/VideoBackends/Software/BPMemLoader.h index 0ef122ec24..6ea09293cf 100644 --- a/Source/Core/VideoBackends/Software/BPMemLoader.h +++ b/Source/Core/VideoBackends/Software/BPMemLoader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _BPMEMLOADER_H_ -#define _BPMEMLOADER_H_ +#pragma once #include "Common.h" @@ -12,5 +11,3 @@ void InitBPMemory(); void SWBPWritten(int address, int newvalue); void SWLoadBPReg(u32 value); - -#endif diff --git a/Source/Core/VideoBackends/Software/CPMemLoader.h b/Source/Core/VideoBackends/Software/CPMemLoader.h index 5bbb2969ea..a08fac2a73 100644 --- a/Source/Core/VideoBackends/Software/CPMemLoader.h +++ b/Source/Core/VideoBackends/Software/CPMemLoader.h @@ -2,13 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CPMEMLOADER_H_ -#define _CPMEMLOADER_H_ - +#pragma once #include "Common.h" #include "CPMemory.h" void SWLoadCPReg(u32 sub_cmd, u32 value); - -#endif diff --git a/Source/Core/VideoBackends/Software/Clipper.h b/Source/Core/VideoBackends/Software/Clipper.h index f28db764c1..acf32b32ff 100644 --- a/Source/Core/VideoBackends/Software/Clipper.h +++ b/Source/Core/VideoBackends/Software/Clipper.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CLIPPER_H_ -#define _CLIPPER_H_ - +#pragma once #include "Common.h" #include "NativeVertexFormat.h" @@ -27,6 +25,3 @@ namespace Clipper void DoState(PointerWrap &p); } - - -#endif diff --git a/Source/Core/VideoBackends/Software/DebugUtil.h b/Source/Core/VideoBackends/Software/DebugUtil.h index 7d5ac4beea..ba2d7dd1c9 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.h +++ b/Source/Core/VideoBackends/Software/DebugUtil.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DEBUGUTIL_H -#define _DEBUGUTIL_H +#pragma once namespace DebugUtil { @@ -23,5 +22,3 @@ namespace DebugUtil void DrawTempBuffer(u8 *color, int buffer); void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *name); } - -#endif diff --git a/Source/Core/VideoBackends/Software/EfbCopy.h b/Source/Core/VideoBackends/Software/EfbCopy.h index c2352eab34..3a8d7d7ad6 100644 --- a/Source/Core/VideoBackends/Software/EfbCopy.h +++ b/Source/Core/VideoBackends/Software/EfbCopy.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EFB_COPY_H_ -#define _EFB_COPY_H_ - +#pragma once #include "Common.h" @@ -14,6 +12,3 @@ namespace EfbCopy // Clear the EFB if needed void CopyEfb(); } - - -#endif diff --git a/Source/Core/VideoBackends/Software/EfbInterface.h b/Source/Core/VideoBackends/Software/EfbInterface.h index b00a06239e..59ef834a03 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.h +++ b/Source/Core/VideoBackends/Software/EfbInterface.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _EFB_INTERFACE_H_ -#define _EFB_INTERFACE_H_ +#pragma once #include "VideoCommon.h" @@ -53,5 +52,3 @@ namespace EfbInterface void DoState(PointerWrap &p); } - -#endif diff --git a/Source/Core/VideoBackends/Software/HwRasterizer.h b/Source/Core/VideoBackends/Software/HwRasterizer.h index 5a439c4333..f9c5810389 100644 --- a/Source/Core/VideoBackends/Software/HwRasterizer.h +++ b/Source/Core/VideoBackends/Software/HwRasterizer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _HW_RASTERIZER_H -#define _HW_RASTERIZER_H +#pragma once #include <map> @@ -46,5 +45,3 @@ namespace HwRasterizer typedef std::map<u32, TexCacheEntry> TextureCache; static TextureCache textures; } - -#endif diff --git a/Source/Core/VideoBackends/Software/NativeVertexFormat.h b/Source/Core/VideoBackends/Software/NativeVertexFormat.h index 9f9610910a..a6e22f9850 100644 --- a/Source/Core/VideoBackends/Software/NativeVertexFormat.h +++ b/Source/Core/VideoBackends/Software/NativeVertexFormat.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _NATIVEVERTEXFORMAT_H -#define _NATIVEVERTEXFORMAT_H +#pragma once #include "Vec3.h" #include "ChunkFile.h" @@ -93,5 +92,3 @@ struct OutputVertexData } }; - -#endif diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.h b/Source/Core/VideoBackends/Software/OpcodeDecoder.h index 20b7fe6be2..4ba83507de 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.h +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _OPCODEDECODER_H_ -#define _OPCODEDECODER_H_ +#pragma once #include "CommonTypes.h" #include "ChunkFile.h" @@ -47,5 +46,3 @@ namespace OpcodeDecoder void DoState(PointerWrap &p); } - -#endif diff --git a/Source/Core/VideoBackends/Software/RasterFont.h b/Source/Core/VideoBackends/Software/RasterFont.h index 00cf9eb3fb..009b5aecc7 100644 --- a/Source/Core/VideoBackends/Software/RasterFont.h +++ b/Source/Core/VideoBackends/Software/RasterFont.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _RASTERFONT_H_ -#define _RASTERFONT_H_ +#pragma once class RasterFont { @@ -26,5 +25,3 @@ private: char *temp_buffer; enum {TEMP_BUFFER_SIZE = 64 * 1024}; }; - -#endif // _RASTERFONT_H_ diff --git a/Source/Core/VideoBackends/Software/Rasterizer.h b/Source/Core/VideoBackends/Software/Rasterizer.h index 3f61fcaefe..a4599145b0 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.h +++ b/Source/Core/VideoBackends/Software/Rasterizer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _RASTERIZER_H_ -#define _RASTERIZER_H_ +#pragma once #include "NativeVertexFormat.h" #include "ChunkFile.h" @@ -50,5 +49,3 @@ namespace Rasterizer void DoState(PointerWrap &p); } - -#endif diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.h b/Source/Core/VideoBackends/Software/SWCommandProcessor.h index 8273af2f31..043ff85d0e 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.h +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COMMANDPROCESSOR_H_ -#define _COMMANDPROCESSOR_H_ +#pragma once #include "Common.h" @@ -141,6 +140,3 @@ namespace SWCommandProcessor void SetRendering(bool enabled); } // end of namespace SWCommandProcessor - - -#endif diff --git a/Source/Core/VideoBackends/Software/SWPixelEngine.h b/Source/Core/VideoBackends/Software/SWPixelEngine.h index 4a6c6ec2aa..5e4018a03c 100644 --- a/Source/Core/VideoBackends/Software/SWPixelEngine.h +++ b/Source/Core/VideoBackends/Software/SWPixelEngine.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PIXELENGINE_H -#define _PIXELENGINE_H +#pragma once #include "Common.h" #include "VideoCommon.h" @@ -214,5 +213,3 @@ namespace SWPixelEngine bool AllowIdleSkipping(); } // end of namespace SWPixelEngine - -#endif diff --git a/Source/Core/VideoBackends/Software/SWRenderer.h b/Source/Core/VideoBackends/Software/SWRenderer.h index 35770bf364..97b65566dd 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.h +++ b/Source/Core/VideoBackends/Software/SWRenderer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _RENDERER_H_ -#define _RENDERER_H_ +#pragma once #include "CommonTypes.h" #include "EfbInterface.h" @@ -27,5 +26,3 @@ namespace SWRenderer void Swap(u32 fbWidth, u32 fbHeight); void SwapBuffer(); } - -#endif diff --git a/Source/Core/VideoBackends/Software/SWStatistics.h b/Source/Core/VideoBackends/Software/SWStatistics.h index d6d889337f..b77953f06f 100644 --- a/Source/Core/VideoBackends/Software/SWStatistics.h +++ b/Source/Core/VideoBackends/Software/SWStatistics.h @@ -5,8 +5,7 @@ #include "CommonTypes.h" #include "SWVideoConfig.h" -#ifndef _STATISTICS_H -#define _STATISTICS_H +#pragma once struct SWStatistics { @@ -46,5 +45,3 @@ extern SWStatistics swstats; #define ADDSTAT(a,b) ; #define SETSTAT(a,x) ; #endif - -#endif // _STATISTICS_H diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.h b/Source/Core/VideoBackends/Software/SWVertexLoader.h index 5008e7aeb2..0b6a023bff 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.h +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXLOADER_H_ -#define _VERTEXLOADER_H_ +#pragma once #include "Common.h" @@ -59,5 +58,3 @@ public: void LoadVertex(); void DoState(PointerWrap &p); }; - -#endif diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.h b/Source/Core/VideoBackends/Software/SWVideoConfig.h index 1e02feb2ed..0de5b93998 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.h +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VIDEOSOFTWARE_CONFIG_H_ -#define _VIDEOSOFTWARE_CONFIG_H_ +#pragma once #include "Common.h" @@ -43,5 +42,3 @@ struct SWVideoConfig : NonCopyable }; extern SWVideoConfig g_SWVideoConfig; - -#endif // _VIDEOSOFTWARE_CONFIG_H_ diff --git a/Source/Core/VideoBackends/Software/SetupUnit.h b/Source/Core/VideoBackends/Software/SetupUnit.h index bd4d0291c9..37e5017581 100644 --- a/Source/Core/VideoBackends/Software/SetupUnit.h +++ b/Source/Core/VideoBackends/Software/SetupUnit.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -#ifndef _SETUPUNIT_H_ -#define _SETUPUNIT_H_ +#pragma once #include "Common.h" #include "NativeVertexFormat.h" @@ -35,5 +33,3 @@ public: void SetupVertex(); void DoState(PointerWrap &p); }; - -#endif diff --git a/Source/Core/VideoBackends/Software/Tev.h b/Source/Core/VideoBackends/Software/Tev.h index e86768ac0b..0642778e0b 100644 --- a/Source/Core/VideoBackends/Software/Tev.h +++ b/Source/Core/VideoBackends/Software/Tev.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEV_H_ -#define _TEV_H_ +#pragma once #include "BPMemLoader.h" #include "ChunkFile.h" @@ -87,5 +86,3 @@ public: void DoState(PointerWrap &p); }; - -#endif diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.h b/Source/Core/VideoBackends/Software/TextureEncoder.h index 841590cbba..c675f1fca6 100644 --- a/Source/Core/VideoBackends/Software/TextureEncoder.h +++ b/Source/Core/VideoBackends/Software/TextureEncoder.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTUREENCODER_H_ -#define _TEXTUREENCODER_H_ +#pragma once #include "Common.h" @@ -11,5 +10,3 @@ namespace TextureEncoder { void Encode(u8 *dest_ptr); } - -#endif diff --git a/Source/Core/VideoBackends/Software/TextureSampler.h b/Source/Core/VideoBackends/Software/TextureSampler.h index 28a2aa84d9..6cd13537bf 100644 --- a/Source/Core/VideoBackends/Software/TextureSampler.h +++ b/Source/Core/VideoBackends/Software/TextureSampler.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTURESAMPLER_H_ -#define _TEXTURESAMPLER_H_ - +#pragma once #include "Common.h" @@ -16,6 +14,3 @@ namespace TextureSampler enum { RED_SMP, GRN_SMP, BLU_SMP, ALP_SMP }; } - - -#endif diff --git a/Source/Core/VideoBackends/Software/TransformUnit.h b/Source/Core/VideoBackends/Software/TransformUnit.h index 974e44372d..f231567982 100644 --- a/Source/Core/VideoBackends/Software/TransformUnit.h +++ b/Source/Core/VideoBackends/Software/TransformUnit.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TRANSFORM_UNIT_H_ -#define _TRANSFORM_UNIT_H_ +#pragma once struct InputVertexData; struct OutputVertexData; @@ -20,5 +19,3 @@ namespace TransformUnit void TransformColor(const InputVertexData *src, OutputVertexData *dst); void TransformTexCoord(const InputVertexData *src, OutputVertexData *dst, bool specialCase); } - -#endif diff --git a/Source/Core/VideoBackends/Software/Vec3.h b/Source/Core/VideoBackends/Software/Vec3.h index 117a6f4197..08f8877e2b 100644 --- a/Source/Core/VideoBackends/Software/Vec3.h +++ b/Source/Core/VideoBackends/Software/Vec3.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VEC3_H -#define _VEC3_H +#pragma once #include <stdlib.h> #include <math.h> @@ -106,5 +105,3 @@ public: p.Do(z); } }; - -#endif diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h index 4d85c637f0..cf955bfeed 100644 --- a/Source/Core/VideoBackends/Software/VideoBackend.h +++ b/Source/Core/VideoBackends/Software/VideoBackend.h @@ -1,6 +1,4 @@ - -#ifndef SW_VIDEO_BACKEND_H_ -#define SW_VIDEO_BACKEND_H_ +#pragma once #include "VideoBackendBase.h" @@ -63,5 +61,3 @@ public: }; } - -#endif diff --git a/Source/Core/VideoBackends/Software/VideoConfigDialog.h b/Source/Core/VideoBackends/Software/VideoConfigDialog.h index a4ebedae62..e0884dd79f 100644 --- a/Source/Core/VideoBackends/Software/VideoConfigDialog.h +++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VIDEOSOFTWARE_CONFIG_DIAG_H_ -#define _VIDEOSOFTWARE_CONFIG_DIAG_H_ +#pragma once #include <vector> #include <string> @@ -48,5 +47,3 @@ protected: SWVideoConfig& vconfig; std::string ininame; }; - -#endif diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.h b/Source/Core/VideoBackends/Software/XFMemLoader.h index ff6c7267dd..d790c98cd6 100644 --- a/Source/Core/VideoBackends/Software/XFMemLoader.h +++ b/Source/Core/VideoBackends/Software/XFMemLoader.h @@ -2,9 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _XFMEMLOADER_H_ -#define _XFMEMLOADER_H_ - +#pragma once #include "Common.h" @@ -241,5 +239,3 @@ void XFWritten(u32 transferSize, u32 baseAddress); void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData); void SWLoadIndexedXF(u32 val, int array); - -#endif diff --git a/Source/Core/VideoCommon/AVIDump.h b/Source/Core/VideoCommon/AVIDump.h index f5697613ca..b12f316ab3 100644 --- a/Source/Core/VideoCommon/AVIDump.h +++ b/Source/Core/VideoCommon/AVIDump.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _AVIDUMP_H -#define _AVIDUMP_H +#pragma once #ifdef _WIN32 #include <windows.h> @@ -32,5 +31,3 @@ class AVIDump static void Stop(); }; - -#endif // _AVIDUMP_H diff --git a/Source/Core/VideoCommon/BPFunctions.h b/Source/Core/VideoCommon/BPFunctions.h index addf1cf741..b750e81b48 100644 --- a/Source/Core/VideoCommon/BPFunctions.h +++ b/Source/Core/VideoCommon/BPFunctions.h @@ -7,8 +7,7 @@ // Video backend must define these functions // ------------------------------------------ -#ifndef _BPFUNCTIONS_H -#define _BPFUNCTIONS_H +#pragma once #include "BPMemory.h" #include "VideoCommon.h" @@ -41,5 +40,3 @@ bool GetConfig(const int &type); void SetTextureMode(const BPCmd &bp); void SetInterlacingMode(const BPCmd &bp); }; - -#endif // _BPFUNCTIONS_H diff --git a/Source/Core/VideoCommon/BPMemory.h b/Source/Core/VideoCommon/BPMemory.h index 0670b49dbc..72245d0a5f 100644 --- a/Source/Core/VideoCommon/BPMemory.h +++ b/Source/Core/VideoCommon/BPMemory.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _BPMEMORY_H -#define _BPMEMORY_H +#pragma once #include "Common.h" @@ -1051,5 +1050,3 @@ extern BPMemory bpmem; void LoadBPReg(u32 value0); void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size); - -#endif // _BPMEMORY_H diff --git a/Source/Core/VideoCommon/BPStructs.h b/Source/Core/VideoCommon/BPStructs.h index 72a0409f8b..cf67ba2a6e 100644 --- a/Source/Core/VideoCommon/BPStructs.h +++ b/Source/Core/VideoCommon/BPStructs.h @@ -2,13 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _BPSTRUCTS_H_ -#define _BPSTRUCTS_H_ +#pragma once #include "BPMemory.h" void BPInit(); void LoadBPReg(u32 value0); void BPReload(); - -#endif // _BPSTRUCTS_H_ diff --git a/Source/Core/VideoCommon/CPMemory.h b/Source/Core/VideoCommon/CPMemory.h index 87c6918c80..7a5af3cc19 100644 --- a/Source/Core/VideoCommon/CPMemory.h +++ b/Source/Core/VideoCommon/CPMemory.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CPMEMORY_H -#define _CPMEMORY_H +#pragma once #include "Common.h" @@ -253,5 +252,3 @@ void LoadCPReg(u32 SubCmd, u32 Value); // Fills memory with data from CP regs void FillCPMemoryArray(u32 *memory); - -#endif // _CPMEMORY_H diff --git a/Source/Core/VideoCommon/CommandProcessor.h b/Source/Core/VideoCommon/CommandProcessor.h index e9fe9fedbe..b6bf7ea1b5 100644 --- a/Source/Core/VideoCommon/CommandProcessor.h +++ b/Source/Core/VideoCommon/CommandProcessor.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _COMMANDPROCESSOR_H -#define _COMMANDPROCESSOR_H +#pragma once #include "Common.h" #include "VideoBackendBase.h" @@ -160,7 +159,3 @@ void Update(); extern volatile u32 VITicks; } // namespace CommandProcessor - -#endif // _COMMANDPROCESSOR_H - - diff --git a/Source/Core/VideoCommon/ConstantManager.h b/Source/Core/VideoCommon/ConstantManager.h index 3c09c2007e..bca1c5c93e 100644 --- a/Source/Core/VideoCommon/ConstantManager.h +++ b/Source/Core/VideoCommon/ConstantManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _CONSTANTMANAGER_H -#define _CONSTANTMANAGER_H +#pragma once // all constant buffer attributes must be 16 bytes aligned, so this are the only allowed components: typedef float float4[4]; @@ -38,5 +37,3 @@ struct VertexShaderConstants float4 posttransformmatrices[64]; float4 depthparams; }; - -#endif
\ No newline at end of file diff --git a/Source/Core/VideoCommon/DataReader.h b/Source/Core/VideoCommon/DataReader.h index 3c56db9ae3..2066334f75 100644 --- a/Source/Core/VideoCommon/DataReader.h +++ b/Source/Core/VideoCommon/DataReader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _DATAREADER_H -#define _DATAREADER_H +#pragma once #include "VertexManagerBase.h" @@ -169,5 +168,3 @@ private: u8 *buffer; int offset; }; - -#endif diff --git a/Source/Core/VideoCommon/Debugger.h b/Source/Core/VideoCommon/Debugger.h index 645043e84c..3c918f61c5 100644 --- a/Source/Core/VideoCommon/Debugger.h +++ b/Source/Core/VideoCommon/Debugger.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GFX_DEBUGGER_H_ -#define _GFX_DEBUGGER_H_ +#pragma once class GFXDebuggerBase { @@ -62,6 +61,3 @@ void GFXDebuggerUpdateScreen(); #define GFX_DEBUGGER_PAUSE_AT(event,update) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) GFXDebuggerToPause(update);} #define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc) {if (((GFXDebuggerToPauseAtNext & event) && --GFXDebuggerEventToPauseCount<=0) || GFXDebuggerPauseFlag) {{dumpfunc};GFXDebuggerToPause(update);}} #define GFX_DEBUGGER_LOG_AT(event,dumpfunc) {if (( GFXDebuggerToPauseAtNext & event ) ) {{dumpfunc};}} - - -#endif // _GFX_DEBUGGER_H_ diff --git a/Source/Core/VideoCommon/EmuWindow.h b/Source/Core/VideoCommon/EmuWindow.h index bf5aa73cdf..25fd8ca568 100644 --- a/Source/Core/VideoCommon/EmuWindow.h +++ b/Source/Core/VideoCommon/EmuWindow.h @@ -1,5 +1,4 @@ -#ifndef _EMUWINDOW_H -#define _EMUWINDOW_H +#pragma once #include <windows.h> @@ -17,5 +16,3 @@ void OSDMenu(WPARAM wParam); void SetWindowText(const TCHAR* text); } - -#endif diff --git a/Source/Core/VideoCommon/FPSCounter.h b/Source/Core/VideoCommon/FPSCounter.h index d90540bccf..e1dc0ec232 100644 --- a/Source/Core/VideoCommon/FPSCounter.h +++ b/Source/Core/VideoCommon/FPSCounter.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FPS_COUNTER_H_ -#define _FPS_COUNTER_H_ +#pragma once // Initializes the FPS counter. void InitFPSCounter(); @@ -11,5 +10,3 @@ void InitFPSCounter(); // Called when a frame is rendered. Returns the value to be displayed on // screen as the FPS counter (updated every second). int UpdateFPSCounter(); - -#endif // _FPS_COUNTER_H_
\ No newline at end of file diff --git a/Source/Core/VideoCommon/Fifo.h b/Source/Core/VideoCommon/Fifo.h index 229e2ff46d..83127f5a75 100644 --- a/Source/Core/VideoCommon/Fifo.h +++ b/Source/Core/VideoCommon/Fifo.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FIFO_H -#define _FIFO_H +#pragma once #include "Common.h" #include "VideoBackendBase.h" @@ -34,5 +33,3 @@ void Fifo_SetRendering(bool bEnabled); // Implemented by the Video Backend void VideoFifo_CheckAsyncRequest(); - -#endif // _FIFO_H diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index e065a4a56b..be668caa03 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -1,6 +1,4 @@ - -#ifndef _FRAMEBUFFERMANAGERBASE_H -#define _FRAMEBUFFERMANAGERBASE_H +#pragma once #include <list> @@ -98,5 +96,3 @@ private: }; extern FramebufferManagerBase *g_framebuffer_manager; - -#endif diff --git a/Source/Core/VideoCommon/HiresTextures.h b/Source/Core/VideoCommon/HiresTextures.h index f2249a3c18..18267e4869 100644 --- a/Source/Core/VideoCommon/HiresTextures.h +++ b/Source/Core/VideoCommon/HiresTextures.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _HIRESTEXTURES_H -#define _HIRESTEXTURES_H +#pragma once #include <map> #include "VideoCommon.h" @@ -16,5 +15,3 @@ bool HiresTexExists(const char *filename); PC_TexFormat GetHiresTex(const char *fileName, unsigned int *pWidth, unsigned int *pHeight, unsigned int *required_size, int texformat, unsigned int data_size, u8 *data); }; - -#endif // _HIRESTEXTURES_H diff --git a/Source/Core/VideoCommon/ImageWrite.h b/Source/Core/VideoCommon/ImageWrite.h index 04de765d32..7022526ad8 100644 --- a/Source/Core/VideoCommon/ImageWrite.h +++ b/Source/Core/VideoCommon/ImageWrite.h @@ -2,13 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _IMAGEWRITE_H -#define _IMAGEWRITE_H +#pragma once #include "Common.h" bool SaveData(const char* filename, const char* pdata); bool TextureToPng(u8* data, int row_stride, const std::string filename, int width, int height, bool saveAlpha = true); - -#endif // _IMAGEWRITE_H - diff --git a/Source/Core/VideoCommon/IndexGenerator.h b/Source/Core/VideoCommon/IndexGenerator.h index 4b9a0fee3c..18f2b66d11 100644 --- a/Source/Core/VideoCommon/IndexGenerator.h +++ b/Source/Core/VideoCommon/IndexGenerator.h @@ -5,8 +5,8 @@ // This is currently only used by the DX backend, but it may make sense to // use it in the GL backend or a future DX10 backend too. -#ifndef _INDEXGENERATOR_H -#define _INDEXGENERATOR_H +#pragma once + #include "CommonTypes.h" class IndexGenerator @@ -45,5 +45,3 @@ private: static u16 *BASEIptr; static u32 base_index; }; - -#endif // _INDEXGENERATOR_H diff --git a/Source/Core/VideoCommon/LightingShaderGen.h b/Source/Core/VideoCommon/LightingShaderGen.h index 10c38dae91..f74f92ad5c 100644 --- a/Source/Core/VideoCommon/LightingShaderGen.h +++ b/Source/Core/VideoCommon/LightingShaderGen.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LIGHTINGSHADERGEN_H_ -#define _LIGHTINGSHADERGEN_H_ +#pragma once #include "ShaderGenCommon.h" #include "NativeVertexFormat.h" @@ -260,5 +259,3 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com object.Write("}\n"); } } - -#endif // _LIGHTINGSHADERGEN_H_ diff --git a/Source/Core/VideoCommon/LookUpTables.h b/Source/Core/VideoCommon/LookUpTables.h index 1d9153b2d1..57414d21cd 100644 --- a/Source/Core/VideoCommon/LookUpTables.h +++ b/Source/Core/VideoCommon/LookUpTables.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LOOKUPTABLES_H -#define _LOOKUPTABLES_H +#pragma once #include "Common.h" @@ -30,5 +29,3 @@ inline u8 Convert6To8(u8 v) // Swizzle bits: 00123456 -> 12345612 return (v << 2) | (v >> 4); } - -#endif // _LOOKUPTABLES_H diff --git a/Source/Core/VideoCommon/MainBase.h b/Source/Core/VideoCommon/MainBase.h index ed48db4b75..a3a5ed0add 100644 --- a/Source/Core/VideoCommon/MainBase.h +++ b/Source/Core/VideoCommon/MainBase.h @@ -1,6 +1,4 @@ - -#ifndef _VIDEOCOMMON_MAINBASE_H_ -#define _VIDEOCOMMON_MAINBASE_H_ +#pragma once #include "CommonTypes.h" @@ -11,5 +9,3 @@ extern volatile u32 s_swapRequested; void VideoFifo_CheckEFBAccess(); void VideoFifo_CheckSwapRequestAt(u32 xfbAddr, u32 fbWidth, u32 fbHeight); - -#endif diff --git a/Source/Core/VideoCommon/NativeVertexFormat.h b/Source/Core/VideoCommon/NativeVertexFormat.h index 8b41ecdd04..c57e34baa9 100644 --- a/Source/Core/VideoCommon/NativeVertexFormat.h +++ b/Source/Core/VideoCommon/NativeVertexFormat.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef _NATIVEVERTEXFORMAT_H -#define _NATIVEVERTEXFORMAT_H +#pragma once #include "Common.h" @@ -116,5 +102,3 @@ protected: u32 vertex_stride; }; - -#endif // _NATIVEVERTEXFORMAT_H diff --git a/Source/Core/VideoCommon/OnScreenDisplay.h b/Source/Core/VideoCommon/OnScreenDisplay.h index a4a377b5d7..fec5193cfc 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.h +++ b/Source/Core/VideoCommon/OnScreenDisplay.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _OSD_H_ -#define _OSD_H_ +#pragma once #include <functional> #include <string> @@ -27,5 +26,3 @@ typedef std::function<void()> Callback; void AddCallback(CallbackType type, Callback cb); void DoCallbacks(CallbackType type); } // namespace OSD - -#endif // _OSD_H_ diff --git a/Source/Core/VideoCommon/OpcodeDecoding.h b/Source/Core/VideoCommon/OpcodeDecoding.h index 36d130a8b5..bdc4976825 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.h +++ b/Source/Core/VideoCommon/OpcodeDecoding.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _OPCODE_DECODING_H -#define _OPCODE_DECODING_H +#pragma once #define GX_NOP 0x00 @@ -39,4 +38,3 @@ void OpcodeDecoder_Init(); void OpcodeDecoder_Shutdown(); u32 OpcodeDecoder_Run(bool skipped_frame); void InterpretDisplayList(u32 address, u32 size); -#endif // _OPCODE_DECODING_H diff --git a/Source/Core/VideoCommon/PerfQueryBase.h b/Source/Core/VideoCommon/PerfQueryBase.h index 1136eeae2a..64a22c2712 100644 --- a/Source/Core/VideoCommon/PerfQueryBase.h +++ b/Source/Core/VideoCommon/PerfQueryBase.h @@ -1,5 +1,4 @@ -#ifndef _PERFQUERY_BASE_H_ -#define _PERFQUERY_BASE_H_ +#pragma once #include "CommonTypes.h" @@ -54,5 +53,3 @@ public: }; extern PerfQueryBase* g_perf_query; - -#endif // _PERFQUERY_H_ diff --git a/Source/Core/VideoCommon/PixelEngine.h b/Source/Core/VideoCommon/PixelEngine.h index e05aa8cfe7..1486639b78 100644 --- a/Source/Core/VideoCommon/PixelEngine.h +++ b/Source/Core/VideoCommon/PixelEngine.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PIXELENGINE_H -#define _PIXELENGINE_H +#pragma once #include "CommonTypes.h" class PointerWrap; @@ -74,5 +73,3 @@ extern u16 bbox[4]; extern bool bbox_active; } // end of namespace PixelEngine - -#endif diff --git a/Source/Core/VideoCommon/PixelShaderGen.h b/Source/Core/VideoCommon/PixelShaderGen.h index 983e304998..e1feb06ba8 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.h +++ b/Source/Core/VideoCommon/PixelShaderGen.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef GCOGL_PIXELSHADER_H -#define GCOGL_PIXELSHADER_H +#pragma once #include "VideoCommon.h" #include "ShaderGenCommon.h" @@ -141,5 +140,3 @@ typedef ShaderConstantProfile PixelShaderConstantProfile; // TODO: Obsolete void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components); void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components); void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components); - -#endif // GCOGL_PIXELSHADER_H diff --git a/Source/Core/VideoCommon/PixelShaderManager.h b/Source/Core/VideoCommon/PixelShaderManager.h index c4d193e516..c5be1120be 100644 --- a/Source/Core/VideoCommon/PixelShaderManager.h +++ b/Source/Core/VideoCommon/PixelShaderManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PIXELSHADERMANAGER_H -#define _PIXELSHADERMANAGER_H +#pragma once #include "BPMemory.h" #include "XFMemory.h" @@ -46,6 +45,3 @@ public: static PixelShaderConstants constants; static bool dirty; }; - - -#endif // _PIXELSHADERMANAGER_H diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index 08c39f8703..81ca9f75fd 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -12,8 +12,7 @@ // Next frame, that one is scanned out and the other one gets the copy. = double buffering. // --------------------------------------------------------------------------------------------- -#ifndef _COMMON_RENDERBASE_H_ -#define _COMMON_RENDERBASE_H_ +#pragma once #include "VideoCommon.h" #include "Thread.h" @@ -162,5 +161,3 @@ private: extern Renderer *g_renderer; void UpdateViewport(); - -#endif // _COMMON_RENDERBASE_H_ diff --git a/Source/Core/VideoCommon/ShaderGenCommon.h b/Source/Core/VideoCommon/ShaderGenCommon.h index 96db35d7bd..9d2e8e1fa7 100644 --- a/Source/Core/VideoCommon/ShaderGenCommon.h +++ b/Source/Core/VideoCommon/ShaderGenCommon.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef _SHADERGENCOMMON_H -#define _SHADERGENCOMMON_H +#pragma once #include <stdio.h> #include <stdarg.h> @@ -258,5 +244,3 @@ private: std::map<UidT,std::string> m_shaders; std::vector<UidT> m_uids; }; - -#endif // _SHADERGENCOMMON_H diff --git a/Source/Core/VideoCommon/Statistics.h b/Source/Core/VideoCommon/Statistics.h index 3a79061b7a..daa8700d7f 100644 --- a/Source/Core/VideoCommon/Statistics.h +++ b/Source/Core/VideoCommon/Statistics.h @@ -6,8 +6,7 @@ #include "VideoCommon.h" #include <vector> -#ifndef _STATISTICS_H -#define _STATISTICS_H +#pragma once struct Statistics { @@ -91,5 +90,3 @@ extern Statistics stats; #define ADDSTAT(a,b) ; #define SETSTAT(a,x) ; #endif - -#endif // _STATISTICS_H diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index 4db768f5e4..f459dabb76 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTURECACHEBASE_H -#define _TEXTURECACHEBASE_H +#pragma once #include <map> @@ -140,5 +139,3 @@ private: }; extern TextureCache *g_texture_cache; - -#endif diff --git a/Source/Core/VideoCommon/TextureConversionShader.h b/Source/Core/VideoCommon/TextureConversionShader.h index 843c5ef7ee..b3c05418c8 100644 --- a/Source/Core/VideoCommon/TextureConversionShader.h +++ b/Source/Core/VideoCommon/TextureConversionShader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTURECONVERSIONSHADER_H_ -#define _TEXTURECONVERSIONSHADER_H_ +#pragma once #include "Common.h" #include "TextureDecoder.h" @@ -16,6 +15,3 @@ u16 GetEncodedSampleCount(u32 format); const char *GenerateEncodingShader(u32 format, API_TYPE ApiType = API_OPENGL); } - -#endif // _TEXTURECONVERSIONSHADER_H_ - diff --git a/Source/Core/VideoCommon/TextureDecoder.h b/Source/Core/VideoCommon/TextureDecoder.h index d474f1684b..dd1aef199a 100644 --- a/Source/Core/VideoCommon/TextureDecoder.h +++ b/Source/Core/VideoCommon/TextureDecoder.h @@ -2,9 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTUREDECODER_H -#define _TEXTUREDECODER_H +#pragma once + #include "Hash.h" + enum { TMEM_SIZE = 1024*1024, @@ -76,5 +77,3 @@ void TexDecoder_DecodeTexel(u8 *dst, const u8 *src, int s, int t, int imageWidth void TexDecoder_DecodeTexelRGBA8FromTmem(u8 *dst, const u8 *src_ar, const u8* src_gb, int s, int t, int imageWidth); PC_TexFormat TexDecoder_DecodeRGBA8FromTmem(u8* dst, const u8 *src_ar, const u8 *src_gb, int width, int height); void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center); - -#endif diff --git a/Source/Core/VideoCommon/VertexLoader.h b/Source/Core/VideoCommon/VertexLoader.h index afe9ddd36b..eeb9ec766b 100644 --- a/Source/Core/VideoCommon/VertexLoader.h +++ b/Source/Core/VideoCommon/VertexLoader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXLOADER_H -#define _VERTEXLOADER_H +#pragma once // Top vertex loaders // Metroid Prime: P I16-flt N I16-s16 T0 I16-u16 T1 i16-flt @@ -140,5 +139,3 @@ private: void WriteSetVariable(int bits, void *address, Gen::OpArg dest); #endif }; - -#endif diff --git a/Source/Core/VideoCommon/VertexLoaderManager.h b/Source/Core/VideoCommon/VertexLoaderManager.h index c3111db515..e7461acdc1 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.h +++ b/Source/Core/VideoCommon/VertexLoaderManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXLOADERMANAGER_H -#define _VERTEXLOADERMANAGER_H +#pragma once #include "Common.h" #include <string> @@ -23,5 +22,3 @@ namespace VertexLoaderManager }; void RecomputeCachedArraybases(); - -#endif // _VERTEXLOADERMANAGER_H diff --git a/Source/Core/VideoCommon/VertexLoader_Color.h b/Source/Core/VideoCommon/VertexLoader_Color.h index ac590b4c0e..03b8f7a401 100644 --- a/Source/Core/VideoCommon/VertexLoader_Color.h +++ b/Source/Core/VideoCommon/VertexLoader_Color.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXLOADERCOLOR_H -#define _VERTEXLOADERCOLOR_H +#pragma once void LOADERDECL Color_ReadDirect_24b_888(); void LOADERDECL Color_ReadDirect_32b_888x(); @@ -25,5 +24,3 @@ void LOADERDECL Color_ReadIndex16_32b_888x(); void LOADERDECL Color_ReadIndex16_16b_4444(); void LOADERDECL Color_ReadIndex16_24b_6666(); void LOADERDECL Color_ReadIndex16_32b_8888(); - -#endif diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.h b/Source/Core/VideoCommon/VertexLoader_Normal.h index 4ad15c51b0..f74d0e9e7d 100644 --- a/Source/Core/VideoCommon/VertexLoader_Normal.h +++ b/Source/Core/VideoCommon/VertexLoader_Normal.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXLOADER_NORMAL_H -#define _VERTEXLOADER_NORMAL_H +#pragma once #include "Common.h" #include "CommonTypes.h" @@ -72,5 +71,3 @@ private: static Set m_Table[NUM_NRM_TYPE][NUM_NRM_INDICES][NUM_NRM_ELEMENTS][NUM_NRM_FORMAT]; }; - -#endif diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.h b/Source/Core/VideoCommon/VertexLoader_TextCoord.h index 7bbafab8db..8d3f61809b 100644 --- a/Source/Core/VideoCommon/VertexLoader_TextCoord.h +++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef VERTEXLOADER_TEXCOORD_H -#define VERTEXLOADER_TEXCOORD_H +#pragma once #include "NativeVertexFormat.h" @@ -24,5 +23,3 @@ public: // It is important to synchronize tcIndex. static TPipelineFunction GetDummyFunction(); }; - -#endif diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h index 83787e57a8..6854bc5b73 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.h +++ b/Source/Core/VideoCommon/VertexManagerBase.h @@ -1,6 +1,4 @@ - -#ifndef _VERTEXMANAGERBASE_H -#define _VERTEXMANAGERBASE_H +#pragma once #include "Common.h" #include <vector> @@ -64,5 +62,3 @@ private: }; extern VertexManager *g_vertex_manager; - -#endif diff --git a/Source/Core/VideoCommon/VertexShaderGen.h b/Source/Core/VideoCommon/VertexShaderGen.h index f48d1c69fb..d2e39a3eb5 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.h +++ b/Source/Core/VideoCommon/VertexShaderGen.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef GCOGL_VERTEXSHADER_H -#define GCOGL_VERTEXSHADER_H +#pragma once #include "XFMemory.h" #include "VideoCommon.h" @@ -91,5 +90,3 @@ typedef ShaderCode VertexShaderCode; // TODO: Obsolete.. void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type); void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type); void GenerateVSOutputStructForGS(ShaderCode& object, API_TYPE api_type); - -#endif // GCOGL_VERTEXSHADER_H diff --git a/Source/Core/VideoCommon/VertexShaderManager.h b/Source/Core/VideoCommon/VertexShaderManager.h index 93287ffe1e..08b6e8119c 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.h +++ b/Source/Core/VideoCommon/VertexShaderManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXSHADERMANAGER_H -#define _VERTEXSHADERMANAGER_H +#pragma once #include "VertexShaderGen.h" #include "ConstantManager.h" @@ -38,5 +37,3 @@ public: static VertexShaderConstants constants; static bool dirty; }; - -#endif // _VERTEXSHADERMANAGER_H diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h index 8d88b9c559..197e1a7056 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.h +++ b/Source/Core/VideoCommon/VideoBackendBase.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef VIDEO_BACKEND_H_ -#define VIDEO_BACKEND_H_ +#pragma once #include <string> #include <vector> @@ -181,5 +180,3 @@ protected: void InitializeShared(); void InvalidState(); }; - -#endif diff --git a/Source/Core/VideoCommon/VideoCommon.h b/Source/Core/VideoCommon/VideoCommon.h index a9a0d443cb..d71390c999 100644 --- a/Source/Core/VideoCommon/VideoCommon.h +++ b/Source/Core/VideoCommon/VideoCommon.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VIDEOCOMMON_H -#define _VIDEOCOMMON_H +#pragma once #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN @@ -132,5 +131,3 @@ inline unsigned int GetPow2(unsigned int val) ++ret; return ret; } - -#endif // _VIDEOCOMMON_H diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index b626c4e926..d9e0f7eaac 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -9,8 +9,7 @@ // at the start of every frame. Noone should ever change members of g_ActiveConfig // directly. -#ifndef _VIDEO_CONFIG_H_ -#define _VIDEO_CONFIG_H_ +#pragma once #include "Common.h" #include "VideoCommon.h" @@ -168,5 +167,3 @@ extern VideoConfig g_ActiveConfig; // Called every frame. void UpdateActiveConfig(); - -#endif // _VIDEO_CONFIG_H_ diff --git a/Source/Core/VideoCommon/VideoState.h b/Source/Core/VideoCommon/VideoState.h index 2c18460ac8..eeb7fb65f1 100644 --- a/Source/Core/VideoCommon/VideoState.h +++ b/Source/Core/VideoCommon/VideoState.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VIDEOSTATE_H -#define _VIDEOSTATE_H +#pragma once #include "Common.h" #include "ChunkFile.h" @@ -11,5 +10,3 @@ void VideoCommon_DoState(PointerWrap &p); void VideoCommon_RunLoop(bool enable); void VideoCommon_Init(); - -#endif // _VIDEOSTATE_H diff --git a/Source/Core/VideoCommon/XFMemory.h b/Source/Core/VideoCommon/XFMemory.h index f681e15f50..50934adf30 100644 --- a/Source/Core/VideoCommon/XFMemory.h +++ b/Source/Core/VideoCommon/XFMemory.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _XFMEMORY_H -#define _XFMEMORY_H +#pragma once #include "Common.h" @@ -274,5 +273,3 @@ extern u32 xfmem[XFMEM_SIZE]; void LoadXFReg(u32 transferSize, u32 address, u32 *pData); void LoadIndexedXF(u32 val, int array); - -#endif // _XFMEMORY_H diff --git a/Source/Core/VideoCommon/XFStructs.h b/Source/Core/VideoCommon/XFStructs.h index 48b92a9741..9d72bbfb43 100644 --- a/Source/Core/VideoCommon/XFStructs.h +++ b/Source/Core/VideoCommon/XFStructs.h @@ -2,9 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _XFSTRUCTS_H -#define _XFSTRUCTS_H +#pragma once #include "XFMemory.h" - -#endif // _XFSTRUCTS_H diff --git a/Source/DSPSpy/ConsoleHelper.h b/Source/DSPSpy/ConsoleHelper.h index 6c64035c7a..e616db6a16 100644 --- a/Source/DSPSpy/ConsoleHelper.h +++ b/Source/DSPSpy/ConsoleHelper.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef _CONSOLEHELPER_H_ -#define _CONSOLEHELPER_H_ +#pragma once #include <stdio.h> #include <stdlib.h> @@ -86,5 +72,3 @@ inline void CON_BlankRow(const int y) CON_BlankRow(y); \ CON_Printf(x, y, __VA_ARGS__); \ } - -#endif diff --git a/Source/DSPSpy/dsp_interface.cpp b/Source/DSPSpy/dsp_interface.cpp index b6a56acacb..1cd8b4e1d4 100644 --- a/Source/DSPSpy/dsp_interface.cpp +++ b/Source/DSPSpy/dsp_interface.cpp @@ -1,19 +1,6 @@ -// 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 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include "dsp_interface.h" diff --git a/Source/DSPSpy/dsp_interface.h b/Source/DSPSpy/dsp_interface.h index e1842ccedc..1a726b4479 100644 --- a/Source/DSPSpy/dsp_interface.h +++ b/Source/DSPSpy/dsp_interface.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef _DSP_INTERFACE_H -#define _DSP_INTERFACE_H +#pragma once #include <gccore.h> diff --git a/Source/DSPSpy/dspregs.h b/Source/DSPSpy/dspregs.h index e9a96c1a6f..90b113d15e 100644 --- a/Source/DSPSpy/dspregs.h +++ b/Source/DSPSpy/dspregs.h @@ -1,22 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef _DSPREGS_H -#define _DSPREGS_H +#pragma once #define DSP_REG_AR0 0x00 // address registers #define DSP_REG_AR1 0x01 @@ -60,5 +46,3 @@ #define DSP_REG_ACM1 0x1f #define DSP_REG_ACH0 0x10 // Sign extended 8 bit register 0 #define DSP_REG_ACH1 0x11 // Sign extended 8 bit register 1 - -#endif
\ No newline at end of file diff --git a/Source/DSPSpy/main_spy.cpp b/Source/DSPSpy/main_spy.cpp index 0000eacb7c..a4c7800cb9 100644 --- a/Source/DSPSpy/main_spy.cpp +++ b/Source/DSPSpy/main_spy.cpp @@ -1,19 +1,6 @@ -// 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 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. // This is a test program for running code on the Wii DSP, with full control over input // and automatic compare with output. VERY useful for figuring out what those little diff --git a/Source/DSPSpy/mem_dump.h b/Source/DSPSpy/mem_dump.h index 389c9f27c0..e36099e3f2 100644 --- a/Source/DSPSpy/mem_dump.h +++ b/Source/DSPSpy/mem_dump.h @@ -1,19 +1,8 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ +#pragma once unsigned int mem_dump[] __attribute__ ((aligned (64))) = { diff --git a/Source/DSPSpy/real_dsp.cpp b/Source/DSPSpy/real_dsp.cpp index c7aba4179f..d792711543 100644 --- a/Source/DSPSpy/real_dsp.cpp +++ b/Source/DSPSpy/real_dsp.cpp @@ -1,19 +1,6 @@ -// 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 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. #include <gccore.h> #include <ogcsys.h> diff --git a/Source/DSPSpy/real_dsp.h b/Source/DSPSpy/real_dsp.h index 6ea25c16fe..8417d26b5d 100644 --- a/Source/DSPSpy/real_dsp.h +++ b/Source/DSPSpy/real_dsp.h @@ -1,31 +1,16 @@ -// Copyright (C) 2003 Dolphin Project. +// Copyright 2014 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. -// 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/ - -#ifndef _REAL_DSP_H -#define _REAL_DSP_H +#pragma once #include "dsp_interface.h" -class RealDSP : public IDSP { +class RealDSP : public IDSP +{ public: virtual void Init(); virtual void Reset(); virtual u32 CheckMailTo(); virtual void SendMailTo(u32 mail); }; - -#endif // _REAL_DSP_H |