Remove include guards in favour of '#pragma once'. Normally I would use an include guard however #pragama once is easier to spot and we already used it in mst of our files, this is for the sake of consistency until they're removed.

Originally committed to SVN as r3538.

aegisub/src/aegisublocale.h

@@ -34,10 +34,8 @@
 /// @ingroup utility
 ///
 
-#ifndef LOCALE_H
 
-/// DOCME
+#pragma once
-#define LOCALE_H
 
 
 //////////////
@@ -68,8 +66,3 @@ public:
 	void Init(int language);
 	int PickLanguage();
 };
-
-
-#endif
-
-

aegisub/src/ass_style_storage.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef ASS_STYLE_STORAGE_H
+#pragma once
-
-/// DOCME
-#define ASS_STYLE_STORAGE_H
 
 
 ////////////
@@ -73,8 +70,3 @@ public:
 	void Save(wxString name);
 	void Load(wxString name);
 };
-
-
-#endif
-
-

aegisub/src/audio_box.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef AUDIO_BOX_H
+#pragma once
-
-/// DOCME
-#define AUDIO_BOX_H
 
 
 ///////////
@@ -312,8 +309,3 @@ enum {
 	/// DOCME
 	Audio_Check_Spectrum
 };
-
-
-#endif
-
-

aegisub/src/audio_display.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef AUDIO_DISPLAY_H
+#pragma once
-
-/// DOCME
-#define AUDIO_DISPLAY_H
 
 
 ///////////
@@ -319,8 +316,3 @@ enum {
 	/// DOCME
 	Audio_Update_Timer = 1700
 };
-
-
-#endif
-
-

aegisub/src/audio_karaoke.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef AUDIO_KARAOKE_H
+#pragma once
-
-/// DOCME
-#define AUDIO_KARAOKE_H
 
 
 ///////////
@@ -190,8 +187,3 @@ public:
 
 	DECLARE_EVENT_TABLE()
 };
-
-
-#endif
-
-

aegisub/src/audio_renderer_spectrum.h

@@ -37,10 +37,8 @@
 /// Calculate and render a frequency-power spectrum for PCM audio data.
 
 
-#ifndef AUDIO_SPECTRUM_H
+#pragma once
 
-/// Include guard for audio_spectrum.h
-#define AUDIO_SPECTRUM_H
 
 #ifndef AGI_PRE
 #include <stdint.h>
@@ -109,8 +107,3 @@ public:
 	/// @param _power_scale Amplification factor to use.
 	void SetScaling(float _power_scale);
 };
-
-
-#endif
-
-

aegisub/src/auto4_base.h

@@ -35,10 +35,8 @@
 ///
 
 
-#ifndef _AUTO4_BASE_H
+#pragma once
 
-/// DOCME
-#define _AUTO4_BASE_H
 
 #ifndef AGI_PRE
 #include <vector>
@@ -554,7 +552,3 @@ namespace Automation4 {
 	};
 
 };
-
-#endif
-
-

aegisub/src/auto4_lua.h

@@ -35,10 +35,8 @@
 ///
 
 
-#ifndef _AUTO4_LUA_H
+#pragma once
 
-/// DOCME
-#define _AUTO4_LUA_H
 
 #ifndef AGI_PRE
 #include <wx/event.h>
@@ -389,7 +387,3 @@ namespace Automation4 {
 	};
 
 };
-
-#endif
-
-

aegisub/src/auto4_lua_factory.h

@@ -35,10 +35,8 @@
 ///
 
 
-#ifndef _AUTO4_LUA_FACTORY_H
+#pragma once
 
-/// DOCME
-#define _AUTO4_LUA_FACTORY_H
 
 #include "auto4_base.h"
 
@@ -61,7 +59,3 @@ namespace Automation4 {
 	};
 
 };
-
-#endif
-
-

aegisub/src/avisynth_wrap.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef AVISYNTH_WRAP_H
+#pragma once
-
-/// DOCME
-#define AVISYNTH_WRAP_H
 
 
 ///////////
@@ -100,6 +97,3 @@ public:
 };
 
 #endif
-#endif
-
-

aegisub/src/block_cache.h

@@ -34,9 +34,7 @@
 /// @brief Template class for creating caches for blocks of data
 
 
-// Include guard
+#pragma once
-#ifndef BLOCK_CACHE_H
-#define BLOCK_CACHE_H
 
 
 #ifndef AGI_PRE
@@ -310,8 +308,3 @@ public:
 		return 0;
 	}
 };
-
-
-// Include guard
-#endif
-

aegisub/src/charset_conv.h

@@ -34,10 +34,9 @@
 /// @ingroup utility
 ///
 
-#ifndef AEGISUB_CHARSET_CONV_H
 
-/// DOCME
+#pragma once
-#define AEGISUB_CHARSET_CONV_H
+
 
 #ifndef AGI_PRE
 #include <iconv.h>
@@ -172,7 +171,3 @@ extern AegisubCSConv& csConvLocal;
 #		define WCHAR_T_ENCODING ((Endian::MachineToBig((uint32_t)1) == 1) ? "UTF-16BE" : "UTF-16LE")
 #	endif
 #endif
-
-#endif
-
-

aegisub/src/colorspace.h

@@ -34,10 +34,9 @@
 /// @ingroup utility
 ///
 
-#ifndef COLORSPACE_H
 
-/// DOCME
+#pragma once
-#define COLORSPACE_H
+
 
 #ifndef AGI_PRE
 #include <wx/colour.h>
@@ -84,8 +83,3 @@ wxString color_to_html(wxColour color);
 
 // Convert a HTML hex string to a wxColour
 wxColour html_to_color(wxString html);
-
-
-#endif
-
-

aegisub/src/dialog_automation.h

@@ -35,10 +35,8 @@
 ///
 
 
-#ifndef DIALOG_AUTOMATION_H
+#pragma once
 
-/// DOCME
-#define DIALOG_AUTOMATION_H
 
 #ifndef AGI_PRE
 #include <vector>
@@ -140,7 +138,3 @@ enum {
 	/// DOCME
 	Automation_Reload_Autoload
 };
-
-#endif
-
-

aegisub/src/dialog_colorpicker.h

@@ -34,10 +34,9 @@
 /// @ingroup tools_ui
 ///
 
-#ifndef DIALOG_COLORPICKER_H
 
-/// DOCME
+#pragma once
-#define DIALOG_COLORPICKER_H
+
 
 #ifndef AGI_PRE
 #include <vector>
@@ -390,8 +389,3 @@ enum {
 	/// DOCME
 	BUTTON_RGBADJUST
 };
-
-
-#endif
-
-

aegisub/src/dialog_dummy_video.h

@@ -34,10 +34,9 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef _DIALOG_DUMMY_VIDEO_H
 
-/// DOCME
+#pragma once
-#define _DIALOG_DUMMY_VIDEO_H
+
 
 #ifndef AGI_PRE
 #include <wx/checkbox.h>
@@ -118,8 +117,3 @@ enum {
 	/// DOCME
 	Dummy_Video_Length,
 };
-
-
-#endif
-
-

aegisub/src/dialog_jumpto.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DIALOG_JUMPTO_H
+#pragma once
-
-/// DOCME
-#define DIALOG_JUMPTO_H
 
 
 ///////////
@@ -84,7 +81,3 @@ public:
 
 	DECLARE_EVENT_TABLE()
 };
-
-#endif
-
-

aegisub/src/dialog_kara_timing_copy.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DIALOG_KARA_TIMING_COPY_H
+#pragma once
-
-/// DOCME
-#define DIALOG_KARA_TIMING_COPY_H
 
 
 ///////////
@@ -156,8 +153,3 @@ enum {
 	/// DOCME
 	TEXT_DEST
 };
-
-
-#endif
-
-

aegisub/src/dialog_progress.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DIALOG_PROGRESS_H
+#pragma once
-
-/// DOCME
-#define DIALOG_PROGRESS_H
 
 
 ///////////
@@ -108,8 +105,3 @@ public:
 	wxThread::ExitCode Entry();
 	void Close();
 };
-
-
-#endif
-
-

aegisub/src/dialog_resample.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DIALOG_RESAMPLE_H
+#pragma once
-
-/// DOCME
-#define DIALOG_RESAMPLE_H
 
 
 ///////////
@@ -154,8 +151,3 @@ enum {
 	/// DOCME
 	TEXT_MARGIN_B
 };
-
-
-#endif
-
-

aegisub/src/dialog_selection.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DIALOG_SELECTION_H
+#pragma once
-
-/// DOCME
-#define DIALOG_SELECTION_H
 
 
 ///////////
@@ -131,7 +128,3 @@ enum {
 	/// DOCME
 	MATCH_COMMENTS_CHECKBOX
 };
-
-#endif
-
-

aegisub/src/dialog_shift_times.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DIALOG_SHIFT_TIMES_H
+#pragma once
-
-/// DOCME
-#define DIALOG_SHIFT_TIMES_H
 
 
 ///////////
@@ -151,8 +148,3 @@ enum {
 	/// DOCME
 	SHIFT_CLEAR_HISTORY
 };
-
-
-#endif
-
-

aegisub/src/dialog_splash.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef SPLASH_H
+#pragma once
-
-/// DOCME
-#define SPLASH_H
 
 
 ////////////
@@ -76,8 +73,3 @@ public:
 
 	DECLARE_EVENT_TABLE()
 };
-
-
-#endif
-
-

aegisub/src/dialog_style_editor.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DIALOG_STYLE_EDITOR_H
+#pragma once
-
-/// DOCME
-#define DIALOG_STYLE_EDITOR_H
 
 
 ////////////
@@ -225,8 +222,3 @@ public:
 
 	DECLARE_EVENT_TABLE()
 };
-
-
-#endif
-
-

aegisub/src/dialog_style_manager.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DIALOG_STYLE_MANAGER_H
+#pragma once
-
-/// DOCME
-#define DIALOG_STYLE_MANAGER_H
 
 
 ////////////
@@ -314,8 +311,3 @@ public:
 	DialogStyleManagerEvent(DialogStyleManager *control);
 	DECLARE_EVENT_TABLE()
 };
-
-
-#endif
-
-

aegisub/src/dialog_styling_assistant.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DIALOG_STYLING_ASSISTANT_H
+#pragma once
-
-/// DOCME
-#define DIALOG_STYLING_ASSISTANT_H
 
 
 ///////////
@@ -176,8 +173,3 @@ enum {
 	/// DOCME
 	BUTTON_PLAY_AUDIO
 };
-
-
-#endif
-
-

aegisub/src/dialog_text_import.h

@@ -34,10 +34,8 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef _DIALOG_TEXT_IMPORT_H
+#pragma once
 
-/// DOCME
-#define _DIALOG_TEXT_IMPORT_H
 
 ///////////
 // Headers
@@ -82,6 +80,3 @@ enum {
 	/// DOCME
 	EDIT_COMMENT_STARTER,
 };
-#endif
-
-

aegisub/src/dialog_timing_processor.h

@@ -34,10 +34,8 @@
 /// @ingroup tools_ui
 ///
 
-#ifndef DIALOG_TIMING_PROCESSOR
 
-/// DOCME
+#pragma once
-#define DIALOG_TIMING_PROCESSOR
 
 
 ///////////
@@ -193,8 +191,3 @@ enum {
 	/// DOCME
 	TIMING_STYLE_LIST
 };
-
-
-#endif
-
-

aegisub/src/dialog_translation.h

@@ -34,10 +34,7 @@
 /// @ingroup tools_ui///
 
 
-#ifndef DIALOG_TRANSLATION_H
+#pragma once
-
-/// DOCME
-#define DIALOG_TRANSLATION_H
 
 
 ///////////
@@ -171,8 +168,3 @@ enum {
 	/// DOCME
 	BUTTON_TRANS_PLAY_VIDEO
 };
-
-
-#endif
-
-

aegisub/src/dialog_video_details.h

@@ -34,10 +34,8 @@
 /// @ingroup secondary_ui
 ///
 
-#ifndef _DIALOG_VIDEO_DETAILS_H
+#pragma once
 
-/// DOCME
-#define _DIALOG_VIDEO_DETAILS_H
 
 ///////////
 // Headers
@@ -70,7 +68,3 @@ private:
 public:
 	DialogVideoDetails(wxWindow *parent);
 };
-
-#endif
-
-

aegisub/src/drop.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef DROP_H
+#pragma once
-
-/// Inclusion guard
-#define DROP_H
 
 
 ///////////
@@ -69,5 +66,3 @@ public:
 	bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames);
 	//wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
 };
-
-#endif

aegisub/src/fft.h

@@ -35,10 +35,8 @@
 ///
 
 
-#ifndef FFT_H
+#pragma once
 
-/// DOCME
-#define FFT_H
 
 #ifndef AGI_PRE
 #include <stdlib.h> // size_t
@@ -62,8 +60,3 @@ public:
 	unsigned int ReverseBits(unsigned int index, unsigned int bits);
 	float FrequencyAtIndex(unsigned int baseFreq, unsigned int n_samples, unsigned int index);
 };
-
-
-#endif
-
-

aegisub/src/frame_main.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef FRAME_MAIN_H
+#pragma once
-
-/// DOCME
-#define FRAME_MAIN_H
 
 
 ///////////////////
@@ -793,8 +790,3 @@ enum {
 	/// DOCME
 	Menu_Automation_Macro = 2700
 };
-
-
-#endif
-
-

aegisub/src/hotkeys.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef HOTKEY_H
+#pragma once
-
-/// DOCME
-#define HOTKEY_H
 
 
 ///////////
@@ -137,8 +134,3 @@ public:
 ///////////////////
 // Global instance
 extern HotkeyManager Hotkeys;
-
-
-#endif
-
-

aegisub/src/string_codec.h

@@ -54,10 +54,7 @@
 ///
 /// The encoded string should be usable in any kind of field in an ASS file.
 
-#ifndef _STRING_CODEC_H
+#pragma once
-
-/// DOCME
-#define _STRING_CODEC_H
 
 #ifndef AGI_PRE
 #include <wx/string.h>
@@ -65,7 +62,3 @@
 
 wxString inline_string_encode(const wxString &input);
 wxString inline_string_decode(const wxString &input);
-
-#endif
-
-

aegisub/src/text_file_writer.h

@@ -34,11 +34,8 @@
 /// @ingroup utility
 ///
 
+#pragma once
 
-#ifndef TEXT_FILE_WRITER_H
-
-/// DOCME
-#define TEXT_FILE_WRITER_H
 
 #ifndef AGI_PRE
 #include <fstream>
@@ -74,7 +71,3 @@ public:
 
 	void WriteLineToFile(wxString line, bool addLineBreak=true);
 };
-
-#endif
-
-

aegisub/src/toggle_bitmap.h

@@ -35,10 +35,7 @@
 ///
 
 
-#ifndef TOGGLE_BITMAP_H
+#pragma once
-
-/// DOCME
-#define TOGGLE_BITMAP_H
 
 
 ///////////
@@ -74,8 +71,3 @@ public:
 
 	DECLARE_EVENT_TABLE()
 };
-
-
-#endif
-
-

aegisub/src/validators.h

@@ -35,10 +35,8 @@
 ///
 
 
-#ifndef VALIDATORS_H
+#pragma once
 
-/// DOCME
-#define VALIDATORS_H
 
 ///////////
 // Headers
@@ -85,8 +83,3 @@ public:
 
 	DECLARE_EVENT_TABLE();
 };
-
-
-#endif
-
-

aegisub/src/video_provider_dummy.h

@@ -36,10 +36,8 @@
 
 // The dummy video provider needs a header, since it needs to be created directly as a special case
 
-#ifndef _VIDEO_PROVIDER_DUMMY_H
 
-/// DOCME
+#pragma once
-#define _VIDEO_PROVIDER_DUMMY_H
 
 
 ///////////
@@ -122,7 +120,3 @@ public:
 
 	wxString GetDecoderName();
 };
-
-#endif
-
-