Improve compilation times by removing some includes and avoiding heavy dependencies

examples/joystick/Joystick.cpp

@@ -5,7 +5,6 @@
 #include <SFML/Graphics.hpp>
 #include <algorithm>
 #include <sstream>
-#include <iomanip>
 #include <string>
 #include <unordered_map>
 

examples/voip/Server.cpp

@@ -5,7 +5,6 @@
 #include <SFML/Audio.hpp>
 #include <SFML/Network.hpp>
 #include <cstring>
-#include <iomanip>
 #include <iostream>
 #include <iterator>
 #include <mutex>

examples/voip/VoIP.cpp

@@ -2,7 +2,6 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <iomanip>
 #include <iostream>
 #include <cstdlib>
 

extlibs/headers/glad/include/glad/wgl.h

@@ -28,7 +28,7 @@
 #ifndef SF_GLAD_WGL_H_
 #define SF_GLAD_WGL_H_
 
-#include <windows.h>
+#include <SFML/System/Win32/WindowsHeader.hpp>
 #include <glad/gl.h>
 
 #define SF_GLAD_WGL

include/SFML/Audio/SoundFileReader.hpp

@@ -29,7 +29,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Export.hpp>
-#include <string>
 
 
 namespace sf

include/SFML/Graphics/RenderWindow.hpp

@@ -32,7 +32,6 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/Image.hpp>
 #include <SFML/Window/Window.hpp>
-#include <string>
 
 
 namespace sf

include/SFML/Network/IpAddress.hpp

@@ -30,8 +30,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Export.hpp>
 #include <SFML/System/Time.hpp>
-#include <istream>
-#include <ostream>
+#include <iosfwd>
 #include <string>
 
 

include/SFML/System/Utf.hpp

@@ -29,7 +29,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.hpp>
-#include <algorithm>
 #include <locale>
 #include <string>
 #include <cstdlib>
@@ -37,6 +36,12 @@
 
 namespace sf
 {
+namespace priv
+{
+    template<class InputIt, class OutputIt>
+    OutputIt copy(InputIt first, InputIt last, OutputIt d_first);
+}
+
 template <unsigned int N>
 class Utf;
 

include/SFML/System/Utf.inl

@@ -35,6 +35,15 @@
 
 
 ////////////////////////////////////////////////////////////
+template <typename InputIt, typename OutputIt>
+OutputIt priv::copy(InputIt first, InputIt last, OutputIt d_first)
+{
+    while (first != last)
+        *d_first++ = *first++;
+
+    return d_first;
+}
+
 template <typename In>
 In Utf<8>::decode(In begin, In end, Uint32& output, Uint32 replacement)
 {
@@ -121,7 +130,7 @@ Out Utf<8>::encode(Uint32 input, Out output, Uint8 replacement)
         }
 
         // Add them to the output
-        output = std::copy(bytes, bytes + bytestoWrite, output);
+        output = priv::copy(bytes, bytes + bytestoWrite, output);
     }
 
     return output;
@@ -244,7 +253,7 @@ Out Utf<8>::toLatin1(In begin, In end, Out output, char replacement)
 template <typename In, typename Out>
 Out Utf<8>::toUtf8(In begin, In end, Out output)
 {
-    return std::copy(begin, end, output);
+    return priv::copy(begin, end, output);
 }
 
 
@@ -413,7 +422,7 @@ Out Utf<16>::fromLatin1(In begin, In end, Out output)
 {
     // Latin-1 is directly compatible with Unicode encodings,
     // and can thus be treated as (a sub-range of) UTF-32
-    return std::copy(begin, end, output);
+    return priv::copy(begin, end, output);
 }
 
 
@@ -482,7 +491,7 @@ Out Utf<16>::toUtf8(In begin, In end, Out output)
 template <typename In, typename Out>
 Out Utf<16>::toUtf16(In begin, In end, Out output)
 {
-    return std::copy(begin, end, output);
+    return priv::copy(begin, end, output);
 }
 
 
@@ -563,7 +572,7 @@ Out Utf<32>::fromLatin1(In begin, In end, Out output)
 {
     // Latin-1 is directly compatible with Unicode encodings,
     // and can thus be treated as (a sub-range of) UTF-32
-    return std::copy(begin, end, output);
+    return priv::copy(begin, end, output);
 }
 
 
@@ -630,7 +639,7 @@ Out Utf<32>::toUtf16(In begin, In end, Out output)
 template <typename In, typename Out>
 Out Utf<32>::toUtf32(In begin, In end, Out output)
 {
-    return std::copy(begin, end, output);
+    return priv::copy(begin, end, output);
 }
 
 

include/SFML/Window/Clipboard.hpp

@@ -29,11 +29,12 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Export.hpp>
-#include <SFML/System/String.hpp>
 
 
 namespace sf
 {
+class String;
+
 ////////////////////////////////////////////////////////////
 /// \brief Give access to the system clipboard
 ///

include/SFML/Window/WindowBase.hpp

@@ -35,12 +35,13 @@
 #include <SFML/Window/WindowHandle.hpp>
 #include <SFML/Window/WindowStyle.hpp>
 #include <SFML/System/Clock.hpp>
-#include <SFML/System/String.hpp>
 #include <SFML/System/Vector2.hpp>
 
 
 namespace sf
 {
+class String;
+
 namespace priv
 {
     class WindowImpl;

src/SFML/Audio/AudioDevice.hpp

@@ -29,7 +29,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/System/Vector3.hpp>
-#include <set>
 #include <string>
 
 

src/SFML/Audio/SoundFileReaderFlac.hpp

@@ -30,7 +30,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileReader.hpp>
 #include <FLAC/stream_decoder.h>
-#include <string>
 #include <vector>
 
 

src/SFML/Audio/SoundFileReaderOgg.cpp

@@ -28,7 +28,6 @@
 #include <SFML/Audio/SoundFileReaderOgg.hpp>
 #include <SFML/System/MemoryInputStream.hpp>
 #include <SFML/System/Err.hpp>
-#include <algorithm>
 #include <cctype>
 #include <cassert>
 

src/SFML/Audio/SoundFileReaderWav.hpp

@@ -29,7 +29,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileReader.hpp>
-#include <string>
 
 
 namespace sf

src/SFML/Graphics/Text.cpp

@@ -28,6 +28,7 @@
 #include <SFML/Graphics/Text.hpp>
 #include <SFML/Graphics/Texture.hpp>
 #include <SFML/Graphics/RenderTarget.hpp>
+#include <algorithm>
 #include <cmath>
 
 

src/SFML/Network/Http.cpp

@@ -28,7 +28,6 @@
 #include <SFML/Network/Http.hpp>
 #include <SFML/System/Err.hpp>
 #include <cctype>
-#include <algorithm>
 #include <iterator>
 #include <sstream>
 #include <limits>
@@ -204,7 +203,7 @@ void Http::Response::parse(const std::string& data)
     {
         if ((version.size() >= 8) && (version[6] == '.') &&
             (toLower(version.substr(0, 5)) == "http/")   &&
-             isdigit(version[5]) && isdigit(version[7]))
+             std::isdigit(version[5]) && std::isdigit(version[7]))
         {
             m_majorVersion = static_cast<unsigned int>(version[5] - '0');
             m_minorVersion = static_cast<unsigned int>(version[7] - '0');

src/SFML/Network/IpAddress.cpp

@@ -28,6 +28,8 @@
 #include <SFML/Network/IpAddress.hpp>
 #include <SFML/Network/Http.hpp>
 #include <SFML/Network/SocketImpl.hpp>
+#include <istream>
+#include <ostream>
 #include <cstring>
 #include <utility>
 

src/SFML/Network/UdpSocket.cpp

@@ -30,7 +30,7 @@
 #include <SFML/Network/Packet.hpp>
 #include <SFML/Network/SocketImpl.hpp>
 #include <SFML/System/Err.hpp>
-#include <algorithm>
+#include <cstddef>
 
 
 namespace sf

src/SFML/System/Err.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/System/Err.hpp>
+#include <iostream>
 #include <streambuf>
 #include <cstdio>
 

src/SFML/Window/Android/ClipboardImpl.cpp

@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Android/ClipboardImpl.hpp>
 #include <SFML/System/Err.hpp>
+#include <SFML/System/String.hpp>
 
 
 namespace sf

src/SFML/Window/Android/ClipboardImpl.hpp

@@ -25,14 +25,11 @@
 #ifndef SFML_CLIPBOARDIMPLANDROID_HPP
 #define SFML_CLIPBOARDIMPLANDROID_HPP
 
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
-
 
 namespace sf
 {
+class String;
+
 namespace priv
 {
 ////////////////////////////////////////////////////////////

src/SFML/Window/EGLCheck.cpp

@@ -29,6 +29,7 @@
 #include <SFML/Window/EGLCheck.hpp>
 #include <SFML/System/Err.hpp>
 #include <glad/egl.h>
+#include <string>
 
 
 namespace sf

src/SFML/Window/EGLCheck.hpp

@@ -29,7 +29,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.hpp>
-#include <string>
 
 
 namespace sf

src/SFML/Window/OSX/ClipboardImpl.hpp

@@ -25,14 +25,11 @@
 #ifndef SFML_CLIPBOARDIMPLCOCOA_HPP
 #define SFML_CLIPBOARDIMPLCOCOA_HPP
 
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
-
 
 namespace sf
 {
+class String;
+
 namespace priv
 {
 

src/SFML/Window/OSX/ClipboardImpl.mm

@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
 #include <SFML/Window/OSX/ClipboardImpl.hpp>
+#include <SFML/System/String.hpp>
 
 #import <AppKit/AppKit.h>
 

src/SFML/Window/OSX/JoystickImpl.hpp

@@ -30,7 +30,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/JoystickImpl.hpp>
-#include <SFML/System/String.hpp>
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/hid/IOHIDDevice.h>
 #include <IOKit/hid/IOHIDKeys.h>

src/SFML/Window/OSX/WindowImplCocoa.hpp

@@ -31,7 +31,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Event.hpp>
 #include <SFML/Window/WindowImpl.hpp>
-#include <SFML/System/String.hpp>
 
 ////////////////////////////////////////////////////////////
 /// Predefine OBJ-C classes
@@ -55,6 +54,8 @@ using NSOpenGLContextRef = void*;
 
 namespace sf
 {
+class String;
+
 namespace priv
 {
 ////////////////////////////////////////////////////////////

src/SFML/Window/OSX/WindowImplCocoa.mm

@@ -29,6 +29,7 @@
 #include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
 #include <SFML/Window/OSX/WindowImplCocoa.hpp>
 #include <SFML/System/Err.hpp>
+#include <SFML/System/String.hpp>
 
 #import <SFML/Window/OSX/cpp_objc_conversion.h>
 #import <SFML/Window/OSX/Scaling.h>

src/SFML/Window/Unix/WindowImplX11.cpp

@@ -29,6 +29,7 @@
 #include <SFML/Window/Unix/ClipboardImpl.hpp>
 #include <SFML/Window/Unix/Display.hpp>
 #include <SFML/Window/Unix/InputImpl.hpp>
+#include <SFML/System/String.hpp>
 #include <SFML/System/Utf.hpp>
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Sleep.hpp>

src/SFML/Window/Unix/WindowImplX11.hpp

@@ -30,7 +30,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Event.hpp>
 #include <SFML/Window/WindowImpl.hpp>
-#include <SFML/System/String.hpp>
 #include <SFML/Window/WindowStyle.hpp> // Prevent conflict with macro None from Xlib
 #include <X11/Xlib.h>
 #include <deque>

src/SFML/Window/Win32/ClipboardImpl.hpp

@@ -25,14 +25,11 @@
 #ifndef SFML_CLIPBOARDIMPLWIN32_HPP
 #define SFML_CLIPBOARDIMPLWIN32_HPP
 
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
-
 
 namespace sf
 {
+class String;
+
 namespace priv
 {
 ////////////////////////////////////////////////////////////

src/SFML/Window/Win32/JoystickImpl.cpp

@@ -31,7 +31,6 @@
 #include <SFML/System/Err.hpp>
 #include <tchar.h>
 #include <regstr.h>
-#include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <sstream>

src/SFML/Window/Win32/WindowImplWin32.cpp

@@ -29,6 +29,7 @@
 #include <SFML/Window/WindowStyle.hpp>
 #include <SFML/Window/JoystickImpl.hpp>
 #include <SFML/System/Err.hpp>
+#include <SFML/System/String.hpp>
 #include <SFML/System/Utf.hpp>
 // dbt.h is lowercase here, as a cross-compile on linux with mingw-w64
 // expects lowercase, and a native compile on windows, whether via msvc

src/SFML/Window/Win32/WindowImplWin32.hpp

@@ -31,11 +31,12 @@
 #include <SFML/Window/Event.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 #include <SFML/System/Win32/WindowsHeader.hpp>
-#include <SFML/System/String.hpp>
 
 
 namespace sf
 {
+class String;
+
 namespace priv
 {
 ////////////////////////////////////////////////////////////

src/SFML/Window/WindowImpl.hpp

@@ -29,7 +29,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.hpp>
-#include <SFML/System/String.hpp>
 #include <SFML/Window/ContextSettings.hpp>
 #include <SFML/Window/CursorImpl.hpp>
 #include <SFML/Window/Event.hpp>
@@ -37,13 +36,14 @@
 #include <SFML/Window/Sensor.hpp>
 #include <SFML/Window/SensorImpl.hpp>
 #include <SFML/Window/VideoMode.hpp>
+#include <SFML/Window/Vulkan.hpp>
 #include <SFML/Window/WindowHandle.hpp>
-#include <SFML/Window/Window.hpp>
 #include <queue>
 #include <set>
 
 namespace sf
 {
+class String;
 class WindowListener;
 
 namespace priv

src/SFML/Window/iOS/ClipboardImpl.hpp

@@ -25,14 +25,11 @@
 #ifndef SFML_CLIPBOARDIMPLIOS_HPP
 #define SFML_CLIPBOARDIMPLIOS_HPP
 
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
-
 
 namespace sf
 {
+class String;
+
 namespace priv
 {
 

src/SFML/Window/iOS/ClipboardImpl.mm

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/iOS/ClipboardImpl.hpp>
+#include <SFML/System/String.hpp>
 
 #import <UIKit/UIKit.h>