diff --git a/include/SFML/Audio.h b/include/SFML/Audio.h index 2ab27203..3ae7693e 100644 --- a/include/SFML/Audio.h +++ b/include/SFML/Audio.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_AUDIO_H -#define SFML_AUDIO_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ #include #include #include - - -#endif // SFML_AUDIO_H diff --git a/include/SFML/Audio/Export.h b/include/SFML/Audio/Export.h index b98a1b95..39103018 100644 --- a/include/SFML/Audio/Export.h +++ b/include/SFML/Audio/Export.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_AUDIO_EXPORT_H -#define SFML_AUDIO_EXPORT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define CSFML_AUDIO_API CSFML_API_IMPORT #endif - - -#endif // SFML_AUDIO_EXPORT_H diff --git a/include/SFML/Audio/Listener.h b/include/SFML/Audio/Listener.h index 2a875a4d..f8ea9bac 100644 --- a/include/SFML/Audio/Listener.h +++ b/include/SFML/Audio/Listener.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_LISTENER_H -#define SFML_LISTENER_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -115,6 +114,3 @@ CSFML_AUDIO_API void sfListener_setUpVector(sfVector3f upVector); /// //////////////////////////////////////////////////////////// CSFML_AUDIO_API sfVector3f sfListener_getUpVector(void); - - -#endif // SFML_LISTENER_H diff --git a/include/SFML/Audio/Music.h b/include/SFML/Audio/Music.h index 8b770552..d14f7b21 100644 --- a/include/SFML/Audio/Music.h +++ b/include/SFML/Audio/Music.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_MUSIC_H -#define SFML_MUSIC_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -421,6 +420,3 @@ CSFML_AUDIO_API float sfMusic_getMinDistance(const sfMusic* music); /// //////////////////////////////////////////////////////////// CSFML_AUDIO_API float sfMusic_getAttenuation(const sfMusic* music); - - -#endif // SFML_MUSIC_H diff --git a/include/SFML/Audio/Sound.h b/include/SFML/Audio/Sound.h index 7bd28aca..127c3f14 100644 --- a/include/SFML/Audio/Sound.h +++ b/include/SFML/Audio/Sound.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUND_H -#define SFML_SOUND_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -328,6 +327,3 @@ CSFML_AUDIO_API float sfSound_getAttenuation(const sfSound* sound); /// //////////////////////////////////////////////////////////// CSFML_AUDIO_API sfTime sfSound_getPlayingOffset(const sfSound* sound); - - -#endif // SFML_SOUND_H diff --git a/include/SFML/Audio/SoundBuffer.h b/include/SFML/Audio/SoundBuffer.h index 1e33f98b..7c7384a3 100644 --- a/include/SFML/Audio/SoundBuffer.h +++ b/include/SFML/Audio/SoundBuffer.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDBUFFER_H -#define SFML_SOUNDBUFFER_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -198,6 +197,3 @@ CSFML_AUDIO_API unsigned int sfSoundBuffer_getChannelCount(const sfSoundBuffer* /// //////////////////////////////////////////////////////////// CSFML_AUDIO_API sfTime sfSoundBuffer_getDuration(const sfSoundBuffer* soundBuffer); - - -#endif // SFML_SOUNDBUFFER_H diff --git a/include/SFML/Audio/SoundBufferRecorder.h b/include/SFML/Audio/SoundBufferRecorder.h index 027c524e..6fb6451e 100644 --- a/include/SFML/Audio/SoundBufferRecorder.h +++ b/include/SFML/Audio/SoundBufferRecorder.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDBUFFERRECORDER_H -#define SFML_SOUNDBUFFERRECORDER_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -128,6 +127,3 @@ CSFML_AUDIO_API bool sfSoundBufferRecorder_setDevice(sfSoundBufferRecorder* soun /// //////////////////////////////////////////////////////////// CSFML_AUDIO_API const char* sfSoundBufferRecorder_getDevice(sfSoundBufferRecorder* soundBufferRecorder); - - -#endif // SFML_SOUNDBUFFERRECORDER_H diff --git a/include/SFML/Audio/SoundChannel.h b/include/SFML/Audio/SoundChannel.h index f4c6f124..a1d466e7 100644 --- a/include/SFML/Audio/SoundChannel.h +++ b/include/SFML/Audio/SoundChannel.h @@ -22,9 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDCHANNEL_H -#define SFML_SOUNDCHANNEL_H - +#pragma once //////////////////////////////////////////////////////////// /// \brief Types of sound channels that can be read/written from sound buffers/files @@ -60,6 +58,3 @@ typedef enum sfSoundChannelTopBackRight, sfSoundChannelTopBackCenter } sfSoundChannel; - - -#endif // SFML_SOUNDCHANNEL_H diff --git a/include/SFML/Audio/SoundRecorder.h b/include/SFML/Audio/SoundRecorder.h index 1cbfe46d..0d1681ca 100644 --- a/include/SFML/Audio/SoundRecorder.h +++ b/include/SFML/Audio/SoundRecorder.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDRECORDER_H -#define SFML_SOUNDRECORDER_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -193,6 +192,3 @@ CSFML_AUDIO_API void sfSoundRecorder_setChannelCount(sfSoundRecorder* soundRecor /// //////////////////////////////////////////////////////////// CSFML_AUDIO_API unsigned int sfSoundRecorder_getChannelCount(const sfSoundRecorder* soundRecorder); - - -#endif // SFML_SOUNDRECORDER_H diff --git a/include/SFML/Audio/SoundStatus.h b/include/SFML/Audio/SoundStatus.h index 36b1be36..2fcd2c82 100644 --- a/include/SFML/Audio/SoundStatus.h +++ b/include/SFML/Audio/SoundStatus.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDSTATUS_H -#define SFML_SOUNDSTATUS_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -41,6 +40,3 @@ typedef enum sfPaused, ///< Sound / music is paused sfPlaying ///< Sound / music is playing } sfSoundStatus; - - -#endif // SFML_SOUNDSTATUS_H diff --git a/include/SFML/Audio/SoundStream.h b/include/SFML/Audio/SoundStream.h index 60523010..ae319436 100644 --- a/include/SFML/Audio/SoundStream.h +++ b/include/SFML/Audio/SoundStream.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDSTREAM_H -#define SFML_SOUNDSTREAM_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -348,6 +347,3 @@ CSFML_AUDIO_API bool sfSoundStream_isLooping(const sfSoundStream* soundStream); /// //////////////////////////////////////////////////////////// CSFML_AUDIO_API sfTime sfSoundStream_getPlayingOffset(const sfSoundStream* soundStream); - - -#endif // SFML_SOUNDSTREAM_H diff --git a/include/SFML/Audio/Types.h b/include/SFML/Audio/Types.h index 0435ee7f..9b8e6d72 100644 --- a/include/SFML/Audio/Types.h +++ b/include/SFML/Audio/Types.h @@ -22,9 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_AUDIO_TYPES_H -#define SFML_AUDIO_TYPES_H - +#pragma once typedef struct sfMusic sfMusic; typedef struct sfSound sfSound; @@ -32,6 +30,3 @@ typedef struct sfSoundBuffer sfSoundBuffer; typedef struct sfSoundBufferRecorder sfSoundBufferRecorder; typedef struct sfSoundRecorder sfSoundRecorder; typedef struct sfSoundStream sfSoundStream; - - -#endif // SFML_AUDIO_TYPES_H diff --git a/include/SFML/Config.h b/include/SFML/Config.h index 6ed9ca17..c5cbda77 100644 --- a/include/SFML/Config.h +++ b/include/SFML/Config.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONFIG_H -#define SFML_CONFIG_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -150,6 +149,3 @@ //////////////////////////////////////////////////////////// #include typedef uint32_t sfChar32; - - -#endif // SFML_CONFIG_H diff --git a/include/SFML/GPUPreference.h b/include/SFML/GPUPreference.h index 4f2aae94..e13a6e1f 100644 --- a/include/SFML/GPUPreference.h +++ b/include/SFML/GPUPreference.h @@ -22,9 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GPUPREFERENCE_H -#define SFML_GPUPREFERENCE_H - +#pragma once //////////////////////////////////////////////////////////// /// Headers @@ -69,6 +67,3 @@ #define SFML_DEFINE_DISCRETE_GPU_PREFERENCE #endif - - -#endif // SFML_GPUPREFERENCE_H diff --git a/include/SFML/Graphics.h b/include/SFML/Graphics.h index 9e59c346..fd8244bf 100644 --- a/include/SFML/Graphics.h +++ b/include/SFML/Graphics.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GRAPHICS_H -#define SFML_GRAPHICS_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -55,6 +54,3 @@ #include #include #include - - -#endif // SFML_GRAPHICS_H diff --git a/include/SFML/Graphics/BlendMode.h b/include/SFML/Graphics/BlendMode.h index 7b2e7eaa..0b0801b0 100644 --- a/include/SFML/Graphics/BlendMode.h +++ b/include/SFML/Graphics/BlendMode.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_BLENDMODE_H -#define SFML_BLENDMODE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -85,6 +84,3 @@ CSFML_GRAPHICS_API const sfBlendMode sfBlendMultiply; ///< Multiply source and d CSFML_GRAPHICS_API const sfBlendMode sfBlendMin; ///< Take minimum between source and dest CSFML_GRAPHICS_API const sfBlendMode sfBlendMax; ///< Take maximum between source and dest CSFML_GRAPHICS_API const sfBlendMode sfBlendNone; ///< Overwrite dest with source - - -#endif // SFML_BLENDMODE_H diff --git a/include/SFML/Graphics/CircleShape.h b/include/SFML/Graphics/CircleShape.h index 2153f1df..30279567 100644 --- a/include/SFML/Graphics/CircleShape.h +++ b/include/SFML/Graphics/CircleShape.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CIRCLESHAPE_H -#define SFML_CIRCLESHAPE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -427,6 +426,3 @@ CSFML_GRAPHICS_API sfFloatRect sfCircleShape_getLocalBounds(const sfCircleShape* /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfFloatRect sfCircleShape_getGlobalBounds(const sfCircleShape* shape); - - -#endif // SFML_CIRCLESHAPE_H diff --git a/include/SFML/Graphics/Color.h b/include/SFML/Graphics/Color.h index cde9a2bd..785b3f3c 100644 --- a/include/SFML/Graphics/Color.h +++ b/include/SFML/Graphics/Color.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_COLOR_H -#define SFML_COLOR_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -130,6 +129,3 @@ CSFML_GRAPHICS_API sfColor sfColor_subtract(sfColor color1, sfColor color2); /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfColor sfColor_modulate(sfColor color1, sfColor color2); - - -#endif // SFML_COLOR_H diff --git a/include/SFML/Graphics/ConvexShape.h b/include/SFML/Graphics/ConvexShape.h index 84ed1243..b6a03ba1 100644 --- a/include/SFML/Graphics/ConvexShape.h +++ b/include/SFML/Graphics/ConvexShape.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONVEXSHAPE_H -#define SFML_CONVEXSHAPE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -426,6 +425,3 @@ CSFML_GRAPHICS_API sfFloatRect sfConvexShape_getLocalBounds(const sfConvexShape* /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfFloatRect sfConvexShape_getGlobalBounds(const sfConvexShape* shape); - - -#endif // SFML_CONVEXSHAPE_H diff --git a/include/SFML/Graphics/Export.h b/include/SFML/Graphics/Export.h index f4145c19..956dc86f 100644 --- a/include/SFML/Graphics/Export.h +++ b/include/SFML/Graphics/Export.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GRAPHICS_EXPORT_H -#define SFML_GRAPHICS_EXPORT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define CSFML_GRAPHICS_API CSFML_API_IMPORT #endif - - -#endif // SFML_GRAPHICS_EXPORT_H diff --git a/include/SFML/Graphics/Font.h b/include/SFML/Graphics/Font.h index 2cb299d7..2bc1436e 100644 --- a/include/SFML/Graphics/Font.h +++ b/include/SFML/Graphics/Font.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_FONT_H -#define SFML_FONT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -235,6 +234,3 @@ CSFML_GRAPHICS_API bool sfFont_isSmooth(const sfFont* font); /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfFontInfo sfFont_getInfo(const sfFont* font); - - -#endif // SFML_FONT_H diff --git a/include/SFML/Graphics/FontInfo.h b/include/SFML/Graphics/FontInfo.h index ed3efc8d..d90c2721 100644 --- a/include/SFML/Graphics/FontInfo.h +++ b/include/SFML/Graphics/FontInfo.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_FONTINFO_H -#define SFML_FONTINFO_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -37,6 +36,3 @@ typedef struct { const char* family; } sfFontInfo; - - -#endif // SFML_FONTINFO_H diff --git a/include/SFML/Graphics/Glsl.h b/include/SFML/Graphics/Glsl.h index 6cea9628..eee3c322 100644 --- a/include/SFML/Graphics/Glsl.h +++ b/include/SFML/Graphics/Glsl.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GLSL_H -#define SFML_GLSL_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -95,6 +94,3 @@ typedef struct { float array[4 * 4]; } sfGlslMat4; - - -#endif // SFML_GLSL_H diff --git a/include/SFML/Graphics/Glyph.h b/include/SFML/Graphics/Glyph.h index 8426881f..f2e676ff 100644 --- a/include/SFML/Graphics/Glyph.h +++ b/include/SFML/Graphics/Glyph.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GLYPH_H -#define SFML_GLYPH_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -41,6 +40,3 @@ typedef struct sfFloatRect bounds; ///< Bounding rectangle of the glyph, in coordinates relative to the baseline sfIntRect textureRect; ///< Texture coordinates of the glyph inside the font's image } sfGlyph; - - -#endif // SFML_GLYPH_H diff --git a/include/SFML/Graphics/Image.h b/include/SFML/Graphics/Image.h index d78f392a..49ece6f0 100644 --- a/include/SFML/Graphics/Image.h +++ b/include/SFML/Graphics/Image.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_IMAGE_H -#define SFML_IMAGE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -293,6 +292,3 @@ CSFML_GRAPHICS_API void sfImage_flipHorizontally(sfImage* image); /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API void sfImage_flipVertically(sfImage* image); - - -#endif // SFML_IMAGE_H diff --git a/include/SFML/Graphics/PrimitiveType.h b/include/SFML/Graphics/PrimitiveType.h index 44e8ea1a..0d395232 100644 --- a/include/SFML/Graphics/PrimitiveType.h +++ b/include/SFML/Graphics/PrimitiveType.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_PRIMITIVETYPE_H -#define SFML_PRIMITIVETYPE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -53,6 +52,3 @@ typedef enum sfTrianglesStrip = sfTriangleStrip, ///< \deprecated Use sfTriangleStrip instead sfTrianglesFan = sfTriangleFan ///< \deprecated Use sfTriangleFan instead } sfPrimitiveType; - - -#endif // SFML_BLENDMODE_H diff --git a/include/SFML/Graphics/Rect.h b/include/SFML/Graphics/Rect.h index 8a84b1e4..e758dadb 100644 --- a/include/SFML/Graphics/Rect.h +++ b/include/SFML/Graphics/Rect.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RECT_H -#define SFML_RECT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -74,6 +73,3 @@ CSFML_GRAPHICS_API bool sfIntRect_contains(const sfIntRect* rect, int x, int y); //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API bool sfFloatRect_intersects(const sfFloatRect* rect1, const sfFloatRect* rect2, sfFloatRect* intersection); CSFML_GRAPHICS_API bool sfIntRect_intersects(const sfIntRect* rect1, const sfIntRect* rect2, sfIntRect* intersection); - - -#endif // SFML_RECT_H diff --git a/include/SFML/Graphics/RectangleShape.h b/include/SFML/Graphics/RectangleShape.h index 3ee8420f..6a18bdc5 100644 --- a/include/SFML/Graphics/RectangleShape.h +++ b/include/SFML/Graphics/RectangleShape.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RECTANGLESHAPE_H -#define SFML_RECTANGLESHAPE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -418,6 +417,3 @@ CSFML_GRAPHICS_API sfFloatRect sfRectangleShape_getLocalBounds(const sfRectangle /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfFloatRect sfRectangleShape_getGlobalBounds(const sfRectangleShape* shape); - - -#endif // SFML_RECTANGLESHAPE_H diff --git a/include/SFML/Graphics/RenderStates.h b/include/SFML/Graphics/RenderStates.h index 435f6aae..6465d317 100644 --- a/include/SFML/Graphics/RenderStates.h +++ b/include/SFML/Graphics/RenderStates.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERSTATES_H -#define SFML_RENDERSTATES_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -51,5 +50,3 @@ typedef struct /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfRenderStates sfRenderStates_default(void); - -#endif // SFML_RENDERSTATES_H diff --git a/include/SFML/Graphics/RenderTexture.h b/include/SFML/Graphics/RenderTexture.h index f29897dc..18802af5 100644 --- a/include/SFML/Graphics/RenderTexture.h +++ b/include/SFML/Graphics/RenderTexture.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERTEXTURE_H -#define SFML_RENDERTEXTURE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -366,6 +365,3 @@ CSFML_GRAPHICS_API bool sfRenderTexture_isRepeated(const sfRenderTexture* render /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API bool sfRenderTexture_generateMipmap(sfRenderTexture* renderTexture); - - -#endif // SFML_RENDERTEXTURE_H diff --git a/include/SFML/Graphics/RenderWindow.h b/include/SFML/Graphics/RenderWindow.h index be504420..1f34e471 100644 --- a/include/SFML/Graphics/RenderWindow.h +++ b/include/SFML/Graphics/RenderWindow.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERWINDOW_H -#define SFML_RENDERWINDOW_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -603,6 +602,3 @@ CSFML_GRAPHICS_API sfVector2i sfTouch_getPositionRenderWindow(unsigned int finge /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API bool sfRenderWindow_createVulkanSurface(sfRenderWindow* renderWindow, const VkInstance* instance, VkSurfaceKHR* surface, const VkAllocationCallbacks* allocator); - - -#endif // SFML_RENDERWINDOW_H diff --git a/include/SFML/Graphics/Shader.h b/include/SFML/Graphics/Shader.h index 11d9dda4..92758fb1 100644 --- a/include/SFML/Graphics/Shader.h +++ b/include/SFML/Graphics/Shader.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SHADER_H -#define SFML_SHADER_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -465,5 +464,3 @@ CSFML_GRAPHICS_API bool sfShader_isAvailable(void); /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API bool sfShader_isGeometryAvailable(void); - -#endif // SFML_SHADER_H diff --git a/include/SFML/Graphics/Shape.h b/include/SFML/Graphics/Shape.h index 2c4ba04a..41d4859f 100644 --- a/include/SFML/Graphics/Shape.h +++ b/include/SFML/Graphics/Shape.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SHAPE_H -#define SFML_SHAPE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -408,6 +407,3 @@ CSFML_GRAPHICS_API sfFloatRect sfShape_getGlobalBounds(const sfShape* shape); /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API void sfShape_update(sfShape* shape); - - -#endif // SFML_SHAPE_H diff --git a/include/SFML/Graphics/Sprite.h b/include/SFML/Graphics/Sprite.h index e8f11d38..aa053053 100644 --- a/include/SFML/Graphics/Sprite.h +++ b/include/SFML/Graphics/Sprite.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SPRITE_H -#define SFML_SPRITE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -330,6 +329,3 @@ CSFML_GRAPHICS_API sfFloatRect sfSprite_getLocalBounds(const sfSprite* sprite); /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfFloatRect sfSprite_getGlobalBounds(const sfSprite* sprite); - - -#endif // SFML_SPRITE_H diff --git a/include/SFML/Graphics/Text.h b/include/SFML/Graphics/Text.h index 1738b0ab..4a59678f 100644 --- a/include/SFML/Graphics/Text.h +++ b/include/SFML/Graphics/Text.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TEXT_H -#define SFML_TEXT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -551,6 +550,3 @@ CSFML_GRAPHICS_API sfFloatRect sfText_getLocalBounds(const sfText* text); /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfFloatRect sfText_getGlobalBounds(const sfText* text); - - -#endif // SFML_TEXT_H diff --git a/include/SFML/Graphics/Texture.h b/include/SFML/Graphics/Texture.h index 25b0f9ff..7e33a27c 100644 --- a/include/SFML/Graphics/Texture.h +++ b/include/SFML/Graphics/Texture.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TEXTURE_H -#define SFML_TEXTURE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -404,6 +403,3 @@ CSFML_GRAPHICS_API void sfTexture_bind(const sfTexture* texture, sfTextureCoordi /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API unsigned int sfTexture_getMaximumSize(void); - - -#endif // SFML_TEXTURE_H diff --git a/include/SFML/Graphics/Transform.h b/include/SFML/Graphics/Transform.h index a709459c..4f429c32 100644 --- a/include/SFML/Graphics/Transform.h +++ b/include/SFML/Graphics/Transform.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TRANSFORM_H -#define SFML_TRANSFORM_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -219,5 +218,3 @@ CSFML_GRAPHICS_API void sfTransform_scaleWithCenter(sfTransform* transform, floa /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API bool sfTransform_equal(sfTransform* left, sfTransform* right); - -#endif // SFML_TRANSFORM_H diff --git a/include/SFML/Graphics/Transformable.h b/include/SFML/Graphics/Transformable.h index 1fb70cbe..70c70044 100644 --- a/include/SFML/Graphics/Transformable.h +++ b/include/SFML/Graphics/Transformable.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TRANSFORMABLE_H -#define SFML_TRANSFORMABLE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -212,6 +211,3 @@ CSFML_GRAPHICS_API sfTransform sfTransformable_getTransform(const sfTransformabl /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfTransform sfTransformable_getInverseTransform(const sfTransformable* transformable); - - -#endif // SFML_TRANSFORMABLE_H diff --git a/include/SFML/Graphics/Types.h b/include/SFML/Graphics/Types.h index cda04fb5..c0e071ad 100644 --- a/include/SFML/Graphics/Types.h +++ b/include/SFML/Graphics/Types.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_GRAPHICS_TYPES_H -#define SFML_GRAPHICS_TYPES_H +#pragma once typedef struct sfCircleShape sfCircleShape; @@ -42,6 +41,3 @@ typedef struct sfTransformable sfTransformable; typedef struct sfVertexArray sfVertexArray; typedef struct sfVertexBuffer sfVertexBuffer; typedef struct sfView sfView; - - -#endif // SFML_GRAPHICS_TYPES_H diff --git a/include/SFML/Graphics/Vertex.h b/include/SFML/Graphics/Vertex.h index ff4447f1..f44ae736 100644 --- a/include/SFML/Graphics/Vertex.h +++ b/include/SFML/Graphics/Vertex.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VERTEX_H -#define SFML_VERTEX_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -42,6 +41,3 @@ typedef struct sfColor color; ///< Color of the vertex sfVector2f texCoords; ///< Coordinates of the texture's pixel to map to the vertex } sfVertex; - - -#endif // SFML_VERTEX_H diff --git a/include/SFML/Graphics/VertexArray.h b/include/SFML/Graphics/VertexArray.h index cd37e730..a9607114 100644 --- a/include/SFML/Graphics/VertexArray.h +++ b/include/SFML/Graphics/VertexArray.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VERTEXARRAY_H -#define SFML_VERTEXARRAY_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -163,6 +162,3 @@ CSFML_GRAPHICS_API sfPrimitiveType sfVertexArray_getPrimitiveType(sfVertexArray* /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API sfFloatRect sfVertexArray_getBounds(sfVertexArray* vertexArray); - - -#endif // SFML_VERTEXARRAY_H diff --git a/include/SFML/Graphics/VertexBuffer.h b/include/SFML/Graphics/VertexBuffer.h index 0dbeacb4..57560db2 100644 --- a/include/SFML/Graphics/VertexBuffer.h +++ b/include/SFML/Graphics/VertexBuffer.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VERTEXBUFFER_H -#define SFML_VERTEXBUFFER_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -249,6 +248,3 @@ CSFML_GRAPHICS_API void sfVertexBuffer_bind(const sfVertexBuffer* vertexBuffer); /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API bool sfVertexBuffer_isAvailable(void); - - -#endif // SFML_VERTEXBUFFER_H diff --git a/include/SFML/Graphics/View.h b/include/SFML/Graphics/View.h index 25bb4a5a..26dfced3 100644 --- a/include/SFML/Graphics/View.h +++ b/include/SFML/Graphics/View.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VIEW_H -#define SFML_VIEW_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -190,6 +189,3 @@ CSFML_GRAPHICS_API void sfView_rotate(sfView* view, float angle); /// //////////////////////////////////////////////////////////// CSFML_GRAPHICS_API void sfView_zoom(sfView* view, float factor); - - -#endif // SFML_VIEW_H diff --git a/include/SFML/Network.h b/include/SFML/Network.h index 7c741320..ecc4f247 100644 --- a/include/SFML/Network.h +++ b/include/SFML/Network.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_NETWORK_H -#define SFML_NETWORK_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -39,6 +38,3 @@ #include #include #include - - -#endif // SFML_NETWORK_H diff --git a/include/SFML/Network/Export.h b/include/SFML/Network/Export.h index 46d2b416..1d4fc701 100644 --- a/include/SFML/Network/Export.h +++ b/include/SFML/Network/Export.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_NETWORK_EXPORT_H -#define SFML_NETWORK_EXPORT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define CSFML_NETWORK_API CSFML_API_IMPORT #endif - - -#endif // SFML_NETWORK_EXPORT_H diff --git a/include/SFML/Network/Ftp.h b/include/SFML/Network/Ftp.h index 03fa7aa6..a043b8c5 100644 --- a/include/SFML/Network/Ftp.h +++ b/include/SFML/Network/Ftp.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_FTP_H -#define SFML_FTP_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -543,6 +542,3 @@ CSFML_NETWORK_API sfFtpResponse* sfFtp_upload(sfFtp* ftp, const char* localFile, /// //////////////////////////////////////////////////////////// CSFML_NETWORK_API sfFtpResponse* sfFtp_sendCommand(sfFtp* ftp, const char* command, const char* parameter); - - -#endif // SFML_FTP_H diff --git a/include/SFML/Network/Http.h b/include/SFML/Network/Http.h index c97a70ed..c8ba80e3 100644 --- a/include/SFML/Network/Http.h +++ b/include/SFML/Network/Http.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_HTTP_H -#define SFML_HTTP_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -299,6 +298,3 @@ CSFML_NETWORK_API void sfHttp_setHost(sfHttp* http, const char* host, unsigned s /// //////////////////////////////////////////////////////////// CSFML_NETWORK_API sfHttpResponse* sfHttp_sendRequest(sfHttp* http, const sfHttpRequest* request, sfTime timeout); - - -#endif // SFML_HTTP_H diff --git a/include/SFML/Network/IpAddress.h b/include/SFML/Network/IpAddress.h index 594dcce1..06ac6f54 100644 --- a/include/SFML/Network/IpAddress.h +++ b/include/SFML/Network/IpAddress.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_IPADDRESS_H -#define SFML_IPADDRESS_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -176,6 +175,3 @@ CSFML_NETWORK_API sfIpAddress sfIpAddress_getLocalAddress(void); /// //////////////////////////////////////////////////////////// CSFML_NETWORK_API sfIpAddress sfIpAddress_getPublicAddress(sfTime timeout); - - -#endif // SFML_IPADDRESS_H diff --git a/include/SFML/Network/Packet.h b/include/SFML/Network/Packet.h index 9927040e..557e021f 100644 --- a/include/SFML/Network/Packet.h +++ b/include/SFML/Network/Packet.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_PACKET_H -#define SFML_PACKET_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -184,6 +183,3 @@ CSFML_NETWORK_API void sfPacket_writeFloat(sfPacket* packet, float); CSFML_NETWORK_API void sfPacket_writeDouble(sfPacket* packet, double); CSFML_NETWORK_API void sfPacket_writeString(sfPacket* packet, const char* string); CSFML_NETWORK_API void sfPacket_writeWideString(sfPacket* packet, const wchar_t* string); - - -#endif // SFML_PACKET_H diff --git a/include/SFML/Network/SocketSelector.h b/include/SFML/Network/SocketSelector.h index f6ac0aec..8935d2ae 100644 --- a/include/SFML/Network/SocketSelector.h +++ b/include/SFML/Network/SocketSelector.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOCKETSELECTOR_H -#define SFML_SOCKETSELECTOR_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -136,6 +135,3 @@ CSFML_NETWORK_API bool sfSocketSelector_wait(sfSocketSelector* selector, sfTime CSFML_NETWORK_API bool sfSocketSelector_isTcpListenerReady(const sfSocketSelector* selector, sfTcpListener* socket); CSFML_NETWORK_API bool sfSocketSelector_isTcpSocketReady(const sfSocketSelector* selector, sfTcpSocket* socket); CSFML_NETWORK_API bool sfSocketSelector_isUdpSocketReady(const sfSocketSelector* selector, sfUdpSocket* socket); - - -#endif // SFML_SOCKETSELECTOR_H diff --git a/include/SFML/Network/SocketStatus.h b/include/SFML/Network/SocketStatus.h index 60976c9b..56648d65 100644 --- a/include/SFML/Network/SocketStatus.h +++ b/include/SFML/Network/SocketStatus.h @@ -22,9 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOCKETSTATUS_H -#define SFML_SOCKETSTATUS_H - +#pragma once //////////////////////////////////////////////////////////// /// \brief Define the status that can be returned by the socket functions @@ -39,6 +37,3 @@ typedef enum sfSocketError ///< An unexpected error happened } sfSocketStatus; - - -#endif // SFML_SOCKETSTATUS_H diff --git a/include/SFML/Network/TcpListener.h b/include/SFML/Network/TcpListener.h index b249cf01..7218b46c 100644 --- a/include/SFML/Network/TcpListener.h +++ b/include/SFML/Network/TcpListener.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TCPLISTENER_H -#define SFML_TCPLISTENER_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -127,6 +126,3 @@ CSFML_NETWORK_API sfSocketStatus sfTcpListener_listen(sfTcpListener* listener, u /// //////////////////////////////////////////////////////////// CSFML_NETWORK_API sfSocketStatus sfTcpListener_accept(sfTcpListener* listener, sfTcpSocket** connected); - - -#endif // SFML_TCPLISTENER_H diff --git a/include/SFML/Network/TcpSocket.h b/include/SFML/Network/TcpSocket.h index 53021192..e6ae3e4e 100644 --- a/include/SFML/Network/TcpSocket.h +++ b/include/SFML/Network/TcpSocket.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TCPSOCKET_H -#define SFML_TCPSOCKET_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -227,6 +226,3 @@ CSFML_NETWORK_API sfSocketStatus sfTcpSocket_sendPacket(sfTcpSocket* socket, sfP /// //////////////////////////////////////////////////////////// CSFML_NETWORK_API sfSocketStatus sfTcpSocket_receivePacket(sfTcpSocket* socket, sfPacket* packet); - - -#endif // SFML_TCPSOCKET_H diff --git a/include/SFML/Network/Types.h b/include/SFML/Network/Types.h index 16e48a82..0ae7bf39 100644 --- a/include/SFML/Network/Types.h +++ b/include/SFML/Network/Types.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_NETWORK_TYPES_H -#define SFML_NETWORK_TYPES_H +#pragma once typedef struct sfFtpDirectoryResponse sfFtpDirectoryResponse; @@ -38,6 +37,3 @@ typedef struct sfSocketSelector sfSocketSelector; typedef struct sfTcpListener sfTcpListener; typedef struct sfTcpSocket sfTcpSocket; typedef struct sfUdpSocket sfUdpSocket; - - -#endif // SFML_NETWORK_TYPES_H diff --git a/include/SFML/Network/UdpSocket.h b/include/SFML/Network/UdpSocket.h index 191546e1..77ad9867 100644 --- a/include/SFML/Network/UdpSocket.h +++ b/include/SFML/Network/UdpSocket.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_UDPSOCKET_H -#define SFML_UDPSOCKET_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -204,6 +203,3 @@ CSFML_NETWORK_API sfSocketStatus sfUdpSocket_receivePacket(sfUdpSocket* socket, /// //////////////////////////////////////////////////////////// CSFML_NETWORK_API unsigned int sfUdpSocket_maxDatagramSize(void); - - -#endif // SFML_UDPSOCKET_H diff --git a/include/SFML/OpenGL.h b/include/SFML/OpenGL.h index 875b3852..4763c55d 100644 --- a/include/SFML/OpenGL.h +++ b/include/SFML/OpenGL.h @@ -22,9 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_OPENGL_H -#define SFML_OPENGL_H - +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -53,6 +51,3 @@ #include #endif - - -#endif // SFML_OPENGL_H diff --git a/include/SFML/System.h b/include/SFML/System.h index 6faf790d..d2b07765 100644 --- a/include/SFML/System.h +++ b/include/SFML/System.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SYSTEM_H -#define SFML_SYSTEM_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -37,6 +36,3 @@ #include #include #include - - -#endif // SFML_SYSTEM_H diff --git a/include/SFML/System/Alloc.h b/include/SFML/System/Alloc.h index fabaf384..b243a2f5 100644 --- a/include/SFML/System/Alloc.h +++ b/include/SFML/System/Alloc.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_ALLOC_H -#define SFML_ALLOC_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -44,6 +43,3 @@ /// //////////////////////////////////////////////////////////// CSFML_SYSTEM_API void sfFree(void* ptr); - - -#endif // SFML_ALLOC_H diff --git a/include/SFML/System/Buffer.h b/include/SFML/System/Buffer.h index 8b8d0de4..05fa0edd 100644 --- a/include/SFML/System/Buffer.h +++ b/include/SFML/System/Buffer.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_BUFFER_H -#define SFML_BUFFER_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -68,6 +67,3 @@ CSFML_SYSTEM_API size_t sfBuffer_getSize(const sfBuffer* buffer); /// //////////////////////////////////////////////////////////// CSFML_SYSTEM_API const uint8_t* sfBuffer_getData(const sfBuffer* buffer); - - -#endif // SFML_BUFFER_H diff --git a/include/SFML/System/Clock.h b/include/SFML/System/Clock.h index 091b2645..dded742b 100644 --- a/include/SFML/System/Clock.h +++ b/include/SFML/System/Clock.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLOCK_H -#define SFML_CLOCK_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -85,6 +84,3 @@ CSFML_SYSTEM_API sfTime sfClock_getElapsedTime(const sfClock* clock); /// //////////////////////////////////////////////////////////// CSFML_SYSTEM_API sfTime sfClock_restart(sfClock* clock); - - -#endif // SFML_CLOCK_H diff --git a/include/SFML/System/Export.h b/include/SFML/System/Export.h index 8d81d357..0a8f1a6a 100644 --- a/include/SFML/System/Export.h +++ b/include/SFML/System/Export.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SYSTEM_EXPORT_H -#define SFML_SYSTEM_EXPORT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define CSFML_SYSTEM_API CSFML_API_IMPORT #endif - - -#endif // SFML_SYSTEM_EXPORT_H diff --git a/include/SFML/System/InputStream.h b/include/SFML/System/InputStream.h index 2ddfbc59..5e7b7b76 100644 --- a/include/SFML/System/InputStream.h +++ b/include/SFML/System/InputStream.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INPUTSTREAM_H -#define SFML_INPUTSTREAM_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -50,6 +49,3 @@ typedef struct sfInputStream sfInputStreamGetSizeFunc getSize; ///< Function to get the total number of bytes in the stream void* userData; ///< User data that will be passed to the callbacks } sfInputStream; - - -#endif // SFML_INPUTSTREAM_H diff --git a/include/SFML/System/Sleep.h b/include/SFML/System/Sleep.h index 3509e379..ef9b193e 100644 --- a/include/SFML/System/Sleep.h +++ b/include/SFML/System/Sleep.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SLEEP_H -#define SFML_SLEEP_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -42,6 +41,3 @@ /// //////////////////////////////////////////////////////////// CSFML_SYSTEM_API void sfSleep(sfTime duration); - - -#endif // SFML_SLEEP_H diff --git a/include/SFML/System/Time.h b/include/SFML/System/Time.h index 3f16a2bf..83df4aa2 100644 --- a/include/SFML/System/Time.h +++ b/include/SFML/System/Time.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TIME_H -#define SFML_TIME_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -105,6 +104,3 @@ CSFML_SYSTEM_API sfTime sfMilliseconds(int32_t amount); /// //////////////////////////////////////////////////////////// CSFML_SYSTEM_API sfTime sfMicroseconds(int64_t amount); - - -#endif // SFML_TIME_H diff --git a/include/SFML/System/Types.h b/include/SFML/System/Types.h index a41a9ab5..0848d198 100644 --- a/include/SFML/System/Types.h +++ b/include/SFML/System/Types.h @@ -22,14 +22,10 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SYSTEM_TYPES_H -#define SFML_SYSTEM_TYPES_H +#pragma once typedef struct sfBuffer sfBuffer; typedef struct sfClock sfClock; typedef struct sfMutex sfMutex; typedef struct sfThread sfThread; - - -#endif // SFML_SYSTEM_TYPES_H diff --git a/include/SFML/System/Vector2.h b/include/SFML/System/Vector2.h index 45b1dbbe..864ded32 100644 --- a/include/SFML/System/Vector2.h +++ b/include/SFML/System/Vector2.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VECTOR2_H -#define SFML_VECTOR2_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -62,6 +61,3 @@ typedef struct float x; float y; } sfVector2f; - - -#endif // SFML_VECTOR2_H diff --git a/include/SFML/System/Vector3.h b/include/SFML/System/Vector3.h index 45da73ff..92f0bdff 100644 --- a/include/SFML/System/Vector3.h +++ b/include/SFML/System/Vector3.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VECTOR3_H -#define SFML_VECTOR3_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -41,6 +40,3 @@ typedef struct float y; float z; } sfVector3f; - - -#endif // SFML_VECTOR3_H diff --git a/include/SFML/Window.h b/include/SFML/Window.h index 5ae3bcfe..b7fa07ad 100644 --- a/include/SFML/Window.h +++ b/include/SFML/Window.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SFML_WINDOW_H -#define SFML_SFML_WINDOW_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -42,6 +41,3 @@ #include #include #include - - -#endif // SFML_SFML_WINDOW_H diff --git a/include/SFML/Window/Clipboard.h b/include/SFML/Window/Clipboard.h index b5fa3753..d02c157c 100644 --- a/include/SFML/Window/Clipboard.h +++ b/include/SFML/Window/Clipboard.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLIPBOARD_H -#define SFML_CLIPBOARD_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -80,5 +79,3 @@ CSFML_WINDOW_API void sfClipboard_setString(const char* text); /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API void sfClipboard_setUnicodeString(const sfChar32* text); - -#endif // SFML_CLIPBOARD_H diff --git a/include/SFML/Window/Context.h b/include/SFML/Window/Context.h index 434be34c..fe45cd50 100644 --- a/include/SFML/Window/Context.h +++ b/include/SFML/Window/Context.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONTEXT_H -#define SFML_CONTEXT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -107,5 +106,3 @@ CSFML_WINDOW_API sfContextSettings sfContext_getSettings(const sfContext* contex /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API uint64_t sfContext_getActiveContextId(void); - -#endif // SFML_CONTEXT_H diff --git a/include/SFML/Window/Cursor.h b/include/SFML/Window/Cursor.h index 5cae91a9..accd335a 100644 --- a/include/SFML/Window/Cursor.h +++ b/include/SFML/Window/Cursor.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSOR_H -#define SFML_CURSOR_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -142,6 +141,3 @@ CSFML_WINDOW_API sfCursor* sfCursor_createFromSystem(sfCursorType type); /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API void sfCursor_destroy(sfCursor* cursor); - - -#endif // SFML_CURSOR_H diff --git a/include/SFML/Window/Event.h b/include/SFML/Window/Event.h index 4b6bf844..6707832d 100644 --- a/include/SFML/Window/Event.h +++ b/include/SFML/Window/Event.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_EVENT_H -#define SFML_EVENT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -217,6 +216,3 @@ typedef union sfTouchEvent touch; ///< Touch events parameters sfSensorEvent sensor; ///< Sensor event parameters } sfEvent; - - -#endif // SFML_EVENT_H diff --git a/include/SFML/Window/Export.h b/include/SFML/Window/Export.h index 0f128fb8..8dd46568 100644 --- a/include/SFML/Window/Export.h +++ b/include/SFML/Window/Export.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOW_EXPORT_H -#define SFML_WINDOW_EXPORT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ #define CSFML_WINDOW_API CSFML_API_IMPORT #endif - - -#endif // SFML_WINDOW_EXPORT_H diff --git a/include/SFML/Window/Joystick.h b/include/SFML/Window/Joystick.h index 55e1d257..922ac3c9 100644 --- a/include/SFML/Window/Joystick.h +++ b/include/SFML/Window/Joystick.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICK_H -#define SFML_JOYSTICK_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -145,6 +144,3 @@ CSFML_WINDOW_API sfJoystickIdentification sfJoystick_getIdentification(unsigned /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API void sfJoystick_update(void); - - -#endif // SFML_JOYSTICK_H diff --git a/include/SFML/Window/JoystickIdentification.h b/include/SFML/Window/JoystickIdentification.h index 11d436b8..109b42b2 100644 --- a/include/SFML/Window/JoystickIdentification.h +++ b/include/SFML/Window/JoystickIdentification.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_JOYSTICKIDENDIFICATION_H -#define SFML_JOYSTICKIDENDIFICATION_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -40,6 +39,3 @@ typedef struct unsigned int vendorId; unsigned int productId; } sfJoystickIdentification; - - -#endif // SFML_JOYSTICKIDENDIFICATION_H diff --git a/include/SFML/Window/Keyboard.h b/include/SFML/Window/Keyboard.h index 5ca046c2..42b93cbb 100644 --- a/include/SFML/Window/Keyboard.h +++ b/include/SFML/Window/Keyboard.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_KEYBOARD_H -#define SFML_KEYBOARD_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -419,5 +418,3 @@ CSFML_WINDOW_API const char* sfKeyboard_getDescription(sfScancode code); /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API void sfKeyboard_setVirtualKeyboardVisible(bool visible); - -#endif // SFML_KEYBOARD_H diff --git a/include/SFML/Window/Mouse.h b/include/SFML/Window/Mouse.h index c133cb9e..246d68fc 100644 --- a/include/SFML/Window/Mouse.h +++ b/include/SFML/Window/Mouse.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_MOUSE_H -#define SFML_MOUSE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -118,6 +117,3 @@ CSFML_WINDOW_API sfVector2i sfMouse_getPositionWindowBase(const sfWindowBase* re /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API void sfMouse_setPositionWindowBase(sfVector2i position, const sfWindowBase* relativeTo); - - -#endif // SFML_MOUSE_H diff --git a/include/SFML/Window/Sensor.h b/include/SFML/Window/Sensor.h index 9372b4d5..cba8a2ef 100644 --- a/include/SFML/Window/Sensor.h +++ b/include/SFML/Window/Sensor.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SENSOR_H -#define SFML_SENSOR_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -84,6 +83,3 @@ CSFML_WINDOW_API void sfSensor_setEnabled(sfSensorType sensor, bool enabled); /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API sfVector3f sfSensor_getValue(sfSensorType sensor); - - -#endif // SFML_SENSOR_H diff --git a/include/SFML/Window/Touch.h b/include/SFML/Window/Touch.h index 35635902..d740390b 100644 --- a/include/SFML/Window/Touch.h +++ b/include/SFML/Window/Touch.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TOUCH_H -#define SFML_TOUCH_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -70,6 +69,3 @@ CSFML_WINDOW_API sfVector2i sfTouch_getPosition(unsigned int finger, const sfWin /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API sfVector2i sfTouch_getPositionWindowBase(unsigned int finger, const sfWindowBase* relativeTo); - - -#endif // SFML_TOUCH_H diff --git a/include/SFML/Window/Types.h b/include/SFML/Window/Types.h index f061ca95..0a567da7 100644 --- a/include/SFML/Window/Types.h +++ b/include/SFML/Window/Types.h @@ -22,14 +22,10 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOW_TYPES_H -#define SFML_WINDOW_TYPES_H +#pragma once typedef struct sfContext sfContext; typedef struct sfCursor sfCursor; typedef struct sfWindow sfWindow; typedef struct sfWindowBase sfWindowBase; - - -#endif // SFML_WINDOW_TYPES_H diff --git a/include/SFML/Window/VideoMode.h b/include/SFML/Window/VideoMode.h index e9d14b7a..40a5a033 100644 --- a/include/SFML/Window/VideoMode.h +++ b/include/SFML/Window/VideoMode.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VIDEOMODE_H -#define SFML_VIDEOMODE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -85,6 +84,3 @@ CSFML_WINDOW_API const sfVideoMode* sfVideoMode_getFullscreenModes(size_t* count /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API bool sfVideoMode_isValid(sfVideoMode mode); - - -#endif // SFML_VIDEOMODE_H diff --git a/include/SFML/Window/Window.h b/include/SFML/Window/Window.h index 6e40e2e7..d2ae8a14 100644 --- a/include/SFML/Window/Window.h +++ b/include/SFML/Window/Window.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOW_H -#define SFML_WINDOW_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -488,6 +487,3 @@ CSFML_WINDOW_API sfWindowHandle sfWindow_getNativeHandle(const sfWindow* window) /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API bool sfWindow_createVulkanSurface(sfWindow* window, const VkInstance* instance, VkSurfaceKHR* surface, const VkAllocationCallbacks* allocator); - - -#endif // SFML_WINDOW_H diff --git a/include/SFML/Window/WindowBase.h b/include/SFML/Window/WindowBase.h index f090ed79..59b2667b 100644 --- a/include/SFML/Window/WindowBase.h +++ b/include/SFML/Window/WindowBase.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWBASE_H -#define SFML_WINDOWBASE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -391,5 +390,3 @@ CSFML_WINDOW_API sfWindowHandle sfWindowBase_getNativeHandle(const sfWindowBase* /// //////////////////////////////////////////////////////////// CSFML_WINDOW_API bool sfWindowBase_createVulkanSurface(sfWindowBase* windowBase, const VkInstance* instance, VkSurfaceKHR* surface, const VkAllocationCallbacks* allocator); - -#endif // SFML_WINDOWBASE_H diff --git a/include/SFML/Window/WindowHandle.h b/include/SFML/Window/WindowHandle.h index 65399085..b33c6fb7 100644 --- a/include/SFML/Window/WindowHandle.h +++ b/include/SFML/Window/WindowHandle.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWHANDLE_H -#define SFML_WINDOWHANDLE_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -52,6 +51,3 @@ typedef void* sfWindowHandle; #endif - - -#endif // SFML_WINDOWHANDLE_H diff --git a/src/SFML/Audio/MusicStruct.h b/src/SFML/Audio/MusicStruct.h index 6c97cd44..5e08e73b 100644 --- a/src/SFML/Audio/MusicStruct.h +++ b/src/SFML/Audio/MusicStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_MUSICSTRUCT_H -#define SFML_MUSICSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -40,6 +39,3 @@ struct sfMusic CallbackStream Stream; sf::Music This; }; - - -#endif // SFML_MUSICSTRUCT_H diff --git a/src/SFML/Audio/SoundBufferRecorderStruct.h b/src/SFML/Audio/SoundBufferRecorderStruct.h index a131325e..c763964a 100644 --- a/src/SFML/Audio/SoundBufferRecorderStruct.h +++ b/src/SFML/Audio/SoundBufferRecorderStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDBUFFERRECORDERSTRUCT_H -#define SFML_SOUNDBUFFERRECORDERSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -41,6 +40,3 @@ struct sfSoundBufferRecorder mutable sfSoundBuffer SoundBuffer; std::string DeviceName; }; - - -#endif // SFML_SOUNDBUFFERRECORDERSTRUCT_H diff --git a/src/SFML/Audio/SoundBufferStruct.h b/src/SFML/Audio/SoundBufferStruct.h index 5195124d..5a9d863b 100644 --- a/src/SFML/Audio/SoundBufferStruct.h +++ b/src/SFML/Audio/SoundBufferStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDBUFFERSTRUCT_H -#define SFML_SOUNDBUFFERSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfSoundBuffer { sf::SoundBuffer This; }; - - -#endif // SFML_SOUNDBUFFERSTRUCT_H diff --git a/src/SFML/Audio/SoundRecorderStruct.h b/src/SFML/Audio/SoundRecorderStruct.h index 137dc937..4bd87f8c 100644 --- a/src/SFML/Audio/SoundRecorderStruct.h +++ b/src/SFML/Audio/SoundRecorderStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDRECORDERSTRUCT_H -#define SFML_SOUNDRECORDERSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -98,6 +97,3 @@ struct sfSoundRecorder sfSoundRecorderImpl This; std::string DeviceName; }; - - -#endif // SFML_SOUNDRECORDERSTRUCT_H diff --git a/src/SFML/Audio/SoundStreamStruct.h b/src/SFML/Audio/SoundStreamStruct.h index a3beb991..c8fb3151 100644 --- a/src/SFML/Audio/SoundStreamStruct.h +++ b/src/SFML/Audio/SoundStreamStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDSTREAMSTRUCT_H -#define SFML_SOUNDSTREAMSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -103,6 +102,3 @@ struct sfSoundStream sfSoundStreamImpl This; }; - - -#endif // SFML_SOUNDSTREAMSTRUCT_H diff --git a/src/SFML/Audio/SoundStruct.h b/src/SFML/Audio/SoundStruct.h index aabbec7b..26acff1d 100644 --- a/src/SFML/Audio/SoundStruct.h +++ b/src/SFML/Audio/SoundStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOUNDSTRUCT_H -#define SFML_SOUNDSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -40,6 +39,3 @@ struct sfSound sf::Sound This; const sfSoundBuffer* Buffer; }; - - -#endif // SFML_SOUNDSTRUCT_H diff --git a/src/SFML/CallbackStream.h b/src/SFML/CallbackStream.h index e4e8f80a..4b0331ab 100644 --- a/src/SFML/CallbackStream.h +++ b/src/SFML/CallbackStream.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CALLBACKSTREAM_H -#define SFML_CALLBACKSTREAM_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -141,6 +140,3 @@ class CallbackStream : public sf::InputStream //////////////////////////////////////////////////////////// sfInputStream myStream; ///< The source CSFML input stream }; - - -#endif // SFML_CALLBACKSTREAM_H diff --git a/src/SFML/Char32.hpp b/src/SFML/Char32.hpp index 09fab98b..b52805ac 100644 --- a/src/SFML/Char32.hpp +++ b/src/SFML/Char32.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CHAR32_HPP -#define SFML_CHAR32_HPP +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -45,5 +44,3 @@ inline sfChar32* copyToChar32(const sf::String& str) return utf32; } - -#endif // SFML_CHAR32_HPP diff --git a/src/SFML/ConvertEvent.h b/src/SFML/ConvertEvent.h index 9874ee21..c9e7f64c 100644 --- a/src/SFML/ConvertEvent.h +++ b/src/SFML/ConvertEvent.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONVERTEVENT_H -#define SFML_CONVERTEVENT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -175,5 +174,3 @@ inline void convertEvent(const sf::Event& sfmlEvent, sfEvent* event) event->sensor.z = sensorChanged->value.z; } } - -#endif // SFML_CONVERTEVENT_H diff --git a/src/SFML/Graphics/CircleShapeStruct.h b/src/SFML/Graphics/CircleShapeStruct.h index 587ca890..08bafac5 100644 --- a/src/SFML/Graphics/CircleShapeStruct.h +++ b/src/SFML/Graphics/CircleShapeStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CIRCLESHAPESTRUCT_H -#define SFML_CIRCLESHAPESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ struct sfCircleShape mutable sfTransform Transform; mutable sfTransform InverseTransform; }; - - -#endif // SFML_CIRCLESHAPESTRUCT_H diff --git a/src/SFML/Graphics/ConvertRenderStates.hpp b/src/SFML/Graphics/ConvertRenderStates.hpp index c1535adb..f733f6db 100644 --- a/src/SFML/Graphics/ConvertRenderStates.hpp +++ b/src/SFML/Graphics/ConvertRenderStates.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONVERTRENDERSTATES_H -#define SFML_CONVERTRENDERSTATES_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -57,6 +56,3 @@ inline sf::RenderStates convertRenderStates(const sfRenderStates* states) return sfmlStates; } - - -#endif // SFML_CONVERTRENDERSTATES_H diff --git a/src/SFML/Graphics/ConvertTransform.hpp b/src/SFML/Graphics/ConvertTransform.hpp index fe6c4e2b..0b79026a 100644 --- a/src/SFML/Graphics/ConvertTransform.hpp +++ b/src/SFML/Graphics/ConvertTransform.hpp @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONVERTTRANSFORM_H -#define SFML_CONVERTTRANSFORM_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -53,6 +52,3 @@ inline sf::Transform convertTransform(const sfTransform& transform) m[3], m[4], m[5], m[6], m[7], m[8]); } - - -#endif // SFML_CONVERTTRANSFORM_H diff --git a/src/SFML/Graphics/ConvexShapeStruct.h b/src/SFML/Graphics/ConvexShapeStruct.h index 585a2f55..964d3982 100644 --- a/src/SFML/Graphics/ConvexShapeStruct.h +++ b/src/SFML/Graphics/ConvexShapeStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONVEXSHAPESTRUCT_H -#define SFML_CONVEXSHAPESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ struct sfConvexShape mutable sfTransform Transform; mutable sfTransform InverseTransform; }; - - -#endif // SFML_CONVEXSHAPESTRUCT_H diff --git a/src/SFML/Graphics/FontStruct.h b/src/SFML/Graphics/FontStruct.h index 1689756e..7a7543ba 100644 --- a/src/SFML/Graphics/FontStruct.h +++ b/src/SFML/Graphics/FontStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_FONTSTRUCT_H -#define SFML_FONTSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ struct sfFont std::map Textures; CallbackStream Stream; }; - - -#endif // SFML_FONTSTRUCT_H diff --git a/src/SFML/Graphics/ImageStruct.h b/src/SFML/Graphics/ImageStruct.h index a836dbcc..4aec0346 100644 --- a/src/SFML/Graphics/ImageStruct.h +++ b/src/SFML/Graphics/ImageStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_IMAGESTRUCT_H -#define SFML_IMAGESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfImage { sf::Image This; }; - - -#endif // SFML_IMAGESTRUCT_H diff --git a/src/SFML/Graphics/RectangleShapeStruct.h b/src/SFML/Graphics/RectangleShapeStruct.h index daae8b15..e2bc97c2 100644 --- a/src/SFML/Graphics/RectangleShapeStruct.h +++ b/src/SFML/Graphics/RectangleShapeStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RECTANGLESHAPESTRUCT_H -#define SFML_RECTANGLESHAPESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ struct sfRectangleShape mutable sfTransform Transform; mutable sfTransform InverseTransform; }; - - -#endif // SFML_RECTANGLESHAPESTRUCT_H diff --git a/src/SFML/Graphics/RenderTextureStruct.h b/src/SFML/Graphics/RenderTextureStruct.h index 46553c2d..81e30a1d 100644 --- a/src/SFML/Graphics/RenderTextureStruct.h +++ b/src/SFML/Graphics/RenderTextureStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERTEXTURESTRUCT_H -#define SFML_RENDERTEXTURESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ struct sfRenderTexture sfView DefaultView; sfView CurrentView; }; - - -#endif // SFML_RENDERTEXTURESTRUCT_H diff --git a/src/SFML/Graphics/RenderWindowStruct.h b/src/SFML/Graphics/RenderWindowStruct.h index 1a98fa3d..8403d898 100644 --- a/src/SFML/Graphics/RenderWindowStruct.h +++ b/src/SFML/Graphics/RenderWindowStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_RENDERWINDOWSTRUCT_H -#define SFML_RENDERWINDOWSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -41,6 +40,3 @@ struct sfRenderWindow sfView DefaultView; sfView CurrentView; }; - - -#endif // SFML_RENDERWINDOWSTRUCT_H diff --git a/src/SFML/Graphics/ShaderStruct.h b/src/SFML/Graphics/ShaderStruct.h index d19c751d..9e872bc9 100644 --- a/src/SFML/Graphics/ShaderStruct.h +++ b/src/SFML/Graphics/ShaderStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SHADERSTRUCT_H -#define SFML_SHADERSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfShader { sf::Shader This; }; - - -#endif // SFML_SHADERSTRUCT_H diff --git a/src/SFML/Graphics/ShapeStruct.h b/src/SFML/Graphics/ShapeStruct.h index 9b764fc8..75737f15 100644 --- a/src/SFML/Graphics/ShapeStruct.h +++ b/src/SFML/Graphics/ShapeStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SHAPESTRUCT_H -#define SFML_SHAPESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -89,6 +88,3 @@ struct sfShape mutable sfTransform Transform; mutable sfTransform InverseTransform; }; - - -#endif // SFML_SHAPESTRUCT_H diff --git a/src/SFML/Graphics/SpriteStruct.h b/src/SFML/Graphics/SpriteStruct.h index ee4a4752..a53fe746 100644 --- a/src/SFML/Graphics/SpriteStruct.h +++ b/src/SFML/Graphics/SpriteStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SPRITESTRUCT_H -#define SFML_SPRITESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -43,6 +42,3 @@ struct sfSprite mutable sfTransform Transform; mutable sfTransform InverseTransform; }; - - -#endif // SFML_SPRITESTRUCT_H diff --git a/src/SFML/Graphics/TextStruct.h b/src/SFML/Graphics/TextStruct.h index 8c96cced..694aa679 100644 --- a/src/SFML/Graphics/TextStruct.h +++ b/src/SFML/Graphics/TextStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TEXTSTRUCT_H -#define SFML_TEXTSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -46,6 +45,3 @@ struct sfText mutable sfTransform Transform; mutable sfTransform InverseTransform; }; - - -#endif // SFML_TEXTSTRUCT_H diff --git a/src/SFML/Graphics/TextureStruct.h b/src/SFML/Graphics/TextureStruct.h index 491a0213..b07819dd 100644 --- a/src/SFML/Graphics/TextureStruct.h +++ b/src/SFML/Graphics/TextureStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TEXTURESTRUCT_H -#define SFML_TEXTURESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -63,6 +62,3 @@ struct sfTexture sf::Texture* This; bool OwnInstance; }; - - -#endif // SFML_TEXTURESTRUCT_H diff --git a/src/SFML/Graphics/TransformableStruct.h b/src/SFML/Graphics/TransformableStruct.h index 93300e6b..0b6cdfa4 100644 --- a/src/SFML/Graphics/TransformableStruct.h +++ b/src/SFML/Graphics/TransformableStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TRANSFORMABLESTRUCT_H -#define SFML_TRANSFORMABLESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -41,6 +40,3 @@ struct sfTransformable mutable sfTransform Transform; mutable sfTransform InverseTransform; }; - - -#endif // SFML_TRANSFORMABLESTRUCT_H diff --git a/src/SFML/Graphics/VertexArrayStruct.h b/src/SFML/Graphics/VertexArrayStruct.h index d8152ce6..53802ee9 100644 --- a/src/SFML/Graphics/VertexArrayStruct.h +++ b/src/SFML/Graphics/VertexArrayStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VERTEXARRAYSTRUCT_H -#define SFML_VERTEXARRAYSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfVertexArray { sf::VertexArray This; }; - - -#endif // SFML_VERTEXARRAYSTRUCT_H diff --git a/src/SFML/Graphics/VertexBufferStruct.h b/src/SFML/Graphics/VertexBufferStruct.h index e35b8aec..ae14c04d 100644 --- a/src/SFML/Graphics/VertexBufferStruct.h +++ b/src/SFML/Graphics/VertexBufferStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VERTEXBUFFERSTRUCT_H -#define SFML_VERTEXBUFFERSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfVertexBuffer { sf::VertexBuffer This; }; - - -#endif // SFML_VERTEXBUFFERSTRUCT_H diff --git a/src/SFML/Graphics/ViewStruct.h b/src/SFML/Graphics/ViewStruct.h index b2e4a6b2..caa4c050 100644 --- a/src/SFML/Graphics/ViewStruct.h +++ b/src/SFML/Graphics/ViewStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_VIEWSTRUCT_H -#define SFML_VIEWSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfView { sf::View This; }; - - -#endif // SFML_VIEWSTRUCT_H diff --git a/src/SFML/Internal.h b/src/SFML/Internal.h index 4e927ada..ffa60cab 100644 --- a/src/SFML/Internal.h +++ b/src/SFML/Internal.h @@ -22,9 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_INTERNAL_H -#define SFML_INTERNAL_H - +#pragma once //////////////////////////////////////////////////////////// // Define macros to check the validity of CSFML objects in debug run @@ -141,5 +139,3 @@ //////////////////////////////////////////////////////////// static_assert(sizeof(sfChar32) == sizeof(char32_t)); static_assert(alignof(sfChar32) == alignof(char32_t)); - -#endif // SFML_INTERNAL_H diff --git a/src/SFML/Network/FtpStruct.h b/src/SFML/Network/FtpStruct.h index a346b6b0..49023150 100644 --- a/src/SFML/Network/FtpStruct.h +++ b/src/SFML/Network/FtpStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_FTPSTRUCT_H -#define SFML_FTPSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -88,6 +87,3 @@ struct sfFtpListingResponse sf::Ftp::ListingResponse This; std::vector Filenames; }; - - -#endif // SFML_FTPSTRUCT_H diff --git a/src/SFML/Network/HttpStruct.h b/src/SFML/Network/HttpStruct.h index d4964d16..478098a9 100644 --- a/src/SFML/Network/HttpStruct.h +++ b/src/SFML/Network/HttpStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_HTTPSTRUCT_H -#define SFML_HTTPSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -56,6 +55,3 @@ struct sfHttpResponse { sf::Http::Response This; }; - - -#endif // SFML_HTTPSTRUCT_H diff --git a/src/SFML/Network/PacketStruct.h b/src/SFML/Network/PacketStruct.h index 598eebb2..b4b909c8 100644 --- a/src/SFML/Network/PacketStruct.h +++ b/src/SFML/Network/PacketStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_PACKETSTRUCT_H -#define SFML_PACKETSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfPacket { sf::Packet This; }; - - -#endif // SFML_PACKETSTRUCT_H diff --git a/src/SFML/Network/SocketSelectorStruct.h b/src/SFML/Network/SocketSelectorStruct.h index c4e8eb02..fd5dcb99 100644 --- a/src/SFML/Network/SocketSelectorStruct.h +++ b/src/SFML/Network/SocketSelectorStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_SOCKETSELECTORSTRUCT_H -#define SFML_SOCKETSELECTORSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfSocketSelector { sf::SocketSelector This; }; - - -#endif // SFML_SOCKETSELECTORSTRUCT_H diff --git a/src/SFML/Network/TcpListenerStruct.h b/src/SFML/Network/TcpListenerStruct.h index 1209fb00..6024fa74 100644 --- a/src/SFML/Network/TcpListenerStruct.h +++ b/src/SFML/Network/TcpListenerStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TCPLISTENERSTRUCT_H -#define SFML_TCPLISTENERSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfTcpListener { sf::TcpListener This; }; - - -#endif // SFML_TCPLISTENERSTRUCT_H diff --git a/src/SFML/Network/TcpSocketStruct.h b/src/SFML/Network/TcpSocketStruct.h index ad065c9f..69ec87a0 100644 --- a/src/SFML/Network/TcpSocketStruct.h +++ b/src/SFML/Network/TcpSocketStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_TCPSOCKETSTRUCT_H -#define SFML_TCPSOCKETSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfTcpSocket { sf::TcpSocket This; }; - - -#endif // SFML_TCPSOCKETSTRUCT_H diff --git a/src/SFML/Network/UdpSocketStruct.h b/src/SFML/Network/UdpSocketStruct.h index 72e6b148..272f13f4 100644 --- a/src/SFML/Network/UdpSocketStruct.h +++ b/src/SFML/Network/UdpSocketStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_UDPSOCKETSTRUCT_H -#define SFML_UDPSOCKETSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfUdpSocket { sf::UdpSocket This; }; - - -#endif // SFML_UDPSOCKETSTRUCT_H diff --git a/src/SFML/System/BufferStruct.h b/src/SFML/System/BufferStruct.h index 6d1fc13d..ea727b5d 100644 --- a/src/SFML/System/BufferStruct.h +++ b/src/SFML/System/BufferStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_BUFFERSTRUCT_H -#define SFML_BUFFERSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -40,6 +39,3 @@ struct sfBuffer { std::vector buffer; }; - - -#endif // SFML_BUFFERSTRUCT_H diff --git a/src/SFML/System/ClockStruct.h b/src/SFML/System/ClockStruct.h index cdd392f9..b7ced441 100644 --- a/src/SFML/System/ClockStruct.h +++ b/src/SFML/System/ClockStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CLOCKSTRUCT_H -#define SFML_CLOCKSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfClock { sf::Clock This; }; - - -#endif // SFML_CLOCKSTRUCT_H diff --git a/src/SFML/Window/ContextSettingsInternal.h b/src/SFML/Window/ContextSettingsInternal.h index 77691a77..2597308c 100644 --- a/src/SFML/Window/ContextSettingsInternal.h +++ b/src/SFML/Window/ContextSettingsInternal.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONTEXTSETTINGSINTERNAL_H -#define SFML_CONTEXTSETTINGSINTERNAL_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -71,5 +70,3 @@ namespace priv to.sRgbCapable = from.sRgbCapable; } } - -#endif // SFML_CONTEXTSETTINGSINTERNAL_H diff --git a/src/SFML/Window/ContextStruct.h b/src/SFML/Window/ContextStruct.h index 6afa4eef..23040473 100644 --- a/src/SFML/Window/ContextStruct.h +++ b/src/SFML/Window/ContextStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CONTEXTSTRUCT_H -#define SFML_CONTEXTSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfContext { sf::Context This; }; - - -#endif // SFML_CONTEXTSTRUCT_H diff --git a/src/SFML/Window/CursorStruct.h b/src/SFML/Window/CursorStruct.h index b2e8e9b8..5d9073b5 100644 --- a/src/SFML/Window/CursorStruct.h +++ b/src/SFML/Window/CursorStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_CURSORSTRUCT_H -#define SFML_CURSORSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfCursor { sf::Cursor This; }; - - -#endif // SFML_CURSORSTRUCT_H diff --git a/src/SFML/Window/WindowBaseStruct.h b/src/SFML/Window/WindowBaseStruct.h index 92ebce03..d1fc3f0d 100644 --- a/src/SFML/Window/WindowBaseStruct.h +++ b/src/SFML/Window/WindowBaseStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWBASESTRUCT_H -#define SFML_WINDOWBASESTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfWindowBase { sf::WindowBase This; }; - - -#endif // SFML_WINDOWBASESTRUCT_H diff --git a/src/SFML/Window/WindowStruct.h b/src/SFML/Window/WindowStruct.h index 88ed4096..e0d354e0 100644 --- a/src/SFML/Window/WindowStruct.h +++ b/src/SFML/Window/WindowStruct.h @@ -22,8 +22,7 @@ // //////////////////////////////////////////////////////////// -#ifndef SFML_WINDOWSTRUCT_H -#define SFML_WINDOWSTRUCT_H +#pragma once //////////////////////////////////////////////////////////// // Headers @@ -38,6 +37,3 @@ struct sfWindow { sf::Window This; }; - - -#endif // SFML_WINDOWSTRUCT_H