From 7884efc49ede427e4f171fc57d5e1ab0d74b3b79 Mon Sep 17 00:00:00 2001 From: Jim-Marsden <47166310+Jim-Marsden@users.noreply.github.com> Date: Tue, 20 Dec 2022 20:17:38 -0800 Subject: [PATCH] Replaced Header Guards with Pragma Once --- examples/shader/Effect.hpp | 5 +---- include/SFML/Audio.hpp | 5 +---- include/SFML/Audio/AlResource.hpp | 5 +---- include/SFML/Audio/Export.hpp | 6 +----- include/SFML/Audio/InputSoundFile.hpp | 6 +----- include/SFML/Audio/Listener.hpp | 6 +----- include/SFML/Audio/Music.hpp | 6 +----- include/SFML/Audio/OutputSoundFile.hpp | 6 +----- include/SFML/Audio/Sound.hpp | 6 +----- include/SFML/Audio/SoundBuffer.hpp | 6 +----- include/SFML/Audio/SoundBufferRecorder.hpp | 5 +---- include/SFML/Audio/SoundFileFactory.hpp | 5 +---- include/SFML/Audio/SoundFileReader.hpp | 6 +----- include/SFML/Audio/SoundFileWriter.hpp | 6 +----- include/SFML/Audio/SoundRecorder.hpp | 6 +----- include/SFML/Audio/SoundSource.hpp | 6 +----- include/SFML/Audio/SoundStream.hpp | 6 +----- include/SFML/Config.hpp | 6 +----- include/SFML/GpuPreference.hpp | 6 +----- include/SFML/Graphics.hpp | 5 +---- include/SFML/Graphics/BlendMode.hpp | 6 +----- include/SFML/Graphics/CircleShape.hpp | 6 +----- include/SFML/Graphics/Color.hpp | 6 +----- include/SFML/Graphics/ConvexShape.hpp | 6 +----- include/SFML/Graphics/Drawable.hpp | 6 +----- include/SFML/Graphics/Export.hpp | 6 +----- include/SFML/Graphics/Font.hpp | 6 +----- include/SFML/Graphics/Glsl.hpp | 5 +---- include/SFML/Graphics/Glyph.hpp | 6 +----- include/SFML/Graphics/Image.hpp | 6 +----- include/SFML/Graphics/PrimitiveType.hpp | 6 +----- include/SFML/Graphics/Rect.hpp | 6 +----- include/SFML/Graphics/RectangleShape.hpp | 6 +----- include/SFML/Graphics/RenderStates.hpp | 6 +----- include/SFML/Graphics/RenderTarget.hpp | 6 +----- include/SFML/Graphics/RenderTexture.hpp | 6 +----- include/SFML/Graphics/RenderWindow.hpp | 6 +----- include/SFML/Graphics/Shader.hpp | 6 +----- include/SFML/Graphics/Shape.hpp | 6 +----- include/SFML/Graphics/Sprite.hpp | 6 +----- include/SFML/Graphics/Text.hpp | 6 +----- include/SFML/Graphics/Texture.hpp | 5 +---- include/SFML/Graphics/Transform.hpp | 6 +----- include/SFML/Graphics/Transformable.hpp | 6 +----- include/SFML/Graphics/Vertex.hpp | 6 +----- include/SFML/Graphics/VertexArray.hpp | 6 +----- include/SFML/Graphics/VertexBuffer.hpp | 6 +----- include/SFML/Graphics/View.hpp | 6 +----- include/SFML/Main.hpp | 6 +----- include/SFML/Network.hpp | 5 +---- include/SFML/Network/Export.hpp | 6 +----- include/SFML/Network/Ftp.hpp | 6 +----- include/SFML/Network/Http.hpp | 6 +----- include/SFML/Network/IpAddress.hpp | 6 +----- include/SFML/Network/Packet.hpp | 6 +----- include/SFML/Network/Socket.hpp | 6 +----- include/SFML/Network/SocketHandle.hpp | 6 +----- include/SFML/Network/SocketSelector.hpp | 6 +----- include/SFML/Network/TcpListener.hpp | 6 +----- include/SFML/Network/TcpSocket.hpp | 6 +----- include/SFML/Network/UdpSocket.hpp | 6 +----- include/SFML/OpenGL.hpp | 6 +----- include/SFML/System.hpp | 4 +--- include/SFML/System/Angle.hpp | 6 +----- include/SFML/System/Clock.hpp | 6 +----- include/SFML/System/Err.hpp | 6 +----- include/SFML/System/Export.hpp | 6 +----- include/SFML/System/FileInputStream.hpp | 6 +----- include/SFML/System/InputStream.hpp | 6 +----- include/SFML/System/MemoryInputStream.hpp | 6 +----- include/SFML/System/NativeActivity.hpp | 6 +----- include/SFML/System/Sleep.hpp | 6 +----- include/SFML/System/String.hpp | 6 +----- include/SFML/System/SuspendAwareClock.hpp | 5 +---- include/SFML/System/Time.hpp | 6 +----- include/SFML/System/Utf.hpp | 6 +----- include/SFML/System/Vector2.hpp | 6 +----- include/SFML/System/Vector3.hpp | 6 +----- include/SFML/Window.hpp | 5 +---- include/SFML/Window/Clipboard.hpp | 6 +----- include/SFML/Window/Context.hpp | 5 +---- include/SFML/Window/ContextSettings.hpp | 6 +----- include/SFML/Window/Cursor.hpp | 6 +----- include/SFML/Window/Event.hpp | 6 +----- include/SFML/Window/Export.hpp | 6 +----- include/SFML/Window/GlResource.hpp | 5 +---- include/SFML/Window/Joystick.hpp | 6 +----- include/SFML/Window/Keyboard.hpp | 6 +----- include/SFML/Window/Mouse.hpp | 6 +----- include/SFML/Window/Sensor.hpp | 6 +----- include/SFML/Window/Touch.hpp | 6 +----- include/SFML/Window/VideoMode.hpp | 6 +----- include/SFML/Window/Vulkan.hpp | 6 +----- include/SFML/Window/Window.hpp | 6 +----- include/SFML/Window/WindowBase.hpp | 6 +----- include/SFML/Window/WindowHandle.hpp | 5 +---- include/SFML/Window/WindowStyle.hpp | 6 +----- src/SFML/Audio/ALCheck.hpp | 5 +---- src/SFML/Audio/AudioDevice.hpp | 6 +----- src/SFML/Audio/SoundFileReaderFlac.hpp | 6 +----- src/SFML/Audio/SoundFileReaderMp3.hpp | 6 +----- src/SFML/Audio/SoundFileReaderOgg.hpp | 6 +----- src/SFML/Audio/SoundFileReaderWav.hpp | 6 +----- src/SFML/Audio/SoundFileWriterFlac.hpp | 6 +----- src/SFML/Audio/SoundFileWriterOgg.hpp | 6 +----- src/SFML/Audio/SoundFileWriterWav.hpp | 6 +----- src/SFML/Graphics/GLCheck.hpp | 6 +----- src/SFML/Graphics/GLExtensions.hpp | 6 +----- src/SFML/Graphics/ImageLoader.hpp | 6 +----- src/SFML/Graphics/RenderTextureImpl.hpp | 6 +----- src/SFML/Graphics/RenderTextureImplDefault.hpp | 6 +----- src/SFML/Graphics/RenderTextureImplFBO.hpp | 6 +----- src/SFML/Graphics/TextureSaver.hpp | 6 +----- src/SFML/Network/Unix/SocketImpl.hpp | 6 +----- src/SFML/Network/Win32/SocketImpl.hpp | 6 +----- src/SFML/PCH.hpp | 5 +---- src/SFML/System/Android/Activity.hpp | 6 +----- src/SFML/System/Android/ResourceStream.hpp | 6 +----- src/SFML/System/Unix/SleepImpl.hpp | 6 +----- src/SFML/System/Utils.hpp | 5 +---- src/SFML/System/Win32/SleepImpl.hpp | 6 +----- src/SFML/System/Win32/WindowsHeader.hpp | 5 +---- src/SFML/Window/Android/ClipboardImpl.hpp | 6 +----- src/SFML/Window/Android/CursorImpl.hpp | 5 +---- src/SFML/Window/Android/InputImpl.hpp | 6 +----- src/SFML/Window/Android/JoystickImpl.hpp | 6 +----- src/SFML/Window/Android/SensorImpl.hpp | 6 +----- src/SFML/Window/Android/WindowImplAndroid.hpp | 6 +----- src/SFML/Window/ClipboardImpl.hpp | 5 +---- src/SFML/Window/CursorImpl.hpp | 6 +----- src/SFML/Window/DRM/ClipboardImpl.hpp | 6 +----- src/SFML/Window/DRM/CursorImpl.hpp | 6 +----- src/SFML/Window/DRM/DRMContext.hpp | 6 +----- src/SFML/Window/DRM/InputImplUDev.hpp | 6 +----- src/SFML/Window/DRM/WindowImplDRM.hpp | 6 +----- src/SFML/Window/EGLCheck.hpp | 6 +----- src/SFML/Window/EglContext.hpp | 6 +----- src/SFML/Window/FreeBSD/JoystickImpl.hpp | 6 +----- src/SFML/Window/GlContext.hpp | 6 +----- src/SFML/Window/InputImpl.hpp | 5 +---- src/SFML/Window/JoystickImpl.hpp | 6 +----- src/SFML/Window/JoystickManager.hpp | 6 +----- src/SFML/Window/NetBSD/JoystickImpl.hpp | 6 +----- src/SFML/Window/OSX/AutoreleasePoolWrapper.hpp | 5 +---- src/SFML/Window/OSX/ClipboardImpl.hpp | 6 +----- src/SFML/Window/OSX/CursorImpl.hpp | 5 +---- src/SFML/Window/OSX/HIDInputManager.hpp | 5 +---- src/SFML/Window/OSX/HIDJoystickManager.hpp | 5 +---- src/SFML/Window/OSX/InputImpl.hpp | 6 +----- src/SFML/Window/OSX/JoystickImpl.hpp | 6 +----- src/SFML/Window/OSX/SFContext.hpp | 5 +---- src/SFML/Window/OSX/SensorImpl.hpp | 6 +----- src/SFML/Window/OSX/WindowImplCocoa.hpp | 5 +---- src/SFML/Window/OSX/cg_sf_conversion.hpp | 5 +---- src/SFML/Window/OpenBSD/JoystickImpl.hpp | 6 +----- src/SFML/Window/SensorImpl.hpp | 6 +----- src/SFML/Window/SensorManager.hpp | 6 +----- src/SFML/Window/Unix/ClipboardImpl.hpp | 6 +----- src/SFML/Window/Unix/CursorImpl.hpp | 5 +---- src/SFML/Window/Unix/Display.hpp | 6 +----- src/SFML/Window/Unix/GlxContext.hpp | 5 +---- src/SFML/Window/Unix/InputImpl.hpp | 6 +----- src/SFML/Window/Unix/JoystickImpl.hpp | 6 +----- src/SFML/Window/Unix/SensorImpl.hpp | 6 +----- src/SFML/Window/Unix/VulkanImplX11.hpp | 6 +----- src/SFML/Window/Unix/WindowImplX11.hpp | 6 +----- src/SFML/Window/VideoModeImpl.hpp | 6 +----- src/SFML/Window/Win32/ClipboardImpl.hpp | 6 +----- src/SFML/Window/Win32/CursorImpl.hpp | 5 +---- src/SFML/Window/Win32/InputImpl.hpp | 6 +----- src/SFML/Window/Win32/JoystickImpl.hpp | 6 +----- src/SFML/Window/Win32/SensorImpl.hpp | 6 +----- src/SFML/Window/Win32/VulkanImplWin32.hpp | 6 +----- src/SFML/Window/Win32/WglContext.hpp | 5 +---- src/SFML/Window/Win32/WindowImplWin32.hpp | 5 +---- src/SFML/Window/WindowImpl.hpp | 6 +----- src/SFML/Window/iOS/ClipboardImpl.hpp | 6 +----- src/SFML/Window/iOS/CursorImpl.hpp | 5 +---- src/SFML/Window/iOS/EaglContext.hpp | 5 +---- src/SFML/Window/iOS/InputImpl.hpp | 6 +----- src/SFML/Window/iOS/JoystickImpl.hpp | 6 +----- src/SFML/Window/iOS/ObjCType.hpp | 6 +----- src/SFML/Window/iOS/SFAppDelegate.hpp | 5 +---- src/SFML/Window/iOS/SFMain.hpp | 6 +----- src/SFML/Window/iOS/SFView.hpp | 5 +---- src/SFML/Window/iOS/SFViewController.hpp | 5 +---- src/SFML/Window/iOS/SensorImpl.hpp | 6 +----- src/SFML/Window/iOS/WindowImplUIKit.hpp | 6 +----- test/TestUtilities/GraphicsUtil.hpp | 5 +---- test/TestUtilities/SystemUtil.hpp | 5 +---- test/TestUtilities/WindowUtil.hpp | 5 +---- .../templates/SFML/SFML App.xctemplate/ResourcePath.hpp | 5 +---- 192 files changed, 192 insertions(+), 916 deletions(-) diff --git a/examples/shader/Effect.hpp b/examples/shader/Effect.hpp index 6beee3f3..2eaf6dfa 100644 --- a/examples/shader/Effect.hpp +++ b/examples/shader/Effect.hpp @@ -1,5 +1,4 @@ -#ifndef EFFECT_HPP -#define EFFECT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -80,5 +79,3 @@ private: // NOLINTNEXTLINE(readability-identifier-naming) static const sf::Font* s_font; }; - -#endif // EFFECT_HPP diff --git a/include/SFML/Audio.hpp b/include/SFML/Audio.hpp index e69aaada..1a2b71c1 100644 --- a/include/SFML/Audio.hpp +++ b/include/SFML/Audio.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_AUDIO_HPP -#define SFML_AUDIO_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -45,8 +44,6 @@ #include -#endif // SFML_AUDIO_HPP - //////////////////////////////////////////////////////////// /// \defgroup audio Audio module /// diff --git a/include/SFML/Audio/AlResource.hpp b/include/SFML/Audio/AlResource.hpp index 85efd7f0..3c91bfa3 100644 --- a/include/SFML/Audio/AlResource.hpp +++ b/include/SFML/Audio/AlResource.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_ALRESOURCE_HPP -#define SFML_ALRESOURCE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -56,8 +55,6 @@ protected: } // namespace sf -#endif // SFML_ALRESOURCE_HPP - //////////////////////////////////////////////////////////// /// \class sf::AlResource /// \ingroup audio diff --git a/include/SFML/Audio/Export.hpp b/include/SFML/Audio/Export.hpp index 8557154b..2c5ba770 100644 --- a/include/SFML/Audio/Export.hpp +++ b/include/SFML/Audio/Export.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_AUDIO_EXPORT_HPP -#define SFML_AUDIO_EXPORT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define SFML_AUDIO_API SFML_API_IMPORT #endif - - -#endif // SFML_AUDIO_EXPORT_HPP diff --git a/include/SFML/Audio/InputSoundFile.hpp b/include/SFML/Audio/InputSoundFile.hpp index 54cfb563..8eb82c0c 100644 --- a/include/SFML/Audio/InputSoundFile.hpp +++ b/include/SFML/Audio/InputSoundFile.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTSOUNDFILE_HPP -#define SFML_INPUTSOUNDFILE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -251,9 +250,6 @@ private: } // namespace sf -#endif // SFML_INPUTSOUNDFILE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::InputSoundFile /// \ingroup audio diff --git a/include/SFML/Audio/Listener.hpp b/include/SFML/Audio/Listener.hpp index 6d2cf647..44d5c49f 100644 --- a/include/SFML/Audio/Listener.hpp +++ b/include/SFML/Audio/Listener.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_LISTENER_HPP -#define SFML_LISTENER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -147,9 +146,6 @@ public: } // namespace sf -#endif // SFML_LISTENER_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Listener /// \ingroup audio diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp index 64acd6c3..99f74091 100644 --- a/include/SFML/Audio/Music.hpp +++ b/include/SFML/Audio/Music.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_MUSIC_HPP -#define SFML_MUSIC_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -280,9 +279,6 @@ private: } // namespace sf -#endif // SFML_MUSIC_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Music /// \ingroup audio diff --git a/include/SFML/Audio/OutputSoundFile.hpp b/include/SFML/Audio/OutputSoundFile.hpp index d1474557..2885d7bd 100644 --- a/include/SFML/Audio/OutputSoundFile.hpp +++ b/include/SFML/Audio/OutputSoundFile.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_OUTPUTSOUNDFILE_HPP -#define SFML_OUTPUTSOUNDFILE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -111,9 +110,6 @@ private: } // namespace sf -#endif // SFML_OUTPUTSOUNDFILE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::OutputSoundFile /// \ingroup audio diff --git a/include/SFML/Audio/Sound.hpp b/include/SFML/Audio/Sound.hpp index 25b07bb8..196327f3 100644 --- a/include/SFML/Audio/Sound.hpp +++ b/include/SFML/Audio/Sound.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUND_HPP -#define SFML_SOUND_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -223,9 +222,6 @@ private: } // namespace sf -#endif // SFML_SOUND_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Sound /// \ingroup audio diff --git a/include/SFML/Audio/SoundBuffer.hpp b/include/SFML/Audio/SoundBuffer.hpp index 882dc552..0db5be41 100644 --- a/include/SFML/Audio/SoundBuffer.hpp +++ b/include/SFML/Audio/SoundBuffer.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDBUFFER_HPP -#define SFML_SOUNDBUFFER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -284,9 +283,6 @@ private: } // namespace sf -#endif // SFML_SOUNDBUFFER_HPP - - //////////////////////////////////////////////////////////// /// \class sf::SoundBuffer /// \ingroup audio diff --git a/include/SFML/Audio/SoundBufferRecorder.hpp b/include/SFML/Audio/SoundBufferRecorder.hpp index f85d9e1e..70ec4c2c 100644 --- a/include/SFML/Audio/SoundBufferRecorder.hpp +++ b/include/SFML/Audio/SoundBufferRecorder.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDBUFFERRECORDER_HPP -#define SFML_SOUNDBUFFERRECORDER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -101,8 +100,6 @@ private: } // namespace sf -#endif // SFML_SOUNDBUFFERRECORDER_HPP - //////////////////////////////////////////////////////////// /// \class sf::SoundBufferRecorder diff --git a/include/SFML/Audio/SoundFileFactory.hpp b/include/SFML/Audio/SoundFileFactory.hpp index 77521ff4..3b57b534 100644 --- a/include/SFML/Audio/SoundFileFactory.hpp +++ b/include/SFML/Audio/SoundFileFactory.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEFACTORY_HPP -#define SFML_SOUNDFILEFACTORY_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -163,8 +162,6 @@ private: #include -#endif // SFML_SOUNDFILEFACTORY_HPP - //////////////////////////////////////////////////////////// /// \class sf::SoundFileFactory diff --git a/include/SFML/Audio/SoundFileReader.hpp b/include/SFML/Audio/SoundFileReader.hpp index 58e48be1..47e1e6d9 100644 --- a/include/SFML/Audio/SoundFileReader.hpp +++ b/include/SFML/Audio/SoundFileReader.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEREADER_HPP -#define SFML_SOUNDFILEREADER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -106,9 +105,6 @@ public: } // namespace sf -#endif // SFML_SOUNDFILEREADER_HPP - - //////////////////////////////////////////////////////////// /// \class sf::SoundFileReader /// \ingroup audio diff --git a/include/SFML/Audio/SoundFileWriter.hpp b/include/SFML/Audio/SoundFileWriter.hpp index 91e86ad1..d11c6126 100644 --- a/include/SFML/Audio/SoundFileWriter.hpp +++ b/include/SFML/Audio/SoundFileWriter.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEWRITER_HPP -#define SFML_SOUNDFILEWRITER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -76,9 +75,6 @@ public: } // namespace sf -#endif // SFML_SOUNDFILEWRITER_HPP - - //////////////////////////////////////////////////////////// /// \class sf::SoundFileWriter /// \ingroup audio diff --git a/include/SFML/Audio/SoundRecorder.hpp b/include/SFML/Audio/SoundRecorder.hpp index f83a19e8..06a77566 100644 --- a/include/SFML/Audio/SoundRecorder.hpp +++ b/include/SFML/Audio/SoundRecorder.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDRECORDER_HPP -#define SFML_SOUNDRECORDER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -314,9 +313,6 @@ private: } // namespace sf -#endif // SFML_SOUNDRECORDER_HPP - - //////////////////////////////////////////////////////////// /// \class sf::SoundRecorder /// \ingroup audio diff --git a/include/SFML/Audio/SoundSource.hpp b/include/SFML/Audio/SoundSource.hpp index 7f70dd96..c18a828c 100644 --- a/include/SFML/Audio/SoundSource.hpp +++ b/include/SFML/Audio/SoundSource.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDSOURCE_HPP -#define SFML_SOUNDSOURCE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -295,9 +294,6 @@ protected: } // namespace sf -#endif // SFML_SOUNDSOURCE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::SoundSource /// \ingroup audio diff --git a/include/SFML/Audio/SoundStream.hpp b/include/SFML/Audio/SoundStream.hpp index 2c9eea72..2e773864 100644 --- a/include/SFML/Audio/SoundStream.hpp +++ b/include/SFML/Audio/SoundStream.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDSTREAM_HPP -#define SFML_SOUNDSTREAM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -354,9 +353,6 @@ private: } // namespace sf -#endif // SFML_SOUNDSTREAM_HPP - - //////////////////////////////////////////////////////////// /// \class sf::SoundStream /// \ingroup audio diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp index 4f4fce02..847b5f98 100644 --- a/include/SFML/Config.hpp +++ b/include/SFML/Config.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONFIG_HPP -#define SFML_CONFIG_HPP +#pragma once //////////////////////////////////////////////////////////// @@ -154,6 +153,3 @@ #define SFML_API_IMPORT #endif - - -#endif // SFML_CONFIG_HPP diff --git a/include/SFML/GpuPreference.hpp b/include/SFML/GpuPreference.hpp index 565cbb10..46aa80cc 100644 --- a/include/SFML/GpuPreference.hpp +++ b/include/SFML/GpuPreference.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GPUPREFERENCE_HPP -#define SFML_GPUPREFERENCE_HPP +#pragma once //////////////////////////////////////////////////////////// @@ -69,6 +68,3 @@ #define SFML_DEFINE_DISCRETE_GPU_PREFERENCE #endif - - -#endif // SFML_GPUPREFERENCE_HPP diff --git a/include/SFML/Graphics.hpp b/include/SFML/Graphics.hpp index 95498c2f..f2a8985d 100644 --- a/include/SFML/Graphics.hpp +++ b/include/SFML/Graphics.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GRAPHICS_HPP -#define SFML_GRAPHICS_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -58,8 +57,6 @@ #include -#endif // SFML_GRAPHICS_HPP - //////////////////////////////////////////////////////////// /// \defgroup graphics Graphics module /// diff --git a/include/SFML/Graphics/BlendMode.hpp b/include/SFML/Graphics/BlendMode.hpp index e70d0fc4..bc65a43b 100644 --- a/include/SFML/Graphics/BlendMode.hpp +++ b/include/SFML/Graphics/BlendMode.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_BLENDMODE_HPP -#define SFML_BLENDMODE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -164,9 +163,6 @@ SFML_GRAPHICS_API extern const BlendMode BlendNone; //!< Overwrite dest with } // namespace sf -#endif // SFML_BLENDMODE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::BlendMode /// \ingroup graphics diff --git a/include/SFML/Graphics/CircleShape.hpp b/include/SFML/Graphics/CircleShape.hpp index 2773be23..5e1a038a 100644 --- a/include/SFML/Graphics/CircleShape.hpp +++ b/include/SFML/Graphics/CircleShape.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CIRCLESHAPE_HPP -#define SFML_CIRCLESHAPE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -117,9 +116,6 @@ private: } // namespace sf -#endif // SFML_CIRCLESHAPE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::CircleShape /// \ingroup graphics diff --git a/include/SFML/Graphics/Color.hpp b/include/SFML/Graphics/Color.hpp index 6cb139ff..cfb0990b 100644 --- a/include/SFML/Graphics/Color.hpp +++ b/include/SFML/Graphics/Color.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_COLOR_HPP -#define SFML_COLOR_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -232,9 +231,6 @@ constexpr Color& operator*=(Color& left, const Color& right); } // namespace sf -#endif // SFML_COLOR_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Color /// \ingroup graphics diff --git a/include/SFML/Graphics/ConvexShape.hpp b/include/SFML/Graphics/ConvexShape.hpp index bfa83ce7..779f6d27 100644 --- a/include/SFML/Graphics/ConvexShape.hpp +++ b/include/SFML/Graphics/ConvexShape.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONVEXSHAPE_HPP -#define SFML_CONVEXSHAPE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -122,9 +121,6 @@ private: } // namespace sf -#endif // SFML_CONVEXSHAPE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::ConvexShape /// \ingroup graphics diff --git a/include/SFML/Graphics/Drawable.hpp b/include/SFML/Graphics/Drawable.hpp index 415f7802..58760d7b 100644 --- a/include/SFML/Graphics/Drawable.hpp +++ b/include/SFML/Graphics/Drawable.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_DRAWABLE_HPP -#define SFML_DRAWABLE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -70,9 +69,6 @@ protected: } // namespace sf -#endif // SFML_DRAWABLE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Drawable /// \ingroup graphics diff --git a/include/SFML/Graphics/Export.hpp b/include/SFML/Graphics/Export.hpp index 13ed4c4d..ee2dff55 100644 --- a/include/SFML/Graphics/Export.hpp +++ b/include/SFML/Graphics/Export.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GRAPHICS_EXPORT_HPP -#define SFML_GRAPHICS_EXPORT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define SFML_GRAPHICS_API SFML_API_IMPORT #endif - - -#endif // SFML_GRAPHICS_EXPORT_HPP diff --git a/include/SFML/Graphics/Font.hpp b/include/SFML/Graphics/Font.hpp index e1dd2dae..024d892c 100644 --- a/include/SFML/Graphics/Font.hpp +++ b/include/SFML/Graphics/Font.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_FONT_HPP -#define SFML_FONT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -436,9 +435,6 @@ private: } // namespace sf -#endif // SFML_FONT_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Font /// \ingroup graphics diff --git a/include/SFML/Graphics/Glsl.hpp b/include/SFML/Graphics/Glsl.hpp index 66667744..d40de8c4 100644 --- a/include/SFML/Graphics/Glsl.hpp +++ b/include/SFML/Graphics/Glsl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GLSL_HPP -#define SFML_GLSL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -195,8 +194,6 @@ using Mat4 = priv::Matrix<4, 4>; } // namespace Glsl } // namespace sf -#endif // SFML_GLSL_HPP - //////////////////////////////////////////////////////////// /// \namespace sf::Glsl diff --git a/include/SFML/Graphics/Glyph.hpp b/include/SFML/Graphics/Glyph.hpp index 21614797..5ae63baf 100644 --- a/include/SFML/Graphics/Glyph.hpp +++ b/include/SFML/Graphics/Glyph.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GLYPH_HPP -#define SFML_GLYPH_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -55,9 +54,6 @@ public: } // namespace sf -#endif // SFML_GLYPH_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Glyph /// \ingroup graphics diff --git a/include/SFML/Graphics/Image.hpp b/include/SFML/Graphics/Image.hpp index 9bde7caf..93bd5054 100644 --- a/include/SFML/Graphics/Image.hpp +++ b/include/SFML/Graphics/Image.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_IMAGE_HPP -#define SFML_IMAGE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -286,9 +285,6 @@ private: } // namespace sf -#endif // SFML_IMAGE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Image /// \ingroup graphics diff --git a/include/SFML/Graphics/PrimitiveType.hpp b/include/SFML/Graphics/PrimitiveType.hpp index 051b0ecc..18c2baff 100644 --- a/include/SFML/Graphics/PrimitiveType.hpp +++ b/include/SFML/Graphics/PrimitiveType.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_PRIMITIVETYPE_HPP -#define SFML_PRIMITIVETYPE_HPP +#pragma once namespace sf { @@ -47,6 +46,3 @@ enum class PrimitiveType }; } // namespace sf - - -#endif // SFML_PRIMITIVETYPE_HPP diff --git a/include/SFML/Graphics/Rect.hpp b/include/SFML/Graphics/Rect.hpp index 770c0c55..8bd9906f 100644 --- a/include/SFML/Graphics/Rect.hpp +++ b/include/SFML/Graphics/Rect.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RECT_HPP -#define SFML_RECT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -173,9 +172,6 @@ using FloatRect = Rect; } // namespace sf -#endif // SFML_RECT_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Rect /// \ingroup graphics diff --git a/include/SFML/Graphics/RectangleShape.hpp b/include/SFML/Graphics/RectangleShape.hpp index 90810980..3eea050e 100644 --- a/include/SFML/Graphics/RectangleShape.hpp +++ b/include/SFML/Graphics/RectangleShape.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RECTANGLESHAPE_HPP -#define SFML_RECTANGLESHAPE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -104,9 +103,6 @@ private: } // namespace sf -#endif // SFML_RECTANGLESHAPE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::RectangleShape /// \ingroup graphics diff --git a/include/SFML/Graphics/RenderStates.hpp b/include/SFML/Graphics/RenderStates.hpp index 84d69d6f..dbcb2e39 100644 --- a/include/SFML/Graphics/RenderStates.hpp +++ b/include/SFML/Graphics/RenderStates.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERSTATES_HPP -#define SFML_RENDERSTATES_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -121,9 +120,6 @@ public: } // namespace sf -#endif // SFML_RENDERSTATES_HPP - - //////////////////////////////////////////////////////////// /// \class sf::RenderStates /// \ingroup graphics diff --git a/include/SFML/Graphics/RenderTarget.hpp b/include/SFML/Graphics/RenderTarget.hpp index 7f4b87ac..7e5532f3 100644 --- a/include/SFML/Graphics/RenderTarget.hpp +++ b/include/SFML/Graphics/RenderTarget.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERTARGET_HPP -#define SFML_RENDERTARGET_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -507,9 +506,6 @@ private: } // namespace sf -#endif // SFML_RENDERTARGET_HPP - - //////////////////////////////////////////////////////////// /// \class sf::RenderTarget /// \ingroup graphics diff --git a/include/SFML/Graphics/RenderTexture.hpp b/include/SFML/Graphics/RenderTexture.hpp index 01ebb8dd..834ce10f 100644 --- a/include/SFML/Graphics/RenderTexture.hpp +++ b/include/SFML/Graphics/RenderTexture.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERTEXTURE_HPP -#define SFML_RENDERTEXTURE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -235,9 +234,6 @@ private: } // namespace sf -#endif // SFML_RENDERTEXTURE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::RenderTexture /// \ingroup graphics diff --git a/include/SFML/Graphics/RenderWindow.hpp b/include/SFML/Graphics/RenderWindow.hpp index 9db85761..be8fbeb6 100644 --- a/include/SFML/Graphics/RenderWindow.hpp +++ b/include/SFML/Graphics/RenderWindow.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERWINDOW_HPP -#define SFML_RENDERWINDOW_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -172,9 +171,6 @@ private: } // namespace sf -#endif // SFML_RENDERWINDOW_HPP - - //////////////////////////////////////////////////////////// /// \class sf::RenderWindow /// \ingroup graphics diff --git a/include/SFML/Graphics/Shader.hpp b/include/SFML/Graphics/Shader.hpp index 00220c24..86ad3d7f 100644 --- a/include/SFML/Graphics/Shader.hpp +++ b/include/SFML/Graphics/Shader.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SHADER_HPP -#define SFML_SHADER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -708,9 +707,6 @@ private: } // namespace sf -#endif // SFML_SHADER_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Shader /// \ingroup graphics diff --git a/include/SFML/Graphics/Shape.hpp b/include/SFML/Graphics/Shape.hpp index 338d4c36..ea021e01 100644 --- a/include/SFML/Graphics/Shape.hpp +++ b/include/SFML/Graphics/Shape.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SHAPE_HPP -#define SFML_SHAPE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -318,9 +317,6 @@ private: } // namespace sf -#endif // SFML_SHAPE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Shape /// \ingroup graphics diff --git a/include/SFML/Graphics/Sprite.hpp b/include/SFML/Graphics/Sprite.hpp index 6a6e5903..d8fb96a7 100644 --- a/include/SFML/Graphics/Sprite.hpp +++ b/include/SFML/Graphics/Sprite.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SPRITE_HPP -#define SFML_SPRITE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -222,9 +221,6 @@ private: } // namespace sf -#endif // SFML_SPRITE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Sprite /// \ingroup graphics diff --git a/include/SFML/Graphics/Text.hpp b/include/SFML/Graphics/Text.hpp index 4ccf4767..b8eccf0d 100644 --- a/include/SFML/Graphics/Text.hpp +++ b/include/SFML/Graphics/Text.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TEXT_HPP -#define SFML_TEXT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -447,9 +446,6 @@ private: } // namespace sf -#endif // SFML_TEXT_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Text /// \ingroup graphics diff --git a/include/SFML/Graphics/Texture.hpp b/include/SFML/Graphics/Texture.hpp index f82a8c6f..b6b20f54 100644 --- a/include/SFML/Graphics/Texture.hpp +++ b/include/SFML/Graphics/Texture.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TEXTURE_HPP -#define SFML_TEXTURE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -626,8 +625,6 @@ private: } // namespace sf -#endif // SFML_TEXTURE_HPP - //////////////////////////////////////////////////////////// /// \class sf::Texture /// \ingroup graphics diff --git a/include/SFML/Graphics/Transform.hpp b/include/SFML/Graphics/Transform.hpp index e1eb9f6f..8d5e2d47 100644 --- a/include/SFML/Graphics/Transform.hpp +++ b/include/SFML/Graphics/Transform.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TRANSFORM_HPP -#define SFML_TRANSFORM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -350,9 +349,6 @@ constexpr Vector2f operator*(const Transform& left, const Vector2f& right); } // namespace sf -#endif // SFML_TRANSFORM_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Transform /// \ingroup graphics diff --git a/include/SFML/Graphics/Transformable.hpp b/include/SFML/Graphics/Transformable.hpp index 968a1d68..5e2e0d5c 100644 --- a/include/SFML/Graphics/Transformable.hpp +++ b/include/SFML/Graphics/Transformable.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TRANSFORMABLE_HPP -#define SFML_TRANSFORMABLE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -243,9 +242,6 @@ private: } // namespace sf -#endif // SFML_TRANSFORMABLE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Transformable /// \ingroup graphics diff --git a/include/SFML/Graphics/Vertex.hpp b/include/SFML/Graphics/Vertex.hpp index 5c4a686a..0f7cbc78 100644 --- a/include/SFML/Graphics/Vertex.hpp +++ b/include/SFML/Graphics/Vertex.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VERTEX_HPP -#define SFML_VERTEX_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -102,9 +101,6 @@ public: } // namespace sf -#endif // SFML_VERTEX_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Vertex /// \ingroup graphics diff --git a/include/SFML/Graphics/VertexArray.hpp b/include/SFML/Graphics/VertexArray.hpp index f41e773d..c12c6b28 100644 --- a/include/SFML/Graphics/VertexArray.hpp +++ b/include/SFML/Graphics/VertexArray.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VERTEXARRAY_HPP -#define SFML_VERTEXARRAY_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -192,9 +191,6 @@ private: } // namespace sf -#endif // SFML_VERTEXARRAY_HPP - - //////////////////////////////////////////////////////////// /// \class sf::VertexArray /// \ingroup graphics diff --git a/include/SFML/Graphics/VertexBuffer.hpp b/include/SFML/Graphics/VertexBuffer.hpp index 4b5a04ff..d2e4712b 100644 --- a/include/SFML/Graphics/VertexBuffer.hpp +++ b/include/SFML/Graphics/VertexBuffer.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VERTEXBUFFER_HPP -#define SFML_VERTEXBUFFER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -343,9 +342,6 @@ private: } // namespace sf -#endif // SFML_VERTEXBUFFER_HPP - - //////////////////////////////////////////////////////////// /// \class sf::VertexBuffer /// \ingroup graphics diff --git a/include/SFML/Graphics/View.hpp b/include/SFML/Graphics/View.hpp index 1d1dc8c1..242dbf6b 100644 --- a/include/SFML/Graphics/View.hpp +++ b/include/SFML/Graphics/View.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VIEW_HPP -#define SFML_VIEW_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -249,9 +248,6 @@ private: } // namespace sf -#endif // SFML_VIEW_HPP - - //////////////////////////////////////////////////////////// /// \class sf::View /// \ingroup graphics diff --git a/include/SFML/Main.hpp b/include/SFML/Main.hpp index f4aa8e8f..9438e0e8 100644 --- a/include/SFML/Main.hpp +++ b/include/SFML/Main.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_MAIN_HPP -#define SFML_MAIN_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ #define main sfmlMain #endif - - -#endif // SFML_MAIN_HPP diff --git a/include/SFML/Network.hpp b/include/SFML/Network.hpp index 580f73fc..d5e41411 100644 --- a/include/SFML/Network.hpp +++ b/include/SFML/Network.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_NETWORK_HPP -#define SFML_NETWORK_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -42,8 +41,6 @@ #include -#endif // SFML_NETWORK_HPP - //////////////////////////////////////////////////////////// /// \defgroup network Network module /// diff --git a/include/SFML/Network/Export.hpp b/include/SFML/Network/Export.hpp index 00d289e8..2fb46edc 100644 --- a/include/SFML/Network/Export.hpp +++ b/include/SFML/Network/Export.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_NETWORK_EXPORT_HPP -#define SFML_NETWORK_EXPORT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define SFML_NETWORK_API SFML_API_IMPORT #endif - - -#endif // SFML_NETWORK_EXPORT_HPP diff --git a/include/SFML/Network/Ftp.hpp b/include/SFML/Network/Ftp.hpp index b56f2ea0..bc3186ac 100644 --- a/include/SFML/Network/Ftp.hpp +++ b/include/SFML/Network/Ftp.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_FTP_HPP -#define SFML_FTP_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -556,9 +555,6 @@ private: } // namespace sf -#endif // SFML_FTP_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Ftp /// \ingroup network diff --git a/include/SFML/Network/Http.hpp b/include/SFML/Network/Http.hpp index 51b01e8e..92426c78 100644 --- a/include/SFML/Network/Http.hpp +++ b/include/SFML/Network/Http.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_HTTP_HPP -#define SFML_HTTP_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -418,9 +417,6 @@ private: } // namespace sf -#endif // SFML_HTTP_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Http /// \ingroup network diff --git a/include/SFML/Network/IpAddress.hpp b/include/SFML/Network/IpAddress.hpp index 0449e456..a177455b 100644 --- a/include/SFML/Network/IpAddress.hpp +++ b/include/SFML/Network/IpAddress.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_IPADDRESS_HPP -#define SFML_IPADDRESS_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -267,9 +266,6 @@ SFML_NETWORK_API std::ostream& operator<<(std::ostream& stream, const IpAddress& } // namespace sf -#endif // SFML_IPADDRESS_HPP - - //////////////////////////////////////////////////////////// /// \class sf::IpAddress /// \ingroup network diff --git a/include/SFML/Network/Packet.hpp b/include/SFML/Network/Packet.hpp index 1467175d..4d660858 100644 --- a/include/SFML/Network/Packet.hpp +++ b/include/SFML/Network/Packet.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_PACKET_HPP -#define SFML_PACKET_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -441,9 +440,6 @@ private: } // namespace sf -#endif // SFML_PACKET_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Packet /// \ingroup network diff --git a/include/SFML/Network/Socket.hpp b/include/SFML/Network/Socket.hpp index d934f1a7..e6cb74c9 100644 --- a/include/SFML/Network/Socket.hpp +++ b/include/SFML/Network/Socket.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOCKET_HPP -#define SFML_SOCKET_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -190,9 +189,6 @@ private: } // namespace sf -#endif // SFML_SOCKET_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Socket /// \ingroup network diff --git a/include/SFML/Network/SocketHandle.hpp b/include/SFML/Network/SocketHandle.hpp index 3d3384f5..dbd23550 100644 --- a/include/SFML/Network/SocketHandle.hpp +++ b/include/SFML/Network/SocketHandle.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOCKETHANDLE_HPP -#define SFML_SOCKETHANDLE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -52,6 +51,3 @@ using SocketHandle = int; #endif } // namespace sf - - -#endif // SFML_SOCKETHANDLE_HPP diff --git a/include/SFML/Network/SocketSelector.hpp b/include/SFML/Network/SocketSelector.hpp index cbc9b411..537211b0 100644 --- a/include/SFML/Network/SocketSelector.hpp +++ b/include/SFML/Network/SocketSelector.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOCKETSELECTOR_HPP -#define SFML_SOCKETSELECTOR_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -165,9 +164,6 @@ private: } // namespace sf -#endif // SFML_SOCKETSELECTOR_HPP - - //////////////////////////////////////////////////////////// /// \class sf::SocketSelector /// \ingroup network diff --git a/include/SFML/Network/TcpListener.hpp b/include/SFML/Network/TcpListener.hpp index 46d8cf95..70d883e3 100644 --- a/include/SFML/Network/TcpListener.hpp +++ b/include/SFML/Network/TcpListener.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TCPLISTENER_HPP -#define SFML_TCPLISTENER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -119,9 +118,6 @@ public: } // namespace sf -#endif // SFML_TCPLISTENER_HPP - - //////////////////////////////////////////////////////////// /// \class sf::TcpListener /// \ingroup network diff --git a/include/SFML/Network/TcpSocket.hpp b/include/SFML/Network/TcpSocket.hpp index 4491da7b..2d305090 100644 --- a/include/SFML/Network/TcpSocket.hpp +++ b/include/SFML/Network/TcpSocket.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TCPSOCKET_HPP -#define SFML_TCPSOCKET_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -234,9 +233,6 @@ private: } // namespace sf -#endif // SFML_TCPSOCKET_HPP - - //////////////////////////////////////////////////////////// /// \class sf::TcpSocket /// \ingroup network diff --git a/include/SFML/Network/UdpSocket.hpp b/include/SFML/Network/UdpSocket.hpp index 2f28c963..a5a336c8 100644 --- a/include/SFML/Network/UdpSocket.hpp +++ b/include/SFML/Network/UdpSocket.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_UDPSOCKET_HPP -#define SFML_UDPSOCKET_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -205,9 +204,6 @@ private: } // namespace sf -#endif // SFML_UDPSOCKET_HPP - - //////////////////////////////////////////////////////////// /// \class sf::UdpSocket /// \ingroup network diff --git a/include/SFML/OpenGL.hpp b/include/SFML/OpenGL.hpp index 1a873661..ff462306 100644 --- a/include/SFML/OpenGL.hpp +++ b/include/SFML/OpenGL.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_OPENGL_HPP -#define SFML_OPENGL_HPP +#pragma once //////////////////////////////////////////////////////////// @@ -77,6 +76,3 @@ #include #endif - - -#endif // SFML_OPENGL_HPP diff --git a/include/SFML/System.hpp b/include/SFML/System.hpp index cee6fa26..8c12ca92 100644 --- a/include/SFML/System.hpp +++ b/include/SFML/System.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SYSTEM_HPP -#define SFML_SYSTEM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -44,7 +43,6 @@ #include #include -#endif // SFML_SYSTEM_HPP //////////////////////////////////////////////////////////// /// \defgroup system System module diff --git a/include/SFML/System/Angle.hpp b/include/SFML/System/Angle.hpp index f46eec06..fd92f4e8 100644 --- a/include/SFML/System/Angle.hpp +++ b/include/SFML/System/Angle.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_ANGLE_HPP -#define SFML_ANGLE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -479,9 +478,6 @@ namespace Literals } // namespace sf -#endif // SFML_ANGLE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Angle /// \ingroup system diff --git a/include/SFML/System/Clock.hpp b/include/SFML/System/Clock.hpp index 18b8b579..971f5a13 100644 --- a/include/SFML/System/Clock.hpp +++ b/include/SFML/System/Clock.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLOCK_HPP -#define SFML_CLOCK_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -146,9 +145,6 @@ private: } // namespace sf -#endif // SFML_CLOCK_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Clock /// \ingroup system diff --git a/include/SFML/System/Err.hpp b/include/SFML/System/Err.hpp index a02b5450..e9f30104 100644 --- a/include/SFML/System/Err.hpp +++ b/include/SFML/System/Err.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_ERR_HPP -#define SFML_ERR_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -44,9 +43,6 @@ SFML_SYSTEM_API std::ostream& err(); } // namespace sf -#endif // SFML_ERR_HPP - - //////////////////////////////////////////////////////////// /// \fn sf::err /// \ingroup system diff --git a/include/SFML/System/Export.hpp b/include/SFML/System/Export.hpp index 4deccce7..4e0c3744 100644 --- a/include/SFML/System/Export.hpp +++ b/include/SFML/System/Export.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SYSTEM_EXPORT_HPP -#define SFML_SYSTEM_EXPORT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define SFML_SYSTEM_API SFML_API_IMPORT #endif - - -#endif // SFML_SYSTEM_EXPORT_HPP diff --git a/include/SFML/System/FileInputStream.hpp b/include/SFML/System/FileInputStream.hpp index 30223660..30079fb0 100644 --- a/include/SFML/System/FileInputStream.hpp +++ b/include/SFML/System/FileInputStream.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_FILEINPUTSTREAM_HPP -#define SFML_FILEINPUTSTREAM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -165,9 +164,6 @@ private: } // namespace sf -#endif // SFML_FILEINPUTSTREAM_HPP - - //////////////////////////////////////////////////////////// /// \class sf::FileInputStream /// \ingroup system diff --git a/include/SFML/System/InputStream.hpp b/include/SFML/System/InputStream.hpp index fb3aa0e1..66c7db90 100644 --- a/include/SFML/System/InputStream.hpp +++ b/include/SFML/System/InputStream.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTSTREAM_HPP -#define SFML_INPUTSTREAM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -94,9 +93,6 @@ public: } // namespace sf -#endif // SFML_INPUTSTREAM_HPP - - //////////////////////////////////////////////////////////// /// \class sf::InputStream /// \ingroup system diff --git a/include/SFML/System/MemoryInputStream.hpp b/include/SFML/System/MemoryInputStream.hpp index 58b4224c..fcf79b5c 100644 --- a/include/SFML/System/MemoryInputStream.hpp +++ b/include/SFML/System/MemoryInputStream.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_MEMORYINPUTSTREAM_HPP -#define SFML_MEMORYINPUTSTREAM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -113,9 +112,6 @@ private: } // namespace sf -#endif // SFML_MEMORYINPUTSTREAM_HPP - - //////////////////////////////////////////////////////////// /// \class sf::MemoryInputStream /// \ingroup system diff --git a/include/SFML/System/NativeActivity.hpp b/include/SFML/System/NativeActivity.hpp index d393c630..c8e42987 100644 --- a/include/SFML/System/NativeActivity.hpp +++ b/include/SFML/System/NativeActivity.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_NATIVEACTIVITY_HPP -#define SFML_NATIVEACTIVITY_HPP +#pragma once //////////////////////////////////////////////////////////// @@ -57,6 +56,3 @@ namespace sf SFML_SYSTEM_API ANativeActivity* getNativeActivity(); } // namespace sf - - -#endif // SFML_NATIVEACTIVITY_HPP diff --git a/include/SFML/System/Sleep.hpp b/include/SFML/System/Sleep.hpp index 54a81ef4..8d180e45 100644 --- a/include/SFML/System/Sleep.hpp +++ b/include/SFML/System/Sleep.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SLEEP_HPP -#define SFML_SLEEP_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -51,6 +50,3 @@ class Time; void SFML_SYSTEM_API sleep(Time duration); } // namespace sf - - -#endif // SFML_SLEEP_HPP diff --git a/include/SFML/System/String.hpp b/include/SFML/System/String.hpp index a5757c9e..5eafe15d 100644 --- a/include/SFML/System/String.hpp +++ b/include/SFML/System/String.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_STRING_HPP -#define SFML_STRING_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -631,9 +630,6 @@ SFML_SYSTEM_API String operator+(const String& left, const String& right); } // namespace sf -#endif // SFML_STRING_HPP - - //////////////////////////////////////////////////////////// /// \class sf::String /// \ingroup system diff --git a/include/SFML/System/SuspendAwareClock.hpp b/include/SFML/System/SuspendAwareClock.hpp index 79dc2ce8..e54ba3c6 100644 --- a/include/SFML/System/SuspendAwareClock.hpp +++ b/include/SFML/System/SuspendAwareClock.hpp @@ -23,8 +23,7 @@ //////////////////////////////////////////////////////////// -#ifndef SFML_SUSPENDAWARECLOCK_HPP -#define SFML_SUSPENDAWARECLOCK_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -76,5 +75,3 @@ public: }; } // namespace sf - -#endif // SFML_SUSPENDAWARECLOCK_HPP diff --git a/include/SFML/System/Time.hpp b/include/SFML/System/Time.hpp index 512adcf6..da902e13 100644 --- a/include/SFML/System/Time.hpp +++ b/include/SFML/System/Time.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TIME_HPP -#define SFML_TIME_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -454,9 +453,6 @@ constexpr Time& operator%=(Time& left, Time right); } // namespace sf -#endif // SFML_TIME_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Time /// \ingroup system diff --git a/include/SFML/System/Utf.hpp b/include/SFML/System/Utf.hpp index 954516b5..412e50d6 100644 --- a/include/SFML/System/Utf.hpp +++ b/include/SFML/System/Utf.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_UTF_HPP -#define SFML_UTF_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -742,9 +741,6 @@ using Utf32 = Utf<32>; } // namespace sf -#endif // SFML_UTF_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Utf /// \ingroup system diff --git a/include/SFML/System/Vector2.hpp b/include/SFML/System/Vector2.hpp index c4ed07ea..8995ad1a 100644 --- a/include/SFML/System/Vector2.hpp +++ b/include/SFML/System/Vector2.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VECTOR2_HPP -#define SFML_VECTOR2_HPP +#pragma once #include @@ -404,9 +403,6 @@ template } // namespace sf -#endif // SFML_VECTOR2_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Vector2 /// \ingroup system diff --git a/include/SFML/System/Vector3.hpp b/include/SFML/System/Vector3.hpp index 9304c00b..2d293ab1 100644 --- a/include/SFML/System/Vector3.hpp +++ b/include/SFML/System/Vector3.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VECTOR3_HPP -#define SFML_VECTOR3_HPP +#pragma once #include @@ -319,9 +318,6 @@ using Vector3f = Vector3; } // namespace sf -#endif // SFML_VECTOR3_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Vector3 /// \ingroup system diff --git a/include/SFML/Window.hpp b/include/SFML/Window.hpp index cfdcf894..089c349c 100644 --- a/include/SFML/Window.hpp +++ b/include/SFML/Window.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SFML_WINDOW_HPP -#define SFML_SFML_WINDOW_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -46,8 +45,6 @@ #include -#endif // SFML_SFML_WINDOW_HPP - //////////////////////////////////////////////////////////// /// \defgroup window Window module /// diff --git a/include/SFML/Window/Clipboard.hpp b/include/SFML/Window/Clipboard.hpp index 59253e82..e9aa67f7 100644 --- a/include/SFML/Window/Clipboard.hpp +++ b/include/SFML/Window/Clipboard.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLIPBOARD_HPP -#define SFML_CLIPBOARD_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -75,9 +74,6 @@ public: } // namespace sf -#endif // SFML_CLIPBOARD_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Clipboard /// \ingroup window diff --git a/include/SFML/Window/Context.hpp b/include/SFML/Window/Context.hpp index 15e9b644..8147b570 100644 --- a/include/SFML/Window/Context.hpp +++ b/include/SFML/Window/Context.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONTEXT_HPP -#define SFML_CONTEXT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -171,8 +170,6 @@ private: } // namespace sf -#endif // SFML_CONTEXT_HPP - //////////////////////////////////////////////////////////// /// \class sf::Context /// \ingroup window diff --git a/include/SFML/Window/ContextSettings.hpp b/include/SFML/Window/ContextSettings.hpp index 01c486d1..81b2b677 100644 --- a/include/SFML/Window/ContextSettings.hpp +++ b/include/SFML/Window/ContextSettings.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONTEXTSETTINGS_HPP -#define SFML_CONTEXTSETTINGS_HPP +#pragma once #include @@ -94,9 +93,6 @@ struct ContextSettings } // namespace sf -#endif // SFML_CONTEXTSETTINGS_HPP - - //////////////////////////////////////////////////////////// /// \class sf::ContextSettings /// \ingroup window diff --git a/include/SFML/Window/Cursor.hpp b/include/SFML/Window/Cursor.hpp index 0db282ca..d9db4628 100644 --- a/include/SFML/Window/Cursor.hpp +++ b/include/SFML/Window/Cursor.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSOR_HPP -#define SFML_CURSOR_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -215,9 +214,6 @@ private: } // namespace sf -#endif // SFML_CURSOR_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Cursor /// \ingroup window diff --git a/include/SFML/Window/Event.hpp b/include/SFML/Window/Event.hpp index b5e82943..f298923d 100644 --- a/include/SFML/Window/Event.hpp +++ b/include/SFML/Window/Event.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_EVENT_HPP -#define SFML_EVENT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -222,9 +221,6 @@ public: } // namespace sf -#endif // SFML_EVENT_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Event /// \ingroup window diff --git a/include/SFML/Window/Export.hpp b/include/SFML/Window/Export.hpp index 325f7b49..200e2e44 100644 --- a/include/SFML/Window/Export.hpp +++ b/include/SFML/Window/Export.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOW_EXPORT_HPP -#define SFML_WINDOW_EXPORT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define SFML_WINDOW_API SFML_API_IMPORT #endif - - -#endif // SFML_WINDOW_EXPORT_HPP diff --git a/include/SFML/Window/GlResource.hpp b/include/SFML/Window/GlResource.hpp index e432099f..6113e7a5 100644 --- a/include/SFML/Window/GlResource.hpp +++ b/include/SFML/Window/GlResource.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GLRESOURCE_HPP -#define SFML_GLRESOURCE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -106,8 +105,6 @@ protected: } // namespace sf -#endif // SFML_GLRESOURCE_HPP - //////////////////////////////////////////////////////////// /// \class sf::GlResource /// \ingroup window diff --git a/include/SFML/Window/Joystick.hpp b/include/SFML/Window/Joystick.hpp index 1859737a..2fdaf59c 100644 --- a/include/SFML/Window/Joystick.hpp +++ b/include/SFML/Window/Joystick.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICK_HPP -#define SFML_JOYSTICK_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -166,9 +165,6 @@ public: } // namespace sf -#endif // SFML_JOYSTICK_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Joystick /// \ingroup window diff --git a/include/SFML/Window/Keyboard.hpp b/include/SFML/Window/Keyboard.hpp index d2b8759f..05724a09 100644 --- a/include/SFML/Window/Keyboard.hpp +++ b/include/SFML/Window/Keyboard.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_KEYBOARD_HPP -#define SFML_KEYBOARD_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -181,9 +180,6 @@ public: } // namespace sf -#endif // SFML_KEYBOARD_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Keyboard /// \ingroup window diff --git a/include/SFML/Window/Mouse.hpp b/include/SFML/Window/Mouse.hpp index 9ee9f3f4..d9e1c1f0 100644 --- a/include/SFML/Window/Mouse.hpp +++ b/include/SFML/Window/Mouse.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_MOUSE_HPP -#define SFML_MOUSE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -133,9 +132,6 @@ public: } // namespace sf -#endif // SFML_MOUSE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Mouse /// \ingroup window diff --git a/include/SFML/Window/Sensor.hpp b/include/SFML/Window/Sensor.hpp index 0158890b..88cbb745 100644 --- a/include/SFML/Window/Sensor.hpp +++ b/include/SFML/Window/Sensor.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SENSOR_HPP -#define SFML_SENSOR_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -97,9 +96,6 @@ public: } // namespace sf -#endif // SFML_SENSOR_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Sensor /// \ingroup window diff --git a/include/SFML/Window/Touch.hpp b/include/SFML/Window/Touch.hpp index 60aa002c..0c2e69ba 100644 --- a/include/SFML/Window/Touch.hpp +++ b/include/SFML/Window/Touch.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TOUCH_HPP -#define SFML_TOUCH_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -85,9 +84,6 @@ public: } // namespace sf -#endif // SFML_TOUCH_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Touch /// \ingroup window diff --git a/include/SFML/Window/VideoMode.hpp b/include/SFML/Window/VideoMode.hpp index 993d47b9..8b0a7180 100644 --- a/include/SFML/Window/VideoMode.hpp +++ b/include/SFML/Window/VideoMode.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VIDEOMODE_HPP -#define SFML_VIDEOMODE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -179,9 +178,6 @@ SFML_WINDOW_API bool operator>=(const VideoMode& left, const VideoMode& right); } // namespace sf -#endif // SFML_VIDEOMODE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::VideoMode /// \ingroup window diff --git a/include/SFML/Window/Vulkan.hpp b/include/SFML/Window/Vulkan.hpp index 5100c08e..581ee6c0 100644 --- a/include/SFML/Window/Vulkan.hpp +++ b/include/SFML/Window/Vulkan.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VULKAN_HPP -#define SFML_VULKAN_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -102,9 +101,6 @@ public: } // namespace sf -#endif // SFML_VULKAN_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Vulkan /// \ingroup window diff --git a/include/SFML/Window/Window.hpp b/include/SFML/Window/Window.hpp index 171b1a3a..437f0a2d 100644 --- a/include/SFML/Window/Window.hpp +++ b/include/SFML/Window/Window.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOW_HPP -#define SFML_WINDOW_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -289,9 +288,6 @@ private: } // namespace sf -#endif // SFML_WINDOW_HPP - - //////////////////////////////////////////////////////////// /// \class sf::Window /// \ingroup window diff --git a/include/SFML/Window/WindowBase.hpp b/include/SFML/Window/WindowBase.hpp index 54c85e2d..2e1c59d2 100644 --- a/include/SFML/Window/WindowBase.hpp +++ b/include/SFML/Window/WindowBase.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWBASE_HPP -#define SFML_WINDOWBASE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -488,9 +487,6 @@ private: } // namespace sf -#endif // SFML_WINDOWBASE_HPP - - //////////////////////////////////////////////////////////// /// \class sf::WindowBase /// \ingroup window diff --git a/include/SFML/Window/WindowHandle.hpp b/include/SFML/Window/WindowHandle.hpp index 78ba1d4c..2e780c6a 100644 --- a/include/SFML/Window/WindowHandle.hpp +++ b/include/SFML/Window/WindowHandle.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWHANDLE_HPP -#define SFML_WINDOWHANDLE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -73,8 +72,6 @@ using WindowHandle = "platform-specific"; } // namespace sf -#endif // SFML_WINDOWHANDLE_HPP - //////////////////////////////////////////////////////////// /// \typedef sf::WindowHandle /// \ingroup window diff --git a/include/SFML/Window/WindowStyle.hpp b/include/SFML/Window/WindowStyle.hpp index 4cea4d21..ff935efc 100644 --- a/include/SFML/Window/WindowStyle.hpp +++ b/include/SFML/Window/WindowStyle.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWSTYLE_HPP -#define SFML_WINDOWSTYLE_HPP +#pragma once namespace sf @@ -48,6 +47,3 @@ enum } // namespace Style } // namespace sf - - -#endif // SFML_WINDOWSTYLE_HPP diff --git a/src/SFML/Audio/ALCheck.hpp b/src/SFML/Audio/ALCheck.hpp index 9395af2d..5e0f5d0b 100644 --- a/src/SFML/Audio/ALCheck.hpp +++ b/src/SFML/Audio/ALCheck.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_ALCHECK_HPP -#define SFML_ALCHECK_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -95,5 +94,3 @@ ALenum alGetLastErrorImpl(); #if defined(__APPLE__) #pragma GCC diagnostic pop #endif - -#endif // SFML_ALCHECK_HPP diff --git a/src/SFML/Audio/AudioDevice.hpp b/src/SFML/Audio/AudioDevice.hpp index 3e25aabe..df9d3d3d 100644 --- a/src/SFML/Audio/AudioDevice.hpp +++ b/src/SFML/Audio/AudioDevice.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_AUDIODEVICE_HPP -#define SFML_AUDIODEVICE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -186,6 +185,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_AUDIODEVICE_HPP diff --git a/src/SFML/Audio/SoundFileReaderFlac.hpp b/src/SFML/Audio/SoundFileReaderFlac.hpp index aafefd1c..0b3e423d 100644 --- a/src/SFML/Audio/SoundFileReaderFlac.hpp +++ b/src/SFML/Audio/SoundFileReaderFlac.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEREADERFLAC_HPP -#define SFML_SOUNDFILEREADERFLAC_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -135,6 +134,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SOUNDFILEREADERFLAC_HPP diff --git a/src/SFML/Audio/SoundFileReaderMp3.hpp b/src/SFML/Audio/SoundFileReaderMp3.hpp index bf687d61..0444138a 100644 --- a/src/SFML/Audio/SoundFileReaderMp3.hpp +++ b/src/SFML/Audio/SoundFileReaderMp3.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEREADERMP3_HPP -#define SFML_SOUNDFILEREADERMP3_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -136,6 +135,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SOUNDFILEREADERMP3_HPP diff --git a/src/SFML/Audio/SoundFileReaderOgg.hpp b/src/SFML/Audio/SoundFileReaderOgg.hpp index 45605161..ce1ceb2e 100644 --- a/src/SFML/Audio/SoundFileReaderOgg.hpp +++ b/src/SFML/Audio/SoundFileReaderOgg.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEREADEROGG_HPP -#define SFML_SOUNDFILEREADEROGG_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -121,6 +120,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SOUNDFILEREADEROGG_HPP diff --git a/src/SFML/Audio/SoundFileReaderWav.hpp b/src/SFML/Audio/SoundFileReaderWav.hpp index 03569dbf..3b02bb16 100644 --- a/src/SFML/Audio/SoundFileReaderWav.hpp +++ b/src/SFML/Audio/SoundFileReaderWav.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEREADERWAV_HPP -#define SFML_SOUNDFILEREADERWAV_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -117,6 +116,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SOUNDFILEREADERWAV_HPP diff --git a/src/SFML/Audio/SoundFileWriterFlac.hpp b/src/SFML/Audio/SoundFileWriterFlac.hpp index eb1a0b26..14654352 100644 --- a/src/SFML/Audio/SoundFileWriterFlac.hpp +++ b/src/SFML/Audio/SoundFileWriterFlac.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEWRITERFLAC_HPP -#define SFML_SOUNDFILEWRITERFLAC_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -108,6 +107,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SOUNDFILEWRITERFLAC_HPP diff --git a/src/SFML/Audio/SoundFileWriterOgg.hpp b/src/SFML/Audio/SoundFileWriterOgg.hpp index 5ca75923..926aa141 100644 --- a/src/SFML/Audio/SoundFileWriterOgg.hpp +++ b/src/SFML/Audio/SoundFileWriterOgg.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEWRITEROGG_HPP -#define SFML_SOUNDFILEWRITEROGG_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -117,6 +116,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SOUNDFILEWRITEROGG_HPP diff --git a/src/SFML/Audio/SoundFileWriterWav.hpp b/src/SFML/Audio/SoundFileWriterWav.hpp index e496022b..3989d8c5 100644 --- a/src/SFML/Audio/SoundFileWriterWav.hpp +++ b/src/SFML/Audio/SoundFileWriterWav.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDFILEWRITERWAV_HPP -#define SFML_SOUNDFILEWRITERWAV_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -116,6 +115,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SOUNDFILEWRITERWAV_HPP diff --git a/src/SFML/Graphics/GLCheck.hpp b/src/SFML/Graphics/GLCheck.hpp index 0a87f0da..0da7f0f2 100644 --- a/src/SFML/Graphics/GLCheck.hpp +++ b/src/SFML/Graphics/GLCheck.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GLCHECK_HPP -#define SFML_GLCHECK_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -73,6 +72,3 @@ void glCheckError(const std::filesystem::path& file, unsigned int line, const ch } // namespace priv } // namespace sf - - -#endif // SFML_GLCHECK_HPP diff --git a/src/SFML/Graphics/GLExtensions.hpp b/src/SFML/Graphics/GLExtensions.hpp index 5d865c12..ce5e4ad8 100644 --- a/src/SFML/Graphics/GLExtensions.hpp +++ b/src/SFML/Graphics/GLExtensions.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GLEXTENSIONS_HPP -#define SFML_GLEXTENSIONS_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -349,6 +348,3 @@ void ensureExtensionsInit(); } // namespace priv } // namespace sf - - -#endif // SFML_GLEXTENSIONS_HPP diff --git a/src/SFML/Graphics/ImageLoader.hpp b/src/SFML/Graphics/ImageLoader.hpp index fb0afc81..f92e5cf2 100644 --- a/src/SFML/Graphics/ImageLoader.hpp +++ b/src/SFML/Graphics/ImageLoader.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_IMAGELOADER_HPP -#define SFML_IMAGELOADER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -146,6 +145,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_IMAGELOADER_HPP diff --git a/src/SFML/Graphics/RenderTextureImpl.hpp b/src/SFML/Graphics/RenderTextureImpl.hpp index 9f0bfe90..6d870af2 100644 --- a/src/SFML/Graphics/RenderTextureImpl.hpp +++ b/src/SFML/Graphics/RenderTextureImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERTEXTUREIMPL_HPP -#define SFML_RENDERTEXTUREIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -114,6 +113,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_RENDERTEXTUREIMPL_HPP diff --git a/src/SFML/Graphics/RenderTextureImplDefault.hpp b/src/SFML/Graphics/RenderTextureImplDefault.hpp index 8fedc39c..fbc2a5ee 100644 --- a/src/SFML/Graphics/RenderTextureImplDefault.hpp +++ b/src/SFML/Graphics/RenderTextureImplDefault.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERTEXTUREIMPLDEFAULT_HPP -#define SFML_RENDERTEXTUREIMPLDEFAULT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -121,6 +120,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_RENDERTEXTUREIMPLDEFAULT_HPP diff --git a/src/SFML/Graphics/RenderTextureImplFBO.hpp b/src/SFML/Graphics/RenderTextureImplFBO.hpp index a09cad32..73e7f1eb 100644 --- a/src/SFML/Graphics/RenderTextureImplFBO.hpp +++ b/src/SFML/Graphics/RenderTextureImplFBO.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERTEXTUREIMPLFBO_HPP -#define SFML_RENDERTEXTUREIMPLFBO_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -152,6 +151,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_RENDERTEXTUREIMPLFBO_HPP diff --git a/src/SFML/Graphics/TextureSaver.hpp b/src/SFML/Graphics/TextureSaver.hpp index 0a5e9670..55b61a50 100644 --- a/src/SFML/Graphics/TextureSaver.hpp +++ b/src/SFML/Graphics/TextureSaver.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TEXTURESAVER_HPP -#define SFML_TEXTURESAVER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -68,6 +67,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_TEXTURESAVER_HPP diff --git a/src/SFML/Network/Unix/SocketImpl.hpp b/src/SFML/Network/Unix/SocketImpl.hpp index 3e510f3c..3e33292b 100644 --- a/src/SFML/Network/Unix/SocketImpl.hpp +++ b/src/SFML/Network/Unix/SocketImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOCKETIMPL_HPP -#define SFML_SOCKETIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -106,6 +105,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_SOCKETIMPL_HPP diff --git a/src/SFML/Network/Win32/SocketImpl.hpp b/src/SFML/Network/Win32/SocketImpl.hpp index 86fb9015..3efec397 100644 --- a/src/SFML/Network/Win32/SocketImpl.hpp +++ b/src/SFML/Network/Win32/SocketImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOCKETIMPL_HPP -#define SFML_SOCKETIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -102,6 +101,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_SOCKETIMPL_HPP diff --git a/src/SFML/PCH.hpp b/src/SFML/PCH.hpp index 514bab97..ec28951c 100644 --- a/src/SFML/PCH.hpp +++ b/src/SFML/PCH.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SFML_PCH_HPP -#define SFML_SFML_PCH_HPP +#pragma once //////////////////////////////////////////////////////////// // Precompiled Headers @@ -58,5 +57,3 @@ #include #include #include - -#endif // SFML_SFML_PCH_HPP diff --git a/src/SFML/System/Android/Activity.hpp b/src/SFML/System/Android/Activity.hpp index ac8982fb..596d2d30 100644 --- a/src/SFML/System/Android/Activity.hpp +++ b/src/SFML/System/Android/Activity.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_ACTIVITY_HPP -#define SFML_ACTIVITY_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -101,6 +100,3 @@ SFML_SYSTEM_API ActivityStates& getActivity(); } // namespace priv } // namespace sf - - -#endif // SFML_ACTIVITY_HPP diff --git a/src/SFML/System/Android/ResourceStream.hpp b/src/SFML/System/Android/ResourceStream.hpp index d2f95ec2..d6afdc15 100644 --- a/src/SFML/System/Android/ResourceStream.hpp +++ b/src/SFML/System/Android/ResourceStream.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RESOURCESTREAM_HPP -#define SFML_RESOURCESTREAM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -110,6 +109,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_RESOURCESTREAM_HPP diff --git a/src/SFML/System/Unix/SleepImpl.hpp b/src/SFML/System/Unix/SleepImpl.hpp index e536710a..70196d37 100644 --- a/src/SFML/System/Unix/SleepImpl.hpp +++ b/src/SFML/System/Unix/SleepImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SLEEPIMPLUNIX_HPP -#define SFML_SLEEPIMPLUNIX_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -47,6 +46,3 @@ namespace sf::priv void sleepImpl(Time time); } // namespace sf::priv - - -#endif // SFML_SLEEPIMPLUNIX_HPP diff --git a/src/SFML/System/Utils.hpp b/src/SFML/System/Utils.hpp index 359f66d3..d7739c53 100644 --- a/src/SFML/System/Utils.hpp +++ b/src/SFML/System/Utils.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_UTILS_HPP -#define SFML_UTILS_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -52,5 +51,3 @@ namespace sf } } // namespace sf - -#endif // SFML_UTILS_HPP diff --git a/src/SFML/System/Win32/SleepImpl.hpp b/src/SFML/System/Win32/SleepImpl.hpp index da1d39fe..040e262c 100644 --- a/src/SFML/System/Win32/SleepImpl.hpp +++ b/src/SFML/System/Win32/SleepImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SLEEPIMPLWIN32_HPP -#define SFML_SLEEPIMPLWIN32_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -47,6 +46,3 @@ namespace sf::priv void sleepImpl(Time time); } // namespace sf::priv - - -#endif // SFML_SLEEPIMPLWIN32_HPP diff --git a/src/SFML/System/Win32/WindowsHeader.hpp b/src/SFML/System/Win32/WindowsHeader.hpp index 3d6d06c4..ed13b961 100644 --- a/src/SFML/System/Win32/WindowsHeader.hpp +++ b/src/SFML/System/Win32/WindowsHeader.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWSHEADER_HPP -#define SFML_WINDOWSHEADER_HPP +#pragma once #ifndef NOMINMAX #define NOMINMAX @@ -46,5 +45,3 @@ #endif #include - -#endif // SFML_WINDOWSHEADER_HPP diff --git a/src/SFML/Window/Android/ClipboardImpl.hpp b/src/SFML/Window/Android/ClipboardImpl.hpp index 4537e00c..6d45fa47 100644 --- a/src/SFML/Window/Android/ClipboardImpl.hpp +++ b/src/SFML/Window/Android/ClipboardImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLIPBOARDIMPLANDROID_HPP -#define SFML_CLIPBOARDIMPLANDROID_HPP +#pragma once namespace sf @@ -67,6 +66,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_CLIPBOARDIMPLANDROID_HPP diff --git a/src/SFML/Window/Android/CursorImpl.hpp b/src/SFML/Window/Android/CursorImpl.hpp index 4287e9ee..97a67836 100644 --- a/src/SFML/Window/Android/CursorImpl.hpp +++ b/src/SFML/Window/Android/CursorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSORIMPLANDROID_HPP -#define SFML_CURSORIMPLANDROID_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -86,5 +85,3 @@ public: } // namespace priv } // namespace sf - -#endif // SFML_CURSORIMPLANDROID_HPP diff --git a/src/SFML/Window/Android/InputImpl.hpp b/src/SFML/Window/Android/InputImpl.hpp index 86c8c575..252e6906 100644 --- a/src/SFML/Window/Android/InputImpl.hpp +++ b/src/SFML/Window/Android/InputImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTIMPLANDROID_HPP -#define SFML_INPUTIMPLANDROID_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -162,6 +161,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_INPUTIMPLANDROID_HPP diff --git a/src/SFML/Window/Android/JoystickImpl.hpp b/src/SFML/Window/Android/JoystickImpl.hpp index 0709d7b8..37e8247b 100644 --- a/src/SFML/Window/Android/JoystickImpl.hpp +++ b/src/SFML/Window/Android/JoystickImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIMPLANDROID_HPP -#define SFML_JOYSTICKIMPLANDROID_HPP +#pragma once namespace sf @@ -109,6 +108,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_JOYSTICKIMPLANDROID_HPP diff --git a/src/SFML/Window/Android/SensorImpl.hpp b/src/SFML/Window/Android/SensorImpl.hpp index 5bf1961f..f5d2b660 100644 --- a/src/SFML/Window/Android/SensorImpl.hpp +++ b/src/SFML/Window/Android/SensorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SENSORIMPLANDROID_HPP -#define SFML_SENSORIMPLANDROID_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -131,6 +130,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SENSORIMPLANDROID_HPP diff --git a/src/SFML/Window/Android/WindowImplAndroid.hpp b/src/SFML/Window/Android/WindowImplAndroid.hpp index 8012a19d..6b085e44 100644 --- a/src/SFML/Window/Android/WindowImplAndroid.hpp +++ b/src/SFML/Window/Android/WindowImplAndroid.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWIMPLANDROID_HPP -#define SFML_WINDOWIMPLANDROID_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -241,6 +240,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_WINDOWIMPLANDROID_HPP diff --git a/src/SFML/Window/ClipboardImpl.hpp b/src/SFML/Window/ClipboardImpl.hpp index 3dfc9266..7322f156 100644 --- a/src/SFML/Window/ClipboardImpl.hpp +++ b/src/SFML/Window/ClipboardImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLIPBOARDIMPL_HPP -#define SFML_CLIPBOARDIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -46,5 +45,3 @@ #elif defined(SFML_SYSTEM_ANDROID) #include #endif - -#endif // SFML_CLIPBOARDIMPL_HPP diff --git a/src/SFML/Window/CursorImpl.hpp b/src/SFML/Window/CursorImpl.hpp index 601f9de3..4b6442d9 100644 --- a/src/SFML/Window/CursorImpl.hpp +++ b/src/SFML/Window/CursorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSORIMPL_HPP -#define SFML_CURSORIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -46,6 +45,3 @@ #elif defined(SFML_SYSTEM_ANDROID) #include #endif - - -#endif // SFML_CURSORIMPL_HPP diff --git a/src/SFML/Window/DRM/ClipboardImpl.hpp b/src/SFML/Window/DRM/ClipboardImpl.hpp index 6e5f6bed..5b74d3a5 100644 --- a/src/SFML/Window/DRM/ClipboardImpl.hpp +++ b/src/SFML/Window/DRM/ClipboardImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLIPBOARDIMPLDRM_HPP -#define SFML_CLIPBOARDIMPLDRM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -70,6 +69,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_CLIPBOARDIMPLDRM_HPP diff --git a/src/SFML/Window/DRM/CursorImpl.hpp b/src/SFML/Window/DRM/CursorImpl.hpp index 757b0f30..41f3fa05 100644 --- a/src/SFML/Window/DRM/CursorImpl.hpp +++ b/src/SFML/Window/DRM/CursorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSORIMPLDRM_HPP -#define SFML_CURSORIMPLDRM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -115,6 +114,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_CUSROSIMPLDRM_HPP diff --git a/src/SFML/Window/DRM/DRMContext.hpp b/src/SFML/Window/DRM/DRMContext.hpp index da3bf4c2..9e203832 100644 --- a/src/SFML/Window/DRM/DRMContext.hpp +++ b/src/SFML/Window/DRM/DRMContext.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_DRMCONTEXT_HPP -#define SFML_DRMCONTEXT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -215,6 +214,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_DRMCONTEXT_HPP diff --git a/src/SFML/Window/DRM/InputImplUDev.hpp b/src/SFML/Window/DRM/InputImplUDev.hpp index 9fed957a..c4adedd3 100644 --- a/src/SFML/Window/DRM/InputImplUDev.hpp +++ b/src/SFML/Window/DRM/InputImplUDev.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTIMPLUDEV_HPP -#define SFML_INPUTIMPLUDEV_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -186,6 +185,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_INPUTIMPLUDEV_HPP diff --git a/src/SFML/Window/DRM/WindowImplDRM.hpp b/src/SFML/Window/DRM/WindowImplDRM.hpp index 010987cd..3f6f3184 100644 --- a/src/SFML/Window/DRM/WindowImplDRM.hpp +++ b/src/SFML/Window/DRM/WindowImplDRM.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWIMPLDRM_HPP -#define SFML_WINDOWIMPLDRM_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -196,6 +195,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_WINDOWIMPLDRM_HPP diff --git a/src/SFML/Window/EGLCheck.hpp b/src/SFML/Window/EGLCheck.hpp index ec7d9185..39c5def1 100644 --- a/src/SFML/Window/EGLCheck.hpp +++ b/src/SFML/Window/EGLCheck.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_EGLCHECK_HPP -#define SFML_EGLCHECK_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -70,6 +69,3 @@ void eglCheckError(const std::filesystem::path& file, unsigned int line, const c } // namespace priv } // namespace sf - - -#endif // SFML_EGLCHECK_HPP diff --git a/src/SFML/Window/EglContext.hpp b/src/SFML/Window/EglContext.hpp index dce013af..c07aa993 100644 --- a/src/SFML/Window/EglContext.hpp +++ b/src/SFML/Window/EglContext.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_EGLCONTEXT_HPP -#define SFML_EGLCONTEXT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -197,6 +196,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_EGLCONTEXT_HPP diff --git a/src/SFML/Window/FreeBSD/JoystickImpl.hpp b/src/SFML/Window/FreeBSD/JoystickImpl.hpp index f2efafe8..34e01e1c 100644 --- a/src/SFML/Window/FreeBSD/JoystickImpl.hpp +++ b/src/SFML/Window/FreeBSD/JoystickImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIMPLFREEBSD_HPP -#define SFML_JOYSTICKIMPLFREEBSD_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -122,6 +121,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_JOYSTICKIMPLFREEBSD_HPP diff --git a/src/SFML/Window/GlContext.hpp b/src/SFML/Window/GlContext.hpp index adcfe89a..8978b758 100644 --- a/src/SFML/Window/GlContext.hpp +++ b/src/SFML/Window/GlContext.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GLCONTEXT_HPP -#define SFML_GLCONTEXT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -326,6 +325,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_GLCONTEXT_HPP diff --git a/src/SFML/Window/InputImpl.hpp b/src/SFML/Window/InputImpl.hpp index 9457d133..d94e2d11 100644 --- a/src/SFML/Window/InputImpl.hpp +++ b/src/SFML/Window/InputImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTIMPL_HPP -#define SFML_INPUTIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -46,5 +45,3 @@ #elif defined(SFML_SYSTEM_ANDROID) #include #endif - -#endif // SFML_INPUTIMPL_HPP diff --git a/src/SFML/Window/JoystickImpl.hpp b/src/SFML/Window/JoystickImpl.hpp index 0e01f43b..81a4b421 100644 --- a/src/SFML/Window/JoystickImpl.hpp +++ b/src/SFML/Window/JoystickImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIMPL_HPP -#define SFML_JOYSTICKIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -97,6 +96,3 @@ struct JoystickState #include #endif - - -#endif // SFML_JOYSTICKIMPL_HPP diff --git a/src/SFML/Window/JoystickManager.hpp b/src/SFML/Window/JoystickManager.hpp index f6a9d701..da7dbe6f 100644 --- a/src/SFML/Window/JoystickManager.hpp +++ b/src/SFML/Window/JoystickManager.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKMANAGER_HPP -#define SFML_JOYSTICKMANAGER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -133,6 +132,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_JOYSTICKMANAGER_HPP diff --git a/src/SFML/Window/NetBSD/JoystickImpl.hpp b/src/SFML/Window/NetBSD/JoystickImpl.hpp index 49ebc323..19779b03 100644 --- a/src/SFML/Window/NetBSD/JoystickImpl.hpp +++ b/src/SFML/Window/NetBSD/JoystickImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIMPLNETBSD_HPP -#define SFML_JOYSTICKIMPLNETBSD_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -123,6 +122,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_JOYSTICKIMPLNETBSD_HPP diff --git a/src/SFML/Window/OSX/AutoreleasePoolWrapper.hpp b/src/SFML/Window/OSX/AutoreleasePoolWrapper.hpp index 8ba5b1a5..30ab8020 100644 --- a/src/SFML/Window/OSX/AutoreleasePoolWrapper.hpp +++ b/src/SFML/Window/OSX/AutoreleasePoolWrapper.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_AUTORELEASEPOOL_HPP -#define SFML_AUTORELEASEPOOL_HPP +#pragma once //////////////////////////////////////////////////////////// /// Predefine OBJ-C classes @@ -71,5 +70,3 @@ private: }; } // namespace sf - -#endif // SFML_AUTORELEASEPOOL_HPP diff --git a/src/SFML/Window/OSX/ClipboardImpl.hpp b/src/SFML/Window/OSX/ClipboardImpl.hpp index 82bf30e2..853f4c30 100644 --- a/src/SFML/Window/OSX/ClipboardImpl.hpp +++ b/src/SFML/Window/OSX/ClipboardImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLIPBOARDIMPLCOCOA_HPP -#define SFML_CLIPBOARDIMPLCOCOA_HPP +#pragma once namespace sf @@ -68,6 +67,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_CLIPBOARDIMPLCOCOA_HPP diff --git a/src/SFML/Window/OSX/CursorImpl.hpp b/src/SFML/Window/OSX/CursorImpl.hpp index ae1ebf74..e11f85f1 100644 --- a/src/SFML/Window/OSX/CursorImpl.hpp +++ b/src/SFML/Window/OSX/CursorImpl.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSORIMPLOSX_HPP -#define SFML_CURSORIMPLOSX_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -114,5 +113,3 @@ private: } // namespace priv } // namespace sf - -#endif // SFML_CURSORIMPLOSX_HPP diff --git a/src/SFML/Window/OSX/HIDInputManager.hpp b/src/SFML/Window/OSX/HIDInputManager.hpp index 90cce0dd..ad104c51 100644 --- a/src/SFML/Window/OSX/HIDInputManager.hpp +++ b/src/SFML/Window/OSX/HIDInputManager.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_HIDINPUTMANAGER_HPP -#define SFML_HIDINPUTMANAGER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -240,5 +239,3 @@ private: } // namespace priv } // namespace sf - -#endif diff --git a/src/SFML/Window/OSX/HIDJoystickManager.hpp b/src/SFML/Window/OSX/HIDJoystickManager.hpp index 720ff299..99e91ce6 100644 --- a/src/SFML/Window/OSX/HIDJoystickManager.hpp +++ b/src/SFML/Window/OSX/HIDJoystickManager.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_HIDJOYSTICKMANAGER_HPP -#define SFML_HIDJOYSTICKMANAGER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -131,5 +130,3 @@ private: } // namespace priv } // namespace sf - -#endif diff --git a/src/SFML/Window/OSX/InputImpl.hpp b/src/SFML/Window/OSX/InputImpl.hpp index a798d8fc..306f788c 100644 --- a/src/SFML/Window/OSX/InputImpl.hpp +++ b/src/SFML/Window/OSX/InputImpl.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTIMPLOSX_HPP -#define SFML_INPUTIMPLOSX_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -163,6 +162,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_INPUTIMPLOSX_HPP diff --git a/src/SFML/Window/OSX/JoystickImpl.hpp b/src/SFML/Window/OSX/JoystickImpl.hpp index 93087f77..94945532 100644 --- a/src/SFML/Window/OSX/JoystickImpl.hpp +++ b/src/SFML/Window/OSX/JoystickImpl.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIMPLOSX_HPP -#define SFML_JOYSTICKIMPLOSX_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -133,6 +132,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_JOYSTICKIMPLOSX_HPP diff --git a/src/SFML/Window/OSX/SFContext.hpp b/src/SFML/Window/OSX/SFContext.hpp index 60311a5f..0c9cd1ce 100644 --- a/src/SFML/Window/OSX/SFContext.hpp +++ b/src/SFML/Window/OSX/SFContext.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SFCONTEXT_HPP -#define SFML_SFCONTEXT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -164,5 +163,3 @@ private: } // namespace priv } // namespace sf - -#endif // SFML_SFCONTEXT_HPP diff --git a/src/SFML/Window/OSX/SensorImpl.hpp b/src/SFML/Window/OSX/SensorImpl.hpp index 5a05d9b4..083f0f7b 100644 --- a/src/SFML/Window/OSX/SensorImpl.hpp +++ b/src/SFML/Window/OSX/SensorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SENSORIMPLOSX_HPP -#define SFML_SENSORIMPLOSX_HPP +#pragma once namespace sf @@ -95,6 +94,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_SENSORIMPLOSX_HPP diff --git a/src/SFML/Window/OSX/WindowImplCocoa.hpp b/src/SFML/Window/OSX/WindowImplCocoa.hpp index ba9d47d2..f746c9f0 100644 --- a/src/SFML/Window/OSX/WindowImplCocoa.hpp +++ b/src/SFML/Window/OSX/WindowImplCocoa.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWIMPLCOCOA_HPP -#define SFML_WINDOWIMPLCOCOA_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -373,5 +372,3 @@ private: } // namespace sf #pragma GCC diagnostic pop - -#endif // SFML_WINDOWIMPLCOCOA_HPP diff --git a/src/SFML/Window/OSX/cg_sf_conversion.hpp b/src/SFML/Window/OSX/cg_sf_conversion.hpp index 4a2e9deb..406de990 100644 --- a/src/SFML/Window/OSX/cg_sf_conversion.hpp +++ b/src/SFML/Window/OSX/cg_sf_conversion.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CG_SF_CONVERSION_HPP -#define SFML_CG_SF_CONVERSION_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -69,5 +68,3 @@ CGDisplayModeRef convertSFModeToCGMode(VideoMode sfmode); } // namespace priv } // namespace sf - -#endif diff --git a/src/SFML/Window/OpenBSD/JoystickImpl.hpp b/src/SFML/Window/OpenBSD/JoystickImpl.hpp index 5bfe1255..48084335 100644 --- a/src/SFML/Window/OpenBSD/JoystickImpl.hpp +++ b/src/SFML/Window/OpenBSD/JoystickImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIMPLOPENBSD_HPP -#define SFML_JOYSTICKIMPLOPENBSD_HPP +#pragma once namespace sf @@ -110,6 +109,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_JOYSTICKIMPLOPENBSD_HPP diff --git a/src/SFML/Window/SensorImpl.hpp b/src/SFML/Window/SensorImpl.hpp index 66c1d026..6d6c8de0 100644 --- a/src/SFML/Window/SensorImpl.hpp +++ b/src/SFML/Window/SensorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SENSORIMPL_HPP -#define SFML_SENSORIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -54,6 +53,3 @@ #include #endif - - -#endif // SFML_SENSORIMPL_HPP diff --git a/src/SFML/Window/SensorManager.hpp b/src/SFML/Window/SensorManager.hpp index 1664f263..de135e68 100644 --- a/src/SFML/Window/SensorManager.hpp +++ b/src/SFML/Window/SensorManager.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SENSORMANAGER_HPP -#define SFML_SENSORMANAGER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -142,6 +141,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SENSORMANAGER_HPP diff --git a/src/SFML/Window/Unix/ClipboardImpl.hpp b/src/SFML/Window/Unix/ClipboardImpl.hpp index 85d5f9a0..f2ed775e 100644 --- a/src/SFML/Window/Unix/ClipboardImpl.hpp +++ b/src/SFML/Window/Unix/ClipboardImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLIPBOARDIMPLX11_HPP -#define SFML_CLIPBOARDIMPLX11_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -151,6 +150,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_CLIPBOARDIMPLX11_HPP diff --git a/src/SFML/Window/Unix/CursorImpl.hpp b/src/SFML/Window/Unix/CursorImpl.hpp index e5751a8d..a5bee9e6 100644 --- a/src/SFML/Window/Unix/CursorImpl.hpp +++ b/src/SFML/Window/Unix/CursorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSORIMPLUNIX_HPP -#define SFML_CURSORIMPLUNIX_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -131,5 +130,3 @@ private: } // namespace priv } // namespace sf - -#endif // SFML_CUSROSIMPLUNIX_HPP diff --git a/src/SFML/Window/Unix/Display.hpp b/src/SFML/Window/Unix/Display.hpp index ff1634de..df616692 100644 --- a/src/SFML/Window/Unix/Display.hpp +++ b/src/SFML/Window/Unix/Display.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SHAREDDISPLAY_HPP -#define SFML_SHAREDDISPLAY_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -93,6 +92,3 @@ Atom getAtom(const std::string& name, bool onlyIfExists = false); } // namespace priv } // namespace sf - - -#endif // SFML_SHAREDDISPLAY_HPP diff --git a/src/SFML/Window/Unix/GlxContext.hpp b/src/SFML/Window/Unix/GlxContext.hpp index 81b2ae33..14b291b9 100644 --- a/src/SFML/Window/Unix/GlxContext.hpp +++ b/src/SFML/Window/Unix/GlxContext.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GLXCONTEXT_HPP -#define SFML_GLXCONTEXT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -186,5 +185,3 @@ private: } // namespace priv } // namespace sf - -#endif // SFML_GLXCONTEXT_HPP diff --git a/src/SFML/Window/Unix/InputImpl.hpp b/src/SFML/Window/Unix/InputImpl.hpp index 213e06d3..834b9283 100644 --- a/src/SFML/Window/Unix/InputImpl.hpp +++ b/src/SFML/Window/Unix/InputImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTIMPLX11_HPP -#define SFML_INPUTIMPLX11_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -162,6 +161,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_INPUTIMPLX11_HPP diff --git a/src/SFML/Window/Unix/JoystickImpl.hpp b/src/SFML/Window/Unix/JoystickImpl.hpp index 52744697..9e4e3e15 100644 --- a/src/SFML/Window/Unix/JoystickImpl.hpp +++ b/src/SFML/Window/Unix/JoystickImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIMPLLINUX_HPP -#define SFML_JOYSTICKIMPLLINUX_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -119,6 +118,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_JOYSTICKIMPLLINUX_HPP diff --git a/src/SFML/Window/Unix/SensorImpl.hpp b/src/SFML/Window/Unix/SensorImpl.hpp index 01b0189f..e7ac7e76 100644 --- a/src/SFML/Window/Unix/SensorImpl.hpp +++ b/src/SFML/Window/Unix/SensorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SENSORIMPLUNIX_HPP -#define SFML_SENSORIMPLUNIX_HPP +#pragma once namespace sf @@ -95,6 +94,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_SENSORIMPLUNIX_HPP diff --git a/src/SFML/Window/Unix/VulkanImplX11.hpp b/src/SFML/Window/Unix/VulkanImplX11.hpp index 3bb18882..24b461dd 100644 --- a/src/SFML/Window/Unix/VulkanImplX11.hpp +++ b/src/SFML/Window/Unix/VulkanImplX11.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VULKANIMPLX11_HPP -#define SFML_VULKANIMPLX11_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -101,6 +100,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_VULKANIMPLX11_HPP diff --git a/src/SFML/Window/Unix/WindowImplX11.hpp b/src/SFML/Window/Unix/WindowImplX11.hpp index 667649f2..8a6e9db1 100644 --- a/src/SFML/Window/Unix/WindowImplX11.hpp +++ b/src/SFML/Window/Unix/WindowImplX11.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWIMPLX11_HPP -#define SFML_WINDOWIMPLX11_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -321,6 +320,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_WINDOWIMPLX11_HPP diff --git a/src/SFML/Window/VideoModeImpl.hpp b/src/SFML/Window/VideoModeImpl.hpp index 3c0d0007..42614f35 100644 --- a/src/SFML/Window/VideoModeImpl.hpp +++ b/src/SFML/Window/VideoModeImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VIDEOMODEIMPL_HPP -#define SFML_VIDEOMODEIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -62,6 +61,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_VIDEOMODEIMPL_HPP diff --git a/src/SFML/Window/Win32/ClipboardImpl.hpp b/src/SFML/Window/Win32/ClipboardImpl.hpp index 0128627e..6d45fa47 100644 --- a/src/SFML/Window/Win32/ClipboardImpl.hpp +++ b/src/SFML/Window/Win32/ClipboardImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLIPBOARDIMPLWIN32_HPP -#define SFML_CLIPBOARDIMPLWIN32_HPP +#pragma once namespace sf @@ -67,6 +66,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_CLIPBOARDIMPLWIN32_HPP diff --git a/src/SFML/Window/Win32/CursorImpl.hpp b/src/SFML/Window/Win32/CursorImpl.hpp index 6781811d..07ff24ec 100644 --- a/src/SFML/Window/Win32/CursorImpl.hpp +++ b/src/SFML/Window/Win32/CursorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSORIMPLWIN32_HPP -#define SFML_CURSORIMPLWIN32_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -106,5 +105,3 @@ private: } // namespace priv } // namespace sf - -#endif // SFML_CUSROSIMPLWIN32_HPP diff --git a/src/SFML/Window/Win32/InputImpl.hpp b/src/SFML/Window/Win32/InputImpl.hpp index b29588a7..f515a2c5 100644 --- a/src/SFML/Window/Win32/InputImpl.hpp +++ b/src/SFML/Window/Win32/InputImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTIMPLWIN32_HPP -#define SFML_INPUTIMPLWIN32_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -162,6 +161,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_INPUTIMPLWIN32_HPP diff --git a/src/SFML/Window/Win32/JoystickImpl.hpp b/src/SFML/Window/Win32/JoystickImpl.hpp index 91232b3c..c35d2d1e 100644 --- a/src/SFML/Window/Win32/JoystickImpl.hpp +++ b/src/SFML/Window/Win32/JoystickImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIMPLWIN32_HPP -#define SFML_JOYSTICKIMPLWIN32_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -231,6 +230,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_JOYSTICKIMPLWIN32_HPP diff --git a/src/SFML/Window/Win32/SensorImpl.hpp b/src/SFML/Window/Win32/SensorImpl.hpp index 06f3ff8d..f7c61dc8 100644 --- a/src/SFML/Window/Win32/SensorImpl.hpp +++ b/src/SFML/Window/Win32/SensorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SENSORIMPLWIN32_HPP -#define SFML_SENSORIMPLWIN32_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -100,6 +99,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_SENSORIMPLWIN32_HPP diff --git a/src/SFML/Window/Win32/VulkanImplWin32.hpp b/src/SFML/Window/Win32/VulkanImplWin32.hpp index 5b573f55..e00fa60c 100644 --- a/src/SFML/Window/Win32/VulkanImplWin32.hpp +++ b/src/SFML/Window/Win32/VulkanImplWin32.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VULKANIMPLWIN32_HPP -#define SFML_VULKANIMPLWIN32_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -101,6 +100,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_VULKANIMPLWIN32_HPP diff --git a/src/SFML/Window/Win32/WglContext.hpp b/src/SFML/Window/Win32/WglContext.hpp index d8aee6a5..84dbc492 100644 --- a/src/SFML/Window/Win32/WglContext.hpp +++ b/src/SFML/Window/Win32/WglContext.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WGLCONTEXT_HPP -#define SFML_WGLCONTEXT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -189,5 +188,3 @@ private: } // namespace priv } // namespace sf - -#endif // SFML_WGLCONTEXT_HPP diff --git a/src/SFML/Window/Win32/WindowImplWin32.hpp b/src/SFML/Window/Win32/WindowImplWin32.hpp index bac5c9b5..805cb0af 100644 --- a/src/SFML/Window/Win32/WindowImplWin32.hpp +++ b/src/SFML/Window/Win32/WindowImplWin32.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWIMPLWIN32_HPP -#define SFML_WINDOWIMPLWIN32_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -287,5 +286,3 @@ private: } // namespace priv } // namespace sf - -#endif // SFML_WINDOWIMPLWIN32_HPP diff --git a/src/SFML/Window/WindowImpl.hpp b/src/SFML/Window/WindowImpl.hpp index 24e43b5c..85670a6f 100644 --- a/src/SFML/Window/WindowImpl.hpp +++ b/src/SFML/Window/WindowImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWIMPL_HPP -#define SFML_WINDOWIMPL_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -305,6 +304,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_WINDOWIMPL_HPP diff --git a/src/SFML/Window/iOS/ClipboardImpl.hpp b/src/SFML/Window/iOS/ClipboardImpl.hpp index 27087782..853f4c30 100644 --- a/src/SFML/Window/iOS/ClipboardImpl.hpp +++ b/src/SFML/Window/iOS/ClipboardImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLIPBOARDIMPLIOS_HPP -#define SFML_CLIPBOARDIMPLIOS_HPP +#pragma once namespace sf @@ -68,6 +67,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_CLIPBOARDIMPLIOS_HPP diff --git a/src/SFML/Window/iOS/CursorImpl.hpp b/src/SFML/Window/iOS/CursorImpl.hpp index 63f954be..27414297 100644 --- a/src/SFML/Window/iOS/CursorImpl.hpp +++ b/src/SFML/Window/iOS/CursorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSORIMPLIOS_HPP -#define SFML_CURSORIMPLIOS_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -86,5 +85,3 @@ public: } // namespace priv } // namespace sf - -#endif // SFML_CURSORIMPLIOS_HPP diff --git a/src/SFML/Window/iOS/EaglContext.hpp b/src/SFML/Window/iOS/EaglContext.hpp index 0a5aefa7..879bfb4f 100644 --- a/src/SFML/Window/iOS/EaglContext.hpp +++ b/src/SFML/Window/iOS/EaglContext.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_EAGLCONTEXT_HPP -#define SFML_EAGLCONTEXT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -172,5 +171,3 @@ private: } // namespace sf #pragma GCC diagnostic pop - -#endif // SFML_EAGLCONTEXT_HPP diff --git a/src/SFML/Window/iOS/InputImpl.hpp b/src/SFML/Window/iOS/InputImpl.hpp index a28a101e..95ae377a 100644 --- a/src/SFML/Window/iOS/InputImpl.hpp +++ b/src/SFML/Window/iOS/InputImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTIMPLIOS_HPP -#define SFML_INPUTIMPLIOS_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -162,6 +161,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_INPUTIMPLIOS_HPP diff --git a/src/SFML/Window/iOS/JoystickImpl.hpp b/src/SFML/Window/iOS/JoystickImpl.hpp index 39146d04..fcdce0ef 100644 --- a/src/SFML/Window/iOS/JoystickImpl.hpp +++ b/src/SFML/Window/iOS/JoystickImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIMPLIOS_HPP -#define SFML_JOYSTICKIMPLIOS_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -108,6 +107,3 @@ public: } // namespace priv } // namespace sf - - -#endif // SFML_JOYSTICKIMPLIOS_HPP diff --git a/src/SFML/Window/iOS/ObjCType.hpp b/src/SFML/Window/iOS/ObjCType.hpp index 78fdf285..551ade6c 100644 --- a/src/SFML/Window/iOS/ObjCType.hpp +++ b/src/SFML/Window/iOS/ObjCType.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_OBJCTYPE_HPP -#define SFML_OBJCTYPE_HPP +#pragma once // Forward declare an Objective-C class @@ -32,6 +31,3 @@ #else #define SFML_DECLARE_OBJC_CLASS(c) typedef struct objc_object c #endif - - -#endif // SFML_OBJCTYPE_HPP diff --git a/src/SFML/Window/iOS/SFAppDelegate.hpp b/src/SFML/Window/iOS/SFAppDelegate.hpp index 5ac57380..1abd9e1a 100644 --- a/src/SFML/Window/iOS/SFAppDelegate.hpp +++ b/src/SFML/Window/iOS/SFAppDelegate.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SFAPPDELEGATE_HPP -#define SFML_SFAPPDELEGATE_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -131,5 +130,3 @@ @property(nonatomic) CGFloat backingScaleFactor; @end - -#endif // SFML_SFAPPDELEGATE_HPP diff --git a/src/SFML/Window/iOS/SFMain.hpp b/src/SFML/Window/iOS/SFMain.hpp index a133bd28..903151a1 100644 --- a/src/SFML/Window/iOS/SFMain.hpp +++ b/src/SFML/Window/iOS/SFMain.hpp @@ -22,13 +22,9 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SFMAIN_HPP -#define SFML_SFMAIN_HPP +#pragma once int sfmlMain(int argc, char** argv); int sfmlMain(); - - -#endif // SFML_SFMAIN_HPP diff --git a/src/SFML/Window/iOS/SFView.hpp b/src/SFML/Window/iOS/SFView.hpp index b4585c8b..e8de9cfe 100644 --- a/src/SFML/Window/iOS/SFView.hpp +++ b/src/SFML/Window/iOS/SFView.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SFVIEW_HPP -#define SFML_SFVIEW_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -56,5 +55,3 @@ @property(nonatomic) sf::priv::EaglContext* context; ///< The attached EAGL context @end - -#endif // SFML_SFVIEW_HPP diff --git a/src/SFML/Window/iOS/SFViewController.hpp b/src/SFML/Window/iOS/SFViewController.hpp index 26f10c1a..0690a1b3 100644 --- a/src/SFML/Window/iOS/SFViewController.hpp +++ b/src/SFML/Window/iOS/SFViewController.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SFVIEWCONTROLLER_HPP -#define SFML_SFVIEWCONTROLLER_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -61,5 +60,3 @@ @property(nonatomic) bool orientationCanChange; ///< Tells whether the controller's view can rotate or not @end - -#endif // SFML_SFVIEWCONTROLLER_HPP diff --git a/src/SFML/Window/iOS/SensorImpl.hpp b/src/SFML/Window/iOS/SensorImpl.hpp index 93918905..5c049821 100644 --- a/src/SFML/Window/iOS/SensorImpl.hpp +++ b/src/SFML/Window/iOS/SensorImpl.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SENSORIMPLIOS_HPP -#define SFML_SENSORIMPLIOS_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -107,6 +106,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_SENSORIMPLIOS_HPP diff --git a/src/SFML/Window/iOS/WindowImplUIKit.hpp b/src/SFML/Window/iOS/WindowImplUIKit.hpp index 852d6510..a73a943e 100644 --- a/src/SFML/Window/iOS/WindowImplUIKit.hpp +++ b/src/SFML/Window/iOS/WindowImplUIKit.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWIMPLUIKIT_HPP -#define SFML_WINDOWIMPLUIKIT_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -226,6 +225,3 @@ private: } // namespace priv } // namespace sf - - -#endif // SFML_WINDOWIMPLUIKIT_HPP diff --git a/test/TestUtilities/GraphicsUtil.hpp b/test/TestUtilities/GraphicsUtil.hpp index 67dbc96d..4b134356 100644 --- a/test/TestUtilities/GraphicsUtil.hpp +++ b/test/TestUtilities/GraphicsUtil.hpp @@ -3,8 +3,7 @@ // For a new graphics module test case, include this header. // This ensures that string conversions are visible and can be used by doctest for debug output. -#ifndef SFML_TESTUTILITIES_GRAPHICS_HPP -#define SFML_TESTUTILITIES_GRAPHICS_HPP +#pragma once #include @@ -34,5 +33,3 @@ std::ostream& operator<<(std::ostream& os, const Rect& rect) } // namespace sf bool operator==(const sf::Transform& lhs, const Approx& rhs); - -#endif // SFML_TESTUTILITIES_GRAPHICS_HPP diff --git a/test/TestUtilities/SystemUtil.hpp b/test/TestUtilities/SystemUtil.hpp index 764b42c1..ec198213 100644 --- a/test/TestUtilities/SystemUtil.hpp +++ b/test/TestUtilities/SystemUtil.hpp @@ -3,8 +3,7 @@ // For a new system module test case, include this header. // This ensures that string conversions are visible and can be used by doctest for debug output. -#ifndef SFML_TESTUTILITIES_SYSTEM_HPP -#define SFML_TESTUTILITIES_SYSTEM_HPP +#pragma once #include #include @@ -62,5 +61,3 @@ std::ostream& operator<<(std::ostream& os, const Approx& approx) { return os << approx.value; } - -#endif // SFML_TESTUTILITIES_SYSTEM_HPP diff --git a/test/TestUtilities/WindowUtil.hpp b/test/TestUtilities/WindowUtil.hpp index 7721fd70..e0b58e09 100644 --- a/test/TestUtilities/WindowUtil.hpp +++ b/test/TestUtilities/WindowUtil.hpp @@ -3,8 +3,7 @@ // For a new window module test case, include this header. // This ensures that string conversions are visible and can be used by doctest for debug output. -#ifndef SFML_TESTUTILITIES_WINDOW_HPP -#define SFML_TESTUTILITIES_WINDOW_HPP +#pragma once #include @@ -15,5 +14,3 @@ class VideoMode; std::ostream& operator<<(std::ostream& os, const VideoMode& videoMode); } // namespace sf - -#endif // SFML_TESTUTILITIES_WINDOW_HPP diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.hpp b/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.hpp index 6d597668..b31497c1 100644 --- a/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.hpp +++ b/tools/xcode/templates/SFML/SFML App.xctemplate/ResourcePath.hpp @@ -23,8 +23,7 @@ // //////////////////////////////////////////////////////////// -#ifndef RESOURCE_PATH_HPP -#define RESOURCE_PATH_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -39,5 +38,3 @@ /// //////////////////////////////////////////////////////////// std::filesystem::path resourcePath(); - -#endif