From 3227d74e4d434d497673e5a77589b674e811c969 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 11 Aug 2017 18:53:24 -0700 Subject: [PATCH] Qt: Change header guards to pragma once --- src/platform/qt/AboutScreen.h | 5 +---- src/platform/qt/ArchiveInspector.h | 5 +---- src/platform/qt/AssetTile.h | 5 +---- src/platform/qt/AssetView.h | 5 +---- src/platform/qt/AudioDevice.h | 5 +---- src/platform/qt/AudioProcessor.h | 6 ++---- src/platform/qt/AudioProcessorQt.h | 6 ++---- src/platform/qt/AudioProcessorSDL.h | 6 ++---- src/platform/qt/CheatsModel.h | 5 +---- src/platform/qt/CheatsView.h | 5 +---- src/platform/qt/ColorPicker.h | 5 +---- src/platform/qt/ConfigController.h | 5 +---- src/platform/qt/CoreController.h | 5 +---- src/platform/qt/CoreManager.h | 5 +---- src/platform/qt/DebuggerConsole.h | 5 +---- src/platform/qt/DebuggerConsoleController.h | 5 +---- src/platform/qt/DebuggerController.h | 5 +---- src/platform/qt/Display.h | 5 +---- src/platform/qt/DisplayGL.h | 5 +---- src/platform/qt/DisplayQt.h | 5 +---- src/platform/qt/GBAApp.h | 5 +---- src/platform/qt/GBAKeyEditor.h | 5 +---- src/platform/qt/GBAOverride.h | 5 +---- src/platform/qt/GBOverride.h | 5 +---- src/platform/qt/GDBController.h | 5 +---- src/platform/qt/GDBWindow.h | 5 +---- src/platform/qt/GIFView.h | 5 +---- src/platform/qt/GamepadAxisEvent.h | 5 +---- src/platform/qt/GamepadButtonEvent.h | 5 +---- src/platform/qt/GamepadHatEvent.h | 5 +---- src/platform/qt/IOViewer.h | 5 +---- src/platform/qt/InputController.h | 5 +---- src/platform/qt/InputProfile.h | 5 +---- src/platform/qt/KeyEditor.h | 5 +---- src/platform/qt/LoadSaveState.h | 5 +---- src/platform/qt/LogController.h | 5 +---- src/platform/qt/LogView.h | 5 +---- src/platform/qt/MemoryModel.h | 5 +---- src/platform/qt/MemorySearch.h | 5 +---- src/platform/qt/MemoryView.h | 5 +---- src/platform/qt/MessagePainter.h | 5 +---- src/platform/qt/MultiplayerController.h | 4 +--- src/platform/qt/ObjView.h | 5 +---- src/platform/qt/Override.h | 5 +---- src/platform/qt/OverrideView.h | 5 +---- src/platform/qt/PaletteView.h | 5 +---- src/platform/qt/PrinterView.h | 5 +---- src/platform/qt/ROMInfo.h | 5 +---- src/platform/qt/SavestateButton.h | 5 +---- src/platform/qt/SensorView.h | 5 +---- src/platform/qt/SettingsView.h | 5 +---- src/platform/qt/ShaderSelector.h | 5 +---- src/platform/qt/ShortcutController.h | 5 +---- src/platform/qt/ShortcutView.h | 5 +---- src/platform/qt/Swatch.h | 5 +---- src/platform/qt/TilePainter.h | 5 +---- src/platform/qt/TileView.h | 5 +---- src/platform/qt/VFileDevice.h | 5 +---- src/platform/qt/VideoDumper.h | 6 ++---- src/platform/qt/VideoView.h | 5 +---- src/platform/qt/Window.h | 5 +---- src/platform/qt/library/LibraryController.h | 5 +---- src/platform/qt/library/LibraryGrid.h | 5 +---- src/platform/qt/library/LibraryTree.h | 5 +---- src/platform/qt/utils.h | 5 +---- 65 files changed, 69 insertions(+), 259 deletions(-) diff --git a/src/platform/qt/AboutScreen.h b/src/platform/qt/AboutScreen.h index aebf1bdc1..ddced8f40 100644 --- a/src/platform/qt/AboutScreen.h +++ b/src/platform/qt/AboutScreen.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_ABOUT_SCREEN -#define QGBA_ABOUT_SCREEN +#pragma once #include @@ -23,5 +22,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/ArchiveInspector.h b/src/platform/qt/ArchiveInspector.h index c7b471335..8caaa283d 100644 --- a/src/platform/qt/ArchiveInspector.h +++ b/src/platform/qt/ArchiveInspector.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_ARCHIVE_INSPECTOR -#define QGBA_ARCHIVE_INSPECTOR +#pragma once #include "ui_ArchiveInspector.h" @@ -26,5 +25,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/AssetTile.h b/src/platform/qt/AssetTile.h index 7d5f77be6..742a8e85f 100644 --- a/src/platform/qt/AssetTile.h +++ b/src/platform/qt/AssetTile.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_ASSET_TILE -#define QGBA_ASSET_TILE +#pragma once #include "ui_AssetTile.h" @@ -44,5 +43,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/AssetView.h b/src/platform/qt/AssetView.h index aabc79ab1..ed837cd5f 100644 --- a/src/platform/qt/AssetView.h +++ b/src/platform/qt/AssetView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_ASSET_VIEW -#define QGBA_ASSET_VIEW +#pragma once #include #include @@ -48,5 +47,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/AudioDevice.h b/src/platform/qt/AudioDevice.h index 3f95153be..0794b3743 100644 --- a/src/platform/qt/AudioDevice.h +++ b/src/platform/qt/AudioDevice.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_AUDIO_DEVICE -#define QGBA_AUDIO_DEVICE +#pragma once #include #include @@ -31,5 +30,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/AudioProcessor.h b/src/platform/qt/AudioProcessor.h index 16a9179f9..1e232bd99 100644 --- a/src/platform/qt/AudioProcessor.h +++ b/src/platform/qt/AudioProcessor.h @@ -3,8 +3,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_AUDIO_PROCESSOR -#define QGBA_AUDIO_PROCESSOR +#pragma once + #include #include @@ -59,5 +59,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/AudioProcessorQt.h b/src/platform/qt/AudioProcessorQt.h index cd2b9bf67..0e56907e1 100644 --- a/src/platform/qt/AudioProcessorQt.h +++ b/src/platform/qt/AudioProcessorQt.h @@ -3,8 +3,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_AUDIO_PROCESSOR_QT -#define QGBA_AUDIO_PROCESSOR_QT +#pragma once + #include "AudioProcessor.h" class QAudioOutput; @@ -39,5 +39,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/AudioProcessorSDL.h b/src/platform/qt/AudioProcessorSDL.h index 07de6e90b..c2d5d0ee1 100644 --- a/src/platform/qt/AudioProcessorSDL.h +++ b/src/platform/qt/AudioProcessorSDL.h @@ -3,8 +3,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_AUDIO_PROCESSOR_SDL -#define QGBA_AUDIO_PROCESSOR_SDL +#pragma once + #include "AudioProcessor.h" #ifdef BUILD_SDL @@ -39,5 +39,3 @@ private: } #endif - -#endif diff --git a/src/platform/qt/CheatsModel.h b/src/platform/qt/CheatsModel.h index 0830d18d1..e3012ebef 100644 --- a/src/platform/qt/CheatsModel.h +++ b/src/platform/qt/CheatsModel.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_CHEATS_MODEL -#define QGBA_CHEATS_MODEL +#pragma once #include #include @@ -51,5 +50,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/CheatsView.h b/src/platform/qt/CheatsView.h index 63ea7bd3e..7e47ef07e 100644 --- a/src/platform/qt/CheatsView.h +++ b/src/platform/qt/CheatsView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_CHEATS_VIEW -#define QGBA_CHEATS_VIEW +#pragma once #include @@ -44,5 +43,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/ColorPicker.h b/src/platform/qt/ColorPicker.h index 720e55922..5bc4bee20 100644 --- a/src/platform/qt/ColorPicker.h +++ b/src/platform/qt/ColorPicker.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_COLOR_PICKER -#define QGBA_COLOR_PICKER +#pragma once #include @@ -33,5 +32,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/ConfigController.h b/src/platform/qt/ConfigController.h index 17079ea4c..89581beaf 100644 --- a/src/platform/qt/ConfigController.h +++ b/src/platform/qt/ConfigController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_CONFIG_CONTROLLER -#define QGBA_CONFIG_CONTROLLER +#pragma once #include "Override.h" @@ -110,5 +109,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/CoreController.h b/src/platform/qt/CoreController.h index 4cd1a9f05..1bbde57a7 100644 --- a/src/platform/qt/CoreController.h +++ b/src/platform/qt/CoreController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_CORE_CONTROLLER -#define QGBA_CORE_CONTROLLER +#pragma once #include #include @@ -216,5 +215,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/CoreManager.h b/src/platform/qt/CoreManager.h index 78800ac41..da7460f22 100644 --- a/src/platform/qt/CoreManager.h +++ b/src/platform/qt/CoreManager.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_CORE_MANAGER -#define QGBA_CORE_MANAGER +#pragma once #include #include @@ -41,5 +40,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/DebuggerConsole.h b/src/platform/qt/DebuggerConsole.h index 7616b665f..f4bd4cadb 100644 --- a/src/platform/qt/DebuggerConsole.h +++ b/src/platform/qt/DebuggerConsole.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_DEBUGGER_CONSOLE -#define QGBA_DEBUGGER_CONSOLE +#pragma once #include "ui_DebuggerConsole.h" @@ -29,5 +28,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/DebuggerConsoleController.h b/src/platform/qt/DebuggerConsoleController.h index 83e1b53bb..5989b7441 100644 --- a/src/platform/qt/DebuggerConsoleController.h +++ b/src/platform/qt/DebuggerConsoleController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_DEBUGGER_CONSOLE_CONTROLLER -#define QGBA_DEBUGGER_CONSOLE_CONTROLLER +#pragma once #include "DebuggerController.h" @@ -59,5 +58,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/DebuggerController.h b/src/platform/qt/DebuggerController.h index 8677af1c5..650d533d3 100644 --- a/src/platform/qt/DebuggerController.h +++ b/src/platform/qt/DebuggerController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_DEBUGGER_CONTROLLER -#define QGBA_DEBUGGER_CONTROLLER +#pragma once #include @@ -44,5 +43,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/Display.h b/src/platform/qt/Display.h index f413a2b72..c09c91433 100644 --- a/src/platform/qt/Display.h +++ b/src/platform/qt/Display.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_DISPLAY -#define QGBA_DISPLAY +#pragma once #include @@ -85,5 +84,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/DisplayGL.h b/src/platform/qt/DisplayGL.h index c4d2916bd..a1f435fe2 100644 --- a/src/platform/qt/DisplayGL.h +++ b/src/platform/qt/DisplayGL.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_DISPLAY_GL -#define QGBA_DISPLAY_GL +#pragma once #if defined(BUILD_GL) || defined(BUILD_GLES) @@ -130,5 +129,3 @@ private: } #endif - -#endif diff --git a/src/platform/qt/DisplayQt.h b/src/platform/qt/DisplayQt.h index ac7e63a86..b51d40ca4 100644 --- a/src/platform/qt/DisplayQt.h +++ b/src/platform/qt/DisplayQt.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_DISPLAY_QT -#define QGBA_DISPLAY_QT +#pragma once #include "Display.h" @@ -48,5 +47,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/GBAApp.h b/src/platform/qt/GBAApp.h index 99db127a5..8530a70b3 100644 --- a/src/platform/qt/GBAApp.h +++ b/src/platform/qt/GBAApp.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_APP_H -#define QGBA_APP_H +#pragma once #include #include @@ -83,5 +82,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/GBAKeyEditor.h b/src/platform/qt/GBAKeyEditor.h index 6070d7f50..22720ab3c 100644 --- a/src/platform/qt/GBAKeyEditor.h +++ b/src/platform/qt/GBAKeyEditor.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_GBA_KEY_EDITOR -#define QGBA_GBA_KEY_EDITOR +#pragma once #include #include @@ -92,5 +91,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/GBAOverride.h b/src/platform/qt/GBAOverride.h index a668a0d57..2cbc6944b 100644 --- a/src/platform/qt/GBAOverride.h +++ b/src/platform/qt/GBAOverride.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_GBA_OVERRIDE -#define QGBA_GBA_OVERRIDE +#pragma once #include "Override.h" @@ -22,5 +21,3 @@ public: }; } - -#endif diff --git a/src/platform/qt/GBOverride.h b/src/platform/qt/GBOverride.h index 7c52b497a..82c53ca7f 100644 --- a/src/platform/qt/GBOverride.h +++ b/src/platform/qt/GBOverride.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_GB_OVERRIDE -#define QGBA_GB_OVERRIDE +#pragma once #include "Override.h" @@ -22,5 +21,3 @@ public: }; } - -#endif diff --git a/src/platform/qt/GDBController.h b/src/platform/qt/GDBController.h index 25c0a18bf..f2380c6af 100644 --- a/src/platform/qt/GDBController.h +++ b/src/platform/qt/GDBController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_GDB_CONTROLLER -#define QGBA_GDB_CONTROLLER +#pragma once #include "DebuggerController.h" @@ -47,5 +46,3 @@ private: } #endif - -#endif diff --git a/src/platform/qt/GDBWindow.h b/src/platform/qt/GDBWindow.h index 4e91c0e90..f185a7df7 100644 --- a/src/platform/qt/GDBWindow.h +++ b/src/platform/qt/GDBWindow.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_GDB_WINDOW -#define QGBA_GDB_WINDOW +#pragma once #include @@ -40,5 +39,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/GIFView.h b/src/platform/qt/GIFView.h index f5433ae3e..b138cf071 100644 --- a/src/platform/qt/GIFView.h +++ b/src/platform/qt/GIFView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_GIF_VIEW -#define QGBA_GIF_VIEW +#pragma once #ifdef USE_MAGICK @@ -55,5 +54,3 @@ private: } #endif - -#endif diff --git a/src/platform/qt/GamepadAxisEvent.h b/src/platform/qt/GamepadAxisEvent.h index 68234ccdc..34b259c7c 100644 --- a/src/platform/qt/GamepadAxisEvent.h +++ b/src/platform/qt/GamepadAxisEvent.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_GAMEPAD_AXIS_EVENT -#define QGBA_GAMEPAD_AXIS_EVENT +#pragma once #include @@ -42,5 +41,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/GamepadButtonEvent.h b/src/platform/qt/GamepadButtonEvent.h index b0751f4b6..0f73dc03a 100644 --- a/src/platform/qt/GamepadButtonEvent.h +++ b/src/platform/qt/GamepadButtonEvent.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_GAMEPAD_BUTTON_EVENT -#define QGBA_GAMEPAD_BUTTON_EVENT +#pragma once #include @@ -34,5 +33,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/GamepadHatEvent.h b/src/platform/qt/GamepadHatEvent.h index ea81dcafd..63090da7a 100644 --- a/src/platform/qt/GamepadHatEvent.h +++ b/src/platform/qt/GamepadHatEvent.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_GAMEPAD_HAT_EVENT -#define QGBA_GAMEPAD_HAT_EVENT +#pragma once #include @@ -44,5 +43,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/IOViewer.h b/src/platform/qt/IOViewer.h index 1e1da3c62..c1ae69c49 100644 --- a/src/platform/qt/IOViewer.h +++ b/src/platform/qt/IOViewer.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_IOVIEWER -#define QGBA_IOVIEWER +#pragma once #include #include @@ -71,5 +70,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/InputController.h b/src/platform/qt/InputController.h index 50d670fc2..0fb6b16e0 100644 --- a/src/platform/qt/InputController.h +++ b/src/platform/qt/InputController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_INPUT_CONTROLLER_H -#define QGBA_INPUT_CONTROLLER_H +#pragma once #include "GamepadAxisEvent.h" #include "GamepadHatEvent.h" @@ -179,5 +178,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/InputProfile.h b/src/platform/qt/InputProfile.h index 431bd4b4f..4e43d16a7 100644 --- a/src/platform/qt/InputProfile.h +++ b/src/platform/qt/InputProfile.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_INPUT_PROFILE -#define QGBA_INPUT_PROFILE +#pragma once #include "GamepadAxisEvent.h" @@ -94,5 +93,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/KeyEditor.h b/src/platform/qt/KeyEditor.h index e1a7fa949..00798c56f 100644 --- a/src/platform/qt/KeyEditor.h +++ b/src/platform/qt/KeyEditor.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_KEY_EDITOR -#define QGBA_KEY_EDITOR +#pragma once #include "GamepadAxisEvent.h" #include "GamepadHatEvent.h" @@ -64,5 +63,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/LoadSaveState.h b/src/platform/qt/LoadSaveState.h index 8da0beef3..b762a00e1 100644 --- a/src/platform/qt/LoadSaveState.h +++ b/src/platform/qt/LoadSaveState.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_LOAD_SAVE_STATE -#define QGBA_LOAD_SAVE_STATE +#pragma once #include @@ -57,5 +56,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/LogController.h b/src/platform/qt/LogController.h index db87c9f91..e9f536e97 100644 --- a/src/platform/qt/LogController.h +++ b/src/platform/qt/LogController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_LOG_CONTROLLER -#define QGBA_LOG_CONTROLLER +#pragma once #include "GBAApp.h" @@ -66,5 +65,3 @@ private: #define LOG(C, L) (*LogController::global())(mLOG_ ## L, _mLOG_CAT_ ## C ()) } - -#endif diff --git a/src/platform/qt/LogView.h b/src/platform/qt/LogView.h index 8151b6da8..d037ae5a0 100644 --- a/src/platform/qt/LogView.h +++ b/src/platform/qt/LogView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_LOG_VIEW -#define QGBA_LOG_VIEW +#pragma once #include #include @@ -50,5 +49,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/MemoryModel.h b/src/platform/qt/MemoryModel.h index f40b9383a..ee55a6e74 100644 --- a/src/platform/qt/MemoryModel.h +++ b/src/platform/qt/MemoryModel.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_MEMORY_MODEL -#define QGBA_MEMORY_MODEL +#pragma once #include #include @@ -99,5 +98,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/MemorySearch.h b/src/platform/qt/MemorySearch.h index 8c02aa28d..28b5a2572 100644 --- a/src/platform/qt/MemorySearch.h +++ b/src/platform/qt/MemorySearch.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_MEMORY_SEARCH -#define QGBA_MEMORY_SEARCH +#pragma once #include @@ -45,5 +44,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/MemoryView.h b/src/platform/qt/MemoryView.h index 049c63aed..3af1835b8 100644 --- a/src/platform/qt/MemoryView.h +++ b/src/platform/qt/MemoryView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_MEMORY_VIEW -#define QGBA_MEMORY_VIEW +#pragma once #include "MemoryModel.h" @@ -38,5 +37,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/MessagePainter.h b/src/platform/qt/MessagePainter.h index 24a48b3a5..37f24c766 100644 --- a/src/platform/qt/MessagePainter.h +++ b/src/platform/qt/MessagePainter.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_MESSAGE_PAINTER -#define QGBA_MESSAGE_PAINTER +#pragma once #include #include @@ -43,5 +42,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/MultiplayerController.h b/src/platform/qt/MultiplayerController.h index b7f043140..fefba4cb4 100644 --- a/src/platform/qt/MultiplayerController.h +++ b/src/platform/qt/MultiplayerController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_MULTIPLAYER_CONTROLLER -#define QGBA_MULTIPLAYER_CONTROLLER +#pragma once #include #include @@ -64,4 +63,3 @@ private: }; } -#endif diff --git a/src/platform/qt/ObjView.h b/src/platform/qt/ObjView.h index 1771883a7..f5b628fb1 100644 --- a/src/platform/qt/ObjView.h +++ b/src/platform/qt/ObjView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_OBJ_VIEW -#define QGBA_OBJ_VIEW +#pragma once #include "AssetView.h" @@ -60,5 +59,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/Override.h b/src/platform/qt/Override.h index a7bdacce3..2ff209d8c 100644 --- a/src/platform/qt/Override.h +++ b/src/platform/qt/Override.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_OVERRIDE -#define QGBA_OVERRIDE +#pragma once struct Configuration; struct mCore; @@ -21,5 +20,3 @@ public: }; } - -#endif diff --git a/src/platform/qt/OverrideView.h b/src/platform/qt/OverrideView.h index 5fa62f2ee..7dc148155 100644 --- a/src/platform/qt/OverrideView.h +++ b/src/platform/qt/OverrideView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_OVERRIDE_VIEW -#define QGBA_OVERRIDE_VIEW +#pragma once #include @@ -59,5 +58,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/PaletteView.h b/src/platform/qt/PaletteView.h index d3bbb6023..493e825d9 100644 --- a/src/platform/qt/PaletteView.h +++ b/src/platform/qt/PaletteView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_PALETTE_VIEW -#define QGBA_PALETTE_VIEW +#pragma once #include @@ -40,5 +39,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/PrinterView.h b/src/platform/qt/PrinterView.h index 581350961..ed48714cc 100644 --- a/src/platform/qt/PrinterView.h +++ b/src/platform/qt/PrinterView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_PRINTER_VIEW -#define QGBA_PRINTER_VIEW +#pragma once #include #include @@ -46,5 +45,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/ROMInfo.h b/src/platform/qt/ROMInfo.h index b5ce734aa..f6aa0aa7b 100644 --- a/src/platform/qt/ROMInfo.h +++ b/src/platform/qt/ROMInfo.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_ROM_INFO -#define QGBA_ROM_INFO +#pragma once #include @@ -27,5 +26,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/SavestateButton.h b/src/platform/qt/SavestateButton.h index 3551fcb89..684a02c09 100644 --- a/src/platform/qt/SavestateButton.h +++ b/src/platform/qt/SavestateButton.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_SAVESTATE_BUTTON -#define QGBA_SAVESTATE_BUTTON +#pragma once #include @@ -19,5 +18,3 @@ protected: }; } - -#endif diff --git a/src/platform/qt/SensorView.h b/src/platform/qt/SensorView.h index 78dc4d82d..4cead7d11 100644 --- a/src/platform/qt/SensorView.h +++ b/src/platform/qt/SensorView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_SENSOR_VIEW -#define QGBA_SENSOR_VIEW +#pragma once #include #include @@ -53,5 +52,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/SettingsView.h b/src/platform/qt/SettingsView.h index 55d2086ce..0ae5d0b07 100644 --- a/src/platform/qt/SettingsView.h +++ b/src/platform/qt/SettingsView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_SETTINGS_VIEW -#define QGBA_SETTINGS_VIEW +#pragma once #include @@ -79,5 +78,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/ShaderSelector.h b/src/platform/qt/ShaderSelector.h index 299204181..5bdb2a0b7 100644 --- a/src/platform/qt/ShaderSelector.h +++ b/src/platform/qt/ShaderSelector.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_SHADER_SELECTOR_H -#define QGBA_SHADER_SELECTOR_H +#pragma once #if defined(BUILD_GL) || defined(BUILD_GLES) @@ -58,5 +57,3 @@ private: } #endif - -#endif diff --git a/src/platform/qt/ShortcutController.h b/src/platform/qt/ShortcutController.h index f0cc90148..219188da1 100644 --- a/src/platform/qt/ShortcutController.h +++ b/src/platform/qt/ShortcutController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_SHORTCUT_MODEL -#define QGBA_SHORTCUT_MODEL +#pragma once #include "GamepadAxisEvent.h" @@ -144,5 +143,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/ShortcutView.h b/src/platform/qt/ShortcutView.h index 94314a84b..434cd82c3 100644 --- a/src/platform/qt/ShortcutView.h +++ b/src/platform/qt/ShortcutView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_SHORTCUT_VIEW -#define QGBA_SHORTCUT_VIEW +#pragma once #include "GamepadAxisEvent.h" @@ -45,5 +44,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/Swatch.h b/src/platform/qt/Swatch.h index 57fd08510..971a620b5 100644 --- a/src/platform/qt/Swatch.h +++ b/src/platform/qt/Swatch.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_SWATCH -#define QGBA_SWATCH +#pragma once #include #include @@ -41,5 +40,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/TilePainter.h b/src/platform/qt/TilePainter.h index e76af6ae3..532db6565 100644 --- a/src/platform/qt/TilePainter.h +++ b/src/platform/qt/TilePainter.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_TILE_PAINTER -#define QGBA_TILE_PAINTER +#pragma once #include #include @@ -38,5 +37,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/TileView.h b/src/platform/qt/TileView.h index 2cdb276c7..cedb11d6c 100644 --- a/src/platform/qt/TileView.h +++ b/src/platform/qt/TileView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_TILE_VIEW -#define QGBA_TILE_VIEW +#pragma once #include "AssetView.h" @@ -41,5 +40,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/VFileDevice.h b/src/platform/qt/VFileDevice.h index e4e6b17e0..180be2e6e 100644 --- a/src/platform/qt/VFileDevice.h +++ b/src/platform/qt/VFileDevice.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_VFILE_DEVICE -#define QGBA_VFILE_DEVICE +#pragma once #include @@ -41,5 +40,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/VideoDumper.h b/src/platform/qt/VideoDumper.h index f2deb1044..081fe3b45 100644 --- a/src/platform/qt/VideoDumper.h +++ b/src/platform/qt/VideoDumper.h @@ -3,8 +3,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_VIDEO_DUMPER -#define QGBA_VIDEO_DUMPER +#pragma once + #include namespace QGBA { @@ -23,5 +23,3 @@ signals: }; } - -#endif diff --git a/src/platform/qt/VideoView.h b/src/platform/qt/VideoView.h index e84d63fe8..3535535ae 100644 --- a/src/platform/qt/VideoView.h +++ b/src/platform/qt/VideoView.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_VIDEO_VIEW -#define QGBA_VIDEO_VIEW +#pragma once #ifdef USE_FFMPEG @@ -117,5 +116,3 @@ private: } #endif - -#endif diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h index 9c9384d8b..0bd06eda7 100644 --- a/src/platform/qt/Window.h +++ b/src/platform/qt/Window.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_WINDOW -#define QGBA_WINDOW +#pragma once #include #include @@ -245,5 +244,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/library/LibraryController.h b/src/platform/qt/library/LibraryController.h index 7a7799b5b..027b83f31 100644 --- a/src/platform/qt/library/LibraryController.h +++ b/src/platform/qt/library/LibraryController.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_LIBRARY_CONTROLLER -#define QGBA_LIBRARY_CONTROLLER +#pragma once #include @@ -125,5 +124,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/library/LibraryGrid.h b/src/platform/qt/library/LibraryGrid.h index 98a0df630..48f0357da 100644 --- a/src/platform/qt/library/LibraryGrid.h +++ b/src/platform/qt/library/LibraryGrid.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_LIBRARY_GRID -#define QGBA_LIBRARY_GRID +#pragma once #include @@ -46,5 +45,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/library/LibraryTree.h b/src/platform/qt/library/LibraryTree.h index 80e3b461d..c705316bb 100644 --- a/src/platform/qt/library/LibraryTree.h +++ b/src/platform/qt/library/LibraryTree.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_LIBRARY_TREE -#define QGBA_LIBRARY_TREE +#pragma once #include @@ -53,5 +52,3 @@ private: }; } - -#endif diff --git a/src/platform/qt/utils.h b/src/platform/qt/utils.h index 210e1f85a..5dda75dd5 100644 --- a/src/platform/qt/utils.h +++ b/src/platform/qt/utils.h @@ -3,8 +3,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef QGBA_UTILS_H -#define QGBA_UTILS_H +#pragma once #include @@ -16,5 +15,3 @@ QString niceSizeFormat(size_t filesize); QString nicePlatformFormat(mPlatform platform); } - -#endif