Skip to content

Commit

Permalink
Convert System module private headers to .hpp extension
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisThrasher committed Dec 29, 2023
1 parent 0601d5f commit 5256879
Show file tree
Hide file tree
Showing 58 changed files with 88 additions and 90 deletions.
2 changes: 1 addition & 1 deletion src/SFML/Audio/Music.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Audio/Music.h>
#include <SFML/Audio/MusicStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Audio/MusicStruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Audio/Music.hpp>
#include <SFML/CallbackStream.h>
#include <SFML/CallbackStream.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Audio/Sound.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Audio/Sound.h>
#include <SFML/Audio/SoundStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions src/SFML/Audio/SoundBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
////////////////////////////////////////////////////////////
#include <SFML/Audio/SoundBuffer.h>
#include <SFML/Audio/SoundBufferStruct.h>
#include <SFML/CallbackStream.h>
#include <SFML/Internal.h>
#include <SFML/CallbackStream.hpp>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Audio/SoundBufferRecorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Audio/SoundBufferRecorder.h>
#include <SFML/Audio/SoundBufferRecorderStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Audio/SoundRecorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Audio/SoundRecorder.h>
#include <SFML/Audio/SoundRecorderStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Audio/SoundStream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Audio/SoundStream.h>
#include <SFML/Audio/SoundStreamStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions src/SFML/CallbackStream.h → src/SFML/CallbackStream.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
//
////////////////////////////////////////////////////////////

#ifndef SFML_CALLBACKSTREAM_H
#define SFML_CALLBACKSTREAM_H
#ifndef SFML_CALLBACKSTREAM_HPP
#define SFML_CALLBACKSTREAM_HPP

////////////////////////////////////////////////////////////
// Headers
Expand Down Expand Up @@ -117,4 +117,4 @@ class CallbackStream : public sf::InputStream
};


#endif // SFML_CALLBACKSTREAM_H
#endif // SFML_CALLBACKSTREAM_HPP
6 changes: 3 additions & 3 deletions src/SFML/ConvertEvent.h → src/SFML/ConvertEvent.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
//
////////////////////////////////////////////////////////////

#ifndef SFML_CONVERTEVENT_H
#define SFML_CONVERTEVENT_H
#ifndef SFML_CONVERTEVENT_HPP
#define SFML_CONVERTEVENT_HPP

////////////////////////////////////////////////////////////
// Headers
Expand Down Expand Up @@ -124,4 +124,4 @@ inline void convertEvent(const sf::Event& sfmlEvent, sfEvent* event)
}
}

#endif // SFML_CONVERTEVENT_H
#endif // SFML_CONVERTEVENT_HPP
2 changes: 1 addition & 1 deletion src/SFML/Graphics/CircleShape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <SFML/Graphics/CircleShapeStruct.h>
#include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/ConvertTransform.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/Color.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Color.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>
#include <algorithm>


Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/ConvexShape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <SFML/Graphics/ConvexShapeStruct.h>
#include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/ConvertTransform.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions src/SFML/Graphics/Font.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Font.h>
#include <SFML/Graphics/FontStruct.h>
#include <SFML/Internal.h>
#include <SFML/CallbackStream.h>
#include <SFML/Internal.hpp>
#include <SFML/CallbackStream.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/FontStruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Font.hpp>
#include <SFML/Graphics/TextureStruct.h>
#include <SFML/CallbackStream.h>
#include <SFML/CallbackStream.hpp>
#include <map>


Expand Down
6 changes: 3 additions & 3 deletions src/SFML/Graphics/Image.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Image.h>
#include <SFML/Graphics/ImageStruct.h>
#include <SFML/System/BufferStruct.h>
#include <SFML/Internal.h>
#include <SFML/CallbackStream.h>
#include <SFML/System/BufferStruct.hpp>
#include <SFML/Internal.hpp>
#include <SFML/CallbackStream.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/Rect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics/Rect.h>
#include <SFML/Graphics/Rect.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


namespace
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/RectangleShape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <SFML/Graphics/RectangleShapeStruct.h>
#include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/ConvertTransform.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/RenderTexture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <SFML/Graphics/VertexArrayStruct.h>
#include <SFML/Graphics/VertexBufferStruct.h>
#include <SFML/Graphics/ConvertRenderStates.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>
#include <SFML/Window/ContextSettingsInternal.h>


Expand Down
4 changes: 2 additions & 2 deletions src/SFML/Graphics/RenderWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
#include <SFML/Graphics/VertexBufferStruct.h>
#include <SFML/Graphics/ConvertRenderStates.hpp>
#include <SFML/Window/Touch.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>
#include <SFML/Window/ContextSettingsInternal.h>
#include <SFML/Window/CursorStruct.h>
#include <SFML/ConvertEvent.h>
#include <SFML/ConvertEvent.hpp>


////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions src/SFML/Graphics/Shader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#include <SFML/Graphics/ShaderStruct.h>
#include <SFML/Graphics/TextureStruct.h>
#include <SFML/Graphics/ConvertTransform.hpp>
#include <SFML/Internal.h>
#include <SFML/CallbackStream.h>
#include <SFML/Internal.hpp>
#include <SFML/CallbackStream.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/Shape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <SFML/Graphics/ShapeStruct.h>
#include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/ConvertTransform.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/Sprite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/Image.hpp>
#include <SFML/Graphics/ConvertTransform.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/Text.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <SFML/Graphics/Font.h>
#include <SFML/Graphics/Color.hpp>
#include <SFML/Graphics/ConvertTransform.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions src/SFML/Graphics/Texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#include <SFML/Graphics/ImageStruct.h>
#include <SFML/Graphics/RenderWindowStruct.h>
#include <SFML/Window/WindowStruct.h>
#include <SFML/Internal.h>
#include <SFML/CallbackStream.h>
#include <SFML/Internal.hpp>
#include <SFML/CallbackStream.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/Transform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <SFML/Graphics/Transform.h>
#include <SFML/Graphics/Transform.hpp>
#include <SFML/Graphics/ConvertTransform.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>
#include <cstring>


Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/Transformable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <SFML/Graphics/Transformable.h>
#include <SFML/Graphics/TransformableStruct.h>
#include <SFML/Graphics/ConvertTransform.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/VertexArray.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics/VertexArray.h>
#include <SFML/Graphics/VertexArrayStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/VertexBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics/VertexBuffer.h>
#include <SFML/Graphics/VertexBufferStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Graphics/View.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Graphics/View.h>
#include <SFML/Graphics/ViewStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions src/SFML/Internal.h → src/SFML/Internal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
//
////////////////////////////////////////////////////////////

#ifndef SFML_INTERNAL_H
#define SFML_INTERNAL_H
#ifndef SFML_INTERNAL_HPP
#define SFML_INTERNAL_HPP

////////////////////////////////////////////////////////////
// Define macros to check the validity of CSFML objects in debug run
Expand Down Expand Up @@ -131,4 +131,4 @@

#endif

#endif // SFML_INTERNAL_H
#endif // SFML_INTERNAL_HPP
2 changes: 1 addition & 1 deletion src/SFML/Network/Ftp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <SFML/Network/Ftp.h>
#include <SFML/Network/FtpStruct.h>
#include <SFML/Network/IpAddress.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Network/Http.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Network/Http.h>
#include <SFML/Network/HttpStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Network/Packet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Network/Packet.h>
#include <SFML/Network/PacketStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Network/SocketSelector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <SFML/Network/TcpListenerStruct.h>
#include <SFML/Network/TcpSocketStruct.h>
#include <SFML/Network/UdpSocketStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Network/TcpListener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <SFML/Network/TcpListener.h>
#include <SFML/Network/TcpListenerStruct.h>
#include <SFML/Network/TcpSocketStruct.h>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Network/TcpSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <SFML/Network/TcpSocketStruct.h>
#include <SFML/Network/PacketStruct.h>
#include <SFML/Network/IpAddress.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>
#include <string.h>


Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Network/UdpSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <SFML/Network/UdpSocketStruct.h>
#include <SFML/Network/PacketStruct.h>
#include <SFML/Network/IpAddress.hpp>
#include <SFML/Internal.h>
#include <SFML/Internal.hpp>
#include <string.h>


Expand Down
4 changes: 2 additions & 2 deletions src/SFML/System/Buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
// Headers
////////////////////////////////////////////////////////////
#include <SFML/System/Buffer.h>
#include <SFML/System/BufferStruct.h>
#include <SFML/Internal.h>
#include <SFML/System/BufferStruct.hpp>
#include <SFML/Internal.hpp>


////////////////////////////////////////////////////////////
Expand Down
Loading

0 comments on commit 5256879

Please sign in to comment.