Replace all include guard ifdefs with "#pragma once"

2014-02-10 18:07:16 -05:00
parent a0a65a2906
commit d2038049f5
462 changed files with 676 additions and 2308 deletions
@@ -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__
@@ -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_
@@ -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
-
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_*/
@@ -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_
@@ -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
@@ -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__
@@ -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_
@@ -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
@@ -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_*/
@@ -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
@@ -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_
@@ -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_*/
@@ -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
@@ -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
@@ -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
@@ -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_
-
@@ -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"
@@ -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
-
@@ -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
-
@@ -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
@@ -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"
@@ -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
-
@@ -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
@@ -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
-
@@ -1,19 +1,6 @@
 // Copyright (C) 2013 Scott Moreau <[email protected]>
-
-// 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"
@@ -1,21 +1,8 @@
 // Copyright (C) 2013 Scott Moreau <[email protected]>
+// 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>
@@ -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
@@ -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
-
@@ -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
-
@@ -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
@@ -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
-
@@ -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
@@ -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
@@ -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
@@ -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_
@@ -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_*/
@@ -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
@@ -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
@@ -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
@@ -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_
-
@@ -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__
@@ -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__
@@ -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
@@ -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
@@ -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
@@ -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
-
@@ -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
@@ -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
@@ -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
-
@@ -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