Convert private headers to .hpp extension

SFML · Dec 29, 2023 · b939e82 · b939e82
1 parent 0601d5f
commit b939e82
Show file tree

Hide file tree

Showing 97 changed files with 314 additions and 317 deletions.
diff --git a/src/SFML/Audio/CMakeLists.txt b/src/SFML/Audio/CMakeLists.txt
@@ -8,23 +8,23 @@ set(SRC
     ${SRCROOT}/Listener.cpp
     ${INCROOT}/Listener.h
     ${SRCROOT}/Music.cpp
-    ${SRCROOT}/MusicStruct.h
+    ${SRCROOT}/MusicStruct.hpp
     ${INCROOT}/Music.h
     ${SRCROOT}/Sound.cpp
-    ${SRCROOT}/SoundStruct.h
+    ${SRCROOT}/SoundStruct.hpp
     ${INCROOT}/Sound.h
     ${SRCROOT}/SoundBuffer.cpp
-    ${SRCROOT}/SoundBufferStruct.h
+    ${SRCROOT}/SoundBufferStruct.hpp
     ${INCROOT}/SoundBuffer.h
     ${SRCROOT}/SoundBufferRecorder.cpp
-    ${SRCROOT}/SoundBufferRecorderStruct.h
+    ${SRCROOT}/SoundBufferRecorderStruct.hpp
     ${INCROOT}/SoundBufferRecorder.h
     ${SRCROOT}/SoundRecorder.cpp
-    ${SRCROOT}/SoundRecorderStruct.h
+    ${SRCROOT}/SoundRecorderStruct.hpp
     ${INCROOT}/SoundRecorder.h
     ${INCROOT}/SoundStatus.h
     ${SRCROOT}/SoundStream.cpp
-    ${SRCROOT}/SoundStreamStruct.h
+    ${SRCROOT}/SoundStreamStruct.hpp
     ${INCROOT}/SoundStream.h
     ${INCROOT}/Types.h
 )

diff --git a/src/SFML/Audio/Music.cpp b/src/SFML/Audio/Music.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Music.h>
-#include <SFML/Audio/MusicStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/MusicStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

diff --git a/src/SFML/Audio/MusicStruct.h → src/SFML/Audio/MusicStruct.hpp b/src/SFML/Audio/MusicStruct.h → src/SFML/Audio/MusicStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_MUSICSTRUCT_H
-#define SFML_MUSICSTRUCT_H
+#ifndef SFML_MUSICSTRUCT_HPP
+#define SFML_MUSICSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Music.hpp>
-#include <SFML/CallbackStream.h>
+#include <SFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -42,4 +42,4 @@ struct sfMusic
 };
 
 
-#endif // SFML_MUSICSTRUCT_H
+#endif // SFML_MUSICSTRUCT_HPP
diff --git a/src/SFML/Audio/Sound.cpp b/src/SFML/Audio/Sound.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Sound.h>
-#include <SFML/Audio/SoundStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

diff --git a/src/SFML/Audio/SoundBuffer.cpp b/src/SFML/Audio/SoundBuffer.cpp
@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundBuffer.h>
-#include <SFML/Audio/SoundBufferStruct.h>
-#include <SFML/CallbackStream.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundBufferStruct.hpp>
+#include <SFML/CallbackStream.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

diff --git a/src/SFML/Audio/SoundBufferRecorder.cpp b/src/SFML/Audio/SoundBufferRecorder.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundBufferRecorder.h>
-#include <SFML/Audio/SoundBufferRecorderStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundBufferRecorderStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

diff --git a/src/SFML/Audio/SoundBufferRecorderStruct.h → src/SFML/Audio/SoundBufferRecorderStruct.hpp b/src/SFML/Audio/SoundBufferRecorderStruct.h → src/SFML/Audio/SoundBufferRecorderStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDBUFFERRECORDERSTRUCT_H
-#define SFML_SOUNDBUFFERRECORDERSTRUCT_H
+#ifndef SFML_SOUNDBUFFERRECORDERSTRUCT_HPP
+#define SFML_SOUNDBUFFERRECORDERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundBufferRecorder.hpp>
-#include <SFML/Audio/SoundBufferStruct.h>
+#include <SFML/Audio/SoundBufferStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -43,4 +43,4 @@ struct sfSoundBufferRecorder
 };
 
 
-#endif // SFML_SOUNDBUFFERRECORDERSTRUCT_H
+#endif // SFML_SOUNDBUFFERRECORDERSTRUCT_HPP
diff --git a/src/SFML/Audio/SoundBufferStruct.h → src/SFML/Audio/SoundBufferStruct.hpp b/src/SFML/Audio/SoundBufferStruct.h → src/SFML/Audio/SoundBufferStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDBUFFERSTRUCT_H
-#define SFML_SOUNDBUFFERSTRUCT_H
+#ifndef SFML_SOUNDBUFFERSTRUCT_HPP
+#define SFML_SOUNDBUFFERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfSoundBuffer
 };
 
 
-#endif // SFML_SOUNDBUFFERSTRUCT_H
+#endif // SFML_SOUNDBUFFERSTRUCT_HPP
diff --git a/src/SFML/Audio/SoundRecorder.cpp b/src/SFML/Audio/SoundRecorder.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundRecorder.h>
-#include <SFML/Audio/SoundRecorderStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundRecorderStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

diff --git a/src/SFML/Audio/SoundRecorderStruct.h → src/SFML/Audio/SoundRecorderStruct.hpp b/src/SFML/Audio/SoundRecorderStruct.h → src/SFML/Audio/SoundRecorderStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDRECORDERSTRUCT_H
-#define SFML_SOUNDRECORDERSTRUCT_H
+#ifndef SFML_SOUNDRECORDERSTRUCT_HPP
+#define SFML_SOUNDRECORDERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -105,4 +105,4 @@ struct sfSoundRecorder
 };
 
 
-#endif // SFML_SOUNDRECORDERSTRUCT_H
+#endif // SFML_SOUNDRECORDERSTRUCT_HPP
diff --git a/src/SFML/Audio/SoundStream.cpp b/src/SFML/Audio/SoundStream.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundStream.h>
-#include <SFML/Audio/SoundStreamStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundStreamStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

diff --git a/src/SFML/Audio/SoundStreamStruct.h → src/SFML/Audio/SoundStreamStruct.hpp b/src/SFML/Audio/SoundStreamStruct.h → src/SFML/Audio/SoundStreamStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDSTREAMSTRUCT_H
-#define SFML_SOUNDSTREAMSTRUCT_H
+#ifndef SFML_SOUNDSTREAMSTRUCT_HPP
+#define SFML_SOUNDSTREAMSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -97,4 +97,4 @@ struct sfSoundStream
 };
 
 
-#endif // SFML_SOUNDSTREAMSTRUCT_H
+#endif // SFML_SOUNDSTREAMSTRUCT_HPP
diff --git a/src/SFML/Audio/SoundStruct.h → src/SFML/Audio/SoundStruct.hpp b/src/SFML/Audio/SoundStruct.h → src/SFML/Audio/SoundStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDSTRUCT_H
-#define SFML_SOUNDSTRUCT_H
+#ifndef SFML_SOUNDSTRUCT_HPP
+#define SFML_SOUNDSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Sound.hpp>
-#include <SFML/Audio/SoundBufferStruct.h>
+#include <SFML/Audio/SoundBufferStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -42,4 +42,4 @@ struct sfSound
 };
 
 
-#endif // SFML_SOUNDSTRUCT_H
+#endif // SFML_SOUNDSTRUCT_HPP
diff --git a/src/SFML/CallbackStream.h → src/SFML/CallbackStream.hpp b/src/SFML/CallbackStream.h → src/SFML/CallbackStream.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CALLBACKSTREAM_H
-#define SFML_CALLBACKSTREAM_H
+#ifndef SFML_CALLBACKSTREAM_HPP
+#define SFML_CALLBACKSTREAM_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -117,4 +117,4 @@ class CallbackStream : public sf::InputStream
 };
 
 
-#endif // SFML_CALLBACKSTREAM_H
+#endif // SFML_CALLBACKSTREAM_HPP
diff --git a/src/SFML/ConvertEvent.h → src/SFML/ConvertEvent.hpp b/src/SFML/ConvertEvent.h → src/SFML/ConvertEvent.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CONVERTEVENT_H
-#define SFML_CONVERTEVENT_H
+#ifndef SFML_CONVERTEVENT_HPP
+#define SFML_CONVERTEVENT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -124,4 +124,4 @@ inline void convertEvent(const sf::Event& sfmlEvent, sfEvent* event)
     }
 }
 
-#endif // SFML_CONVERTEVENT_H
+#endif // SFML_CONVERTEVENT_HPP
diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt
@@ -8,65 +8,65 @@ set(SRC
     ${SRCROOT}/BlendMode.cpp
     ${INCROOT}/BlendMode.h
     ${SRCROOT}/CircleShape.cpp
-    ${SRCROOT}/CircleShapeStruct.h
+    ${SRCROOT}/CircleShapeStruct.hpp
     ${INCROOT}/CircleShape.h
     ${SRCROOT}/Color.cpp
     ${INCROOT}/Color.h
     ${SRCROOT}/ConvertRenderStates.hpp
     ${SRCROOT}/ConvertTransform.hpp
     ${SRCROOT}/ConvexShape.cpp
-    ${SRCROOT}/ConvexShapeStruct.h
+    ${SRCROOT}/ConvexShapeStruct.hpp
     ${INCROOT}/ConvexShape.h
     ${SRCROOT}/Font.cpp
-    ${SRCROOT}/FontStruct.h
+    ${SRCROOT}/FontStruct.hpp
     ${INCROOT}/Font.h
     ${INCROOT}/FontInfo.h
     ${INCROOT}/Glyph.h
     ${SRCROOT}/Image.cpp
-    ${SRCROOT}/ImageStruct.h
+    ${SRCROOT}/ImageStruct.hpp
     ${INCROOT}/Image.h
     ${SRCROOT}/Rect.cpp
     ${INCROOT}/Rect.h
     ${SRCROOT}/RectangleShape.cpp
-    ${SRCROOT}/RectangleShapeStruct.h
+    ${SRCROOT}/RectangleShapeStruct.hpp
     ${INCROOT}/RectangleShape.h
     ${SRCROOT}/RenderStates.cpp
     ${SRCROOT}/RenderTexture.cpp
-    ${SRCROOT}/RenderTextureStruct.h
+    ${SRCROOT}/RenderTextureStruct.hpp
     ${INCROOT}/RenderTexture.h
     ${SRCROOT}/RenderWindow.cpp
-    ${SRCROOT}/RenderWindowStruct.h
+    ${SRCROOT}/RenderWindowStruct.hpp
     ${INCROOT}/RenderWindow.h
     ${SRCROOT}/Shader.cpp
-    ${SRCROOT}/ShaderStruct.h
+    ${SRCROOT}/ShaderStruct.hpp
     ${INCROOT}/Shader.h
     ${SRCROOT}/Shape.cpp
-    ${SRCROOT}/ShapeStruct.h
+    ${SRCROOT}/ShapeStruct.hpp
     ${INCROOT}/Shape.h
     ${SRCROOT}/Sprite.cpp
-    ${SRCROOT}/SpriteStruct.h
+    ${SRCROOT}/SpriteStruct.hpp
     ${INCROOT}/Sprite.h
     ${SRCROOT}/Text.cpp
-    ${SRCROOT}/TextStruct.h
+    ${SRCROOT}/TextStruct.hpp
     ${INCROOT}/Text.h
     ${SRCROOT}/Texture.cpp
-    ${SRCROOT}/TextureStruct.h
+    ${SRCROOT}/TextureStruct.hpp
     ${INCROOT}/Texture.h
     ${SRCROOT}/Transform.cpp
     ${INCROOT}/Transform.h
     ${SRCROOT}/Transformable.cpp
-    ${SRCROOT}/TransformableStruct.h
+    ${SRCROOT}/TransformableStruct.hpp
     ${INCROOT}/Transformable.h
     ${INCROOT}/Types.h
     ${INCROOT}/Vertex.h
     ${SRCROOT}/VertexArray.cpp
-    ${SRCROOT}/VertexArrayStruct.h
+    ${SRCROOT}/VertexArrayStruct.hpp
     ${INCROOT}/VertexArray.h
     ${INCROOT}/VertexBuffer.h
     ${SRCROOT}/VertexBuffer.cpp
-    ${SRCROOT}/VertexBufferStruct.h
+    ${SRCROOT}/VertexBufferStruct.hpp
     ${SRCROOT}/View.cpp
-    ${SRCROOT}/ViewStruct.h
+    ${SRCROOT}/ViewStruct.hpp
     ${INCROOT}/View.h
 )
 

diff --git a/src/SFML/Graphics/CircleShape.cpp b/src/SFML/Graphics/CircleShape.cpp
@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/CircleShape.h>
-#include <SFML/Graphics/CircleShapeStruct.h>
+#include <SFML/Graphics/CircleShapeStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

diff --git a/src/SFML/Graphics/CircleShapeStruct.h → src/SFML/Graphics/CircleShapeStruct.hpp b/src/SFML/Graphics/CircleShapeStruct.h → src/SFML/Graphics/CircleShapeStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CIRCLESHAPESTRUCT_H
-#define SFML_CIRCLESHAPESTRUCT_H
+#ifndef SFML_CIRCLESHAPESTRUCT_HPP
+#define SFML_CIRCLESHAPESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/CircleShape.hpp>
-#include <SFML/Graphics/TextureStruct.h>
+#include <SFML/Graphics/TextureStruct.hpp>
 #include <SFML/Graphics/Transform.h>
 
 
@@ -45,4 +45,4 @@ struct sfCircleShape
 };
 
 
-#endif // SFML_CIRCLESHAPESTRUCT_H
+#endif // SFML_CIRCLESHAPESTRUCT_HPP
diff --git a/src/SFML/Graphics/Color.cpp b/src/SFML/Graphics/Color.cpp
@@ -26,7 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Color.h>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 #include <algorithm>