Header include clean-up and minor refactoring

include/SFML/Audio/InputSoundFile.hpp

@@ -35,6 +35,7 @@
 #include <memory>
 
 #include <cstddef>
+#include <cstdint>
 
 
 namespace sf

include/SFML/Audio/Music.hpp

@@ -35,6 +35,8 @@
 #include <filesystem>
 #include <vector>
 
+#include <cstdint>
+
 
 namespace sf
 {

include/SFML/Audio/SoundRecorder.hpp

@@ -37,6 +37,9 @@
 #include <thread>
 #include <vector>
 
+#include <cstddef>
+#include <cstdint>
+
 
 namespace sf
 {

include/SFML/Audio/SoundStream.hpp

@@ -36,7 +36,8 @@
 #include <mutex>
 #include <thread>
 
-#include <cstdlib>
+#include <cstddef>
+#include <cstdint>
 
 
 namespace sf

src/SFML/Audio/InputSoundFile.cpp

@@ -58,7 +58,7 @@ InputSoundFile::StreamDeleter::StreamDeleter(const std::default_delete<T>&)
 void InputSoundFile::StreamDeleter::operator()(InputStream* ptr) const
 {
     if (owned)
-        std::default_delete<InputStream>{}(ptr);
+        delete ptr;
 }
 
 

src/SFML/Graphics/GLCheck.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 
 #include <SFML/System/Err.hpp>
 

src/SFML/Graphics/GLCheck.hpp

@@ -29,8 +29,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.hpp>
 
-#include <SFML/Graphics/GLExtensions.hpp>
-
 #include <filesystem>
 #include <string_view>
 

src/SFML/Graphics/RenderTarget.cpp

@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Drawable.hpp>
 #include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/Shader.hpp>
 #include <SFML/Graphics/Texture.hpp>

src/SFML/Graphics/RenderTextureImplDefault.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/RenderTextureImplDefault.hpp>
 #include <SFML/Graphics/TextureSaver.hpp>
 

src/SFML/Graphics/RenderTextureImplFBO.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/RenderTextureImplFBO.hpp>
 #include <SFML/Graphics/Texture.hpp>
 

src/SFML/Graphics/RenderWindow.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/Image.hpp>
 #include <SFML/Graphics/RenderTextureImplFBO.hpp>
 #include <SFML/Graphics/RenderWindow.hpp>

src/SFML/Graphics/Shader.cpp

@@ -28,6 +28,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/Shader.hpp>
 #include <SFML/Graphics/Texture.hpp>
 #include <SFML/Graphics/Transform.hpp>

src/SFML/Graphics/Texture.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/Image.hpp>
 #include <SFML/Graphics/Texture.hpp>
 #include <SFML/Graphics/TextureSaver.hpp>

src/SFML/Graphics/TextureSaver.cpp

@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/TextureSaver.hpp>
 
 

src/SFML/Graphics/VertexBuffer.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/Vertex.hpp>
 #include <SFML/Graphics/VertexBuffer.hpp>

src/SFML/Network/Ftp.cpp

@@ -30,15 +30,13 @@
 
 #include <SFML/System/Err.hpp>
 
-#include <algorithm>
 #include <fstream>
-#include <iterator>
 #include <ostream>
 #include <sstream>
 #include <utility>
 
-#include <cctype>
+#include <cstddef>
-#include <cstdio>
+#include <cstdint>
 
 
 namespace sf
@@ -357,11 +355,7 @@ Ftp::Response Ftp::upload(const std::filesystem::path& localFile,
 Ftp::Response Ftp::sendCommand(const std::string& command, const std::string& parameter)
 {
     // Build the command string
-    std::string commandStr;
+    const std::string commandStr = parameter.empty() ? command + "\r\n" : command + " " + parameter + "\r\n";
-    if (!parameter.empty())
-        commandStr = command + " " + parameter + "\r\n";
-    else
-        commandStr = command + "\r\n";
 
     // Send it to the server
     if (m_commandSocket.send(commandStr.c_str(), commandStr.length()) != Socket::Status::Done)