From 9a0cc4b7dc8dae79fc912a04a9d4679d42815a4a Mon Sep 17 00:00:00 2001
From: Vittorio Romeo <vittorio.romeo@outlook.com>
Date: Wed, 8 Dec 2021 17:00:44 +0000
Subject: [PATCH] Use alias declarations instead of 'typedef'

---
 cmake/CompilerWarnings.cmake                  |  2 +-
 examples/joystick/Joystick.cpp                |  2 +-
 examples/vulkan/Vulkan.cpp                    |  4 +-
 include/SFML/Audio/Music.hpp                  |  2 +-
 include/SFML/Audio/SoundBuffer.hpp            |  2 +-
 include/SFML/Audio/SoundFileFactory.hpp       |  4 +-
 include/SFML/Config.hpp                       | 20 +++++-----
 include/SFML/Graphics/Font.hpp                |  4 +-
 include/SFML/Graphics/Glsl.hpp                | 34 ++++++++--------
 include/SFML/Graphics/Rect.hpp                |  8 ++--
 include/SFML/Graphics/Shader.hpp              |  4 +-
 include/SFML/Network/Http.hpp                 |  4 +-
 include/SFML/Network/Packet.hpp               |  2 +-
 include/SFML/Network/SocketHandle.hpp         |  4 +-
 include/SFML/System/String.hpp                |  4 +-
 include/SFML/System/Utf.hpp                   | 14 +++----
 include/SFML/System/Vector2.hpp               |  8 ++--
 include/SFML/System/Vector3.hpp               |  6 +--
 include/SFML/Window/Context.hpp               |  2 +-
 include/SFML/Window/GlResource.hpp            |  2 +-
 include/SFML/Window/Vulkan.hpp                | 10 ++---
 include/SFML/Window/WindowBase.hpp            |  2 +-
 include/SFML/Window/WindowHandle.hpp          | 16 ++++----
 src/SFML/Graphics/RenderTarget.cpp            |  2 +-
 src/SFML/Main/SFMLActivity.cpp                |  2 +-
 src/SFML/Network/Unix/SocketImpl.hpp          |  4 +-
 src/SFML/Network/Win32/SocketImpl.hpp         |  4 +-
 src/SFML/Window/GlContext.cpp                 | 40 +++++++++----------
 .../Window/OSX/AutoreleasePoolWrapper.hpp     |  4 +-
 src/SFML/Window/OSX/CursorImpl.hpp            |  4 +-
 src/SFML/Window/OSX/HIDInputManager.hpp       |  2 +-
 src/SFML/Window/OSX/JoystickImpl.hpp          |  6 +--
 src/SFML/Window/OSX/SFContext.hpp             | 12 +++---
 src/SFML/Window/OSX/WindowImplCocoa.hpp       | 10 ++---
 src/SFML/Window/Unix/Display.cpp              |  2 +-
 src/SFML/Window/Unix/JoystickImpl.cpp         |  2 +-
 src/SFML/Window/Unix/WindowImplX11.cpp        |  4 +-
 src/SFML/Window/Vulkan.cpp                    |  4 +-
 src/SFML/Window/Win32/JoystickImpl.cpp        |  6 +--
 src/SFML/Window/Win32/WindowImplWin32.cpp     |  4 +-
 src/SFML/Window/WindowImpl.cpp                | 14 +++----
 41 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake
index e84b08a2..2cd1d240 100644
--- a/cmake/CompilerWarnings.cmake
+++ b/cmake/CompilerWarnings.cmake
@@ -84,7 +84,7 @@ function(set_file_warnings)
         ${CLANG_AND_GCC_WARNINGS}
         ${NON_ANDROID_GCC_WARNINGS}
         -Wlogical-op # warn about logical operations being used where bitwise were probably wanted
-        # -Wuseless-cast # warn if you perform a cast to the same type (disabled because it is not portable as some typedefs might vary between platforms)
+        # -Wuseless-cast # warn if you perform a cast to the same type (disabled because it is not portable as some type aliases might vary between platforms)
     )
 
     # Don't enable -Wduplicated-branches for GCC < 8.1 since it will lead to false positives
diff --git a/examples/joystick/Joystick.cpp b/examples/joystick/Joystick.cpp
index 62f512fc..143ff8d8 100644
--- a/examples/joystick/Joystick.cpp
+++ b/examples/joystick/Joystick.cpp
@@ -18,7 +18,7 @@ namespace
         sf::Text value;
     };
 
-    typedef std::unordered_map<std::string, JoystickObject> Texts;
+    using Texts = std::unordered_map<std::string, JoystickObject>;
     Texts texts;
     std::ostringstream sstr;
     float threshold = 0.1f;
diff --git a/examples/vulkan/Vulkan.cpp b/examples/vulkan/Vulkan.cpp
index befd71c8..80a4a7ae 100644
--- a/examples/vulkan/Vulkan.cpp
+++ b/examples/vulkan/Vulkan.cpp
@@ -20,8 +20,8 @@
 ////////////////////////////////////////////////////////////
 namespace
 {
-    typedef float Vec3[3];
-    typedef float Matrix[4][4];
+    using Vec3 = float[3];
+    using Matrix = float[4][4];
 
     // Multiply 2 matrices
     void matrixMultiply(Matrix& result, const Matrix& left, const Matrix& right)
diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp
index e68277ab..141db6a1 100644
--- a/include/SFML/Audio/Music.hpp
+++ b/include/SFML/Audio/Music.hpp
@@ -84,7 +84,7 @@ public:
     };
 
     // Define the relevant Span types
-    typedef Span<Time> TimeSpan;
+    using TimeSpan = Span<Time>;
 
     ////////////////////////////////////////////////////////////
     /// \brief Default constructor
diff --git a/include/SFML/Audio/SoundBuffer.hpp b/include/SFML/Audio/SoundBuffer.hpp
index 7f220097..351cab21 100644
--- a/include/SFML/Audio/SoundBuffer.hpp
+++ b/include/SFML/Audio/SoundBuffer.hpp
@@ -267,7 +267,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef std::unordered_set<Sound*> SoundList; //!< Set of unique sound instances
+    using SoundList = std::unordered_set<Sound *>; //!< Set of unique sound instances
 
     ////////////////////////////////////////////////////////////
     // Member data
diff --git a/include/SFML/Audio/SoundFileFactory.hpp b/include/SFML/Audio/SoundFileFactory.hpp
index 84c9fa12..654cac1f 100644
--- a/include/SFML/Audio/SoundFileFactory.hpp
+++ b/include/SFML/Audio/SoundFileFactory.hpp
@@ -148,14 +148,14 @@ private:
         bool (*check)(InputStream&);
         SoundFileReader* (*create)();
     };
-    typedef std::vector<ReaderFactory> ReaderFactoryArray;
+    using ReaderFactoryArray = std::vector<ReaderFactory>;
 
     struct WriterFactory
     {
         bool (*check)(const std::string&);
         SoundFileWriter* (*create)();
     };
-    typedef std::vector<WriterFactory> WriterFactoryArray;
+    using WriterFactoryArray = std::vector<WriterFactory>;
 
     ////////////////////////////////////////////////////////////
     // Static member data
diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp
index 26378a21..a58bd2ea 100644
--- a/include/SFML/Config.hpp
+++ b/include/SFML/Config.hpp
@@ -178,24 +178,24 @@ namespace sf
     // we can use them without doing any kind of check
 
     // 8 bits integer types
-    typedef signed   char Int8;
-    typedef unsigned char Uint8;
+    using Int8 = signed char;
+    using Uint8 = unsigned char;
 
     // 16 bits integer types
-    typedef signed   short Int16;
-    typedef unsigned short Uint16;
+    using Int16 = short;
+    using Uint16 = unsigned short;
 
     // 32 bits integer types
-    typedef signed   int Int32;
-    typedef unsigned int Uint32;
+    using Int32 = int;
+    using Uint32 = unsigned int;
 
     // 64 bits integer types
     #if defined(_MSC_VER)
-        typedef signed   __int64 Int64;
-        typedef unsigned __int64 Uint64;
+        using Int64 = signed   __int64;
+        using Uint64 = unsigned __int64;
     #else
-        typedef signed   long long Int64;
-        typedef unsigned long long Uint64;
+        using Int64 = long long;
+        using Uint64 = unsigned long long;
     #endif
 
 } // namespace sf
diff --git a/include/SFML/Graphics/Font.hpp b/include/SFML/Graphics/Font.hpp
index 9e4aadec..963e83dd 100644
--- a/include/SFML/Graphics/Font.hpp
+++ b/include/SFML/Graphics/Font.hpp
@@ -327,7 +327,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef std::unordered_map<Uint64, Glyph> GlyphTable; //!< Table mapping a codepoint to its glyph
+    using GlyphTable = std::unordered_map<Uint64, Glyph>; //!< Table mapping a codepoint to its glyph
 
     ////////////////////////////////////////////////////////////
     /// \brief Structure defining a page of glyphs
@@ -387,7 +387,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef std::unordered_map<unsigned int, Page> PageTable; //!< Table mapping a character size to its page (texture)
+    using PageTable = std::unordered_map<unsigned int, Page>; //!< Table mapping a character size to its page (texture)
 
     ////////////////////////////////////////////////////////////
     // Member data
diff --git a/include/SFML/Graphics/Glsl.hpp b/include/SFML/Graphics/Glsl.hpp
index 1ae449bd..c21f6f43 100644
--- a/include/SFML/Graphics/Glsl.hpp
+++ b/include/SFML/Graphics/Glsl.hpp
@@ -61,37 +61,37 @@ namespace Glsl
     /// \brief 2D float vector (\p vec2 in GLSL)
     ///
     ////////////////////////////////////////////////////////////
-    typedef Vector2<float> Vec2;
+    using Vec2 = Vector2<float>;
 
     ////////////////////////////////////////////////////////////
     /// \brief 2D int vector (\p ivec2 in GLSL)
     ///
     ////////////////////////////////////////////////////////////
-    typedef Vector2<int> Ivec2;
+    using Ivec2 = Vector2<int>;
 
     ////////////////////////////////////////////////////////////
     /// \brief 2D bool vector (\p bvec2 in GLSL)
     ///
     ////////////////////////////////////////////////////////////
-    typedef Vector2<bool> Bvec2;
+    using Bvec2 = Vector2<bool>;
 
     ////////////////////////////////////////////////////////////
     /// \brief 3D float vector (\p vec3 in GLSL)
     ///
     ////////////////////////////////////////////////////////////
-    typedef Vector3<float> Vec3;
+    using Vec3 = Vector3<float>;
 
     ////////////////////////////////////////////////////////////
     /// \brief 3D int vector (\p ivec3 in GLSL)
     ///
     ////////////////////////////////////////////////////////////
-    typedef Vector3<int> Ivec3;
+    using Ivec3 = Vector3<int>;
 
     ////////////////////////////////////////////////////////////
     /// \brief 3D bool vector (\p bvec3 in GLSL)
     ///
     ////////////////////////////////////////////////////////////
-    typedef Vector3<bool> Bvec3;
+    using Bvec3 = Vector3<bool>;
 
 #ifdef SFML_DOXYGEN
 
@@ -107,7 +107,7 @@ namespace Glsl
     /// sf::Glsl::Vec4 color = sf::Color::Cyan;
     /// \endcode
     ////////////////////////////////////////////////////////////
-    typedef implementation-defined Vec4;
+    using Vec4 = implementation-defined;
 
     ////////////////////////////////////////////////////////////
     /// \brief 4D int vector (\p ivec4 in GLSL)
@@ -121,13 +121,13 @@ namespace Glsl
     /// sf::Glsl::Ivec4 color = sf::Color::Cyan;
     /// \endcode
     ////////////////////////////////////////////////////////////
-    typedef implementation-defined Ivec4;
+    using Ivec4 = implementation-defined;
 
     ////////////////////////////////////////////////////////////
     /// \brief 4D bool vector (\p bvec4 in GLSL)
     ///
     ////////////////////////////////////////////////////////////
-    typedef implementation-defined Bvec4;
+    using Bvec4 = implementation-defined;
 
     ////////////////////////////////////////////////////////////
     /// \brief 3x3 float matrix (\p mat3 in GLSL)
@@ -152,7 +152,7 @@ namespace Glsl
     /// sf::Glsl::Mat3 matrix = transform;
     /// \endcode
     ////////////////////////////////////////////////////////////
-    typedef implementation-defined Mat3;
+    using Mat3 = implementation-defined;
 
     ////////////////////////////////////////////////////////////
     /// \brief 4x4 float matrix (\p mat4 in GLSL)
@@ -178,15 +178,15 @@ namespace Glsl
     /// sf::Glsl::Mat4 matrix = transform;
     /// \endcode
     ////////////////////////////////////////////////////////////
-    typedef implementation-defined Mat4;
+    using Mat4 = implementation-defined;
 
 #else // SFML_DOXYGEN
 
-    typedef priv::Vector4<float> Vec4;
-    typedef priv::Vector4<int> Ivec4;
-    typedef priv::Vector4<bool> Bvec4;
-    typedef priv::Matrix<3, 3> Mat3;
-    typedef priv::Matrix<4, 4> Mat4;
+    using Vec4 = priv::Vector4<float>;
+    using Ivec4 = priv::Vector4<int>;
+    using Bvec4 = priv::Vector4<bool>;
+    using Mat3 = priv::Matrix<3, 3>;
+    using Mat4 = priv::Matrix<4, 4>;
 
 #endif // SFML_DOXYGEN
 
@@ -205,7 +205,7 @@ namespace Glsl
 /// These types are exclusively used by the sf::Shader class.
 ///
 /// Types that already exist in SFML, such as \ref sf::Vector2<T>
-/// and \ref sf::Vector3<T>, are reused as typedefs, so you can use
+/// and \ref sf::Vector3<T>, are reused as type aliases, so you can use
 /// the types in this namespace as well as the original ones.
 /// Others are newly defined, such as Glsl::Vec4 or Glsl::Mat3. Their
 /// actual type is an implementation detail and should not be used.
diff --git a/include/SFML/Graphics/Rect.hpp b/include/SFML/Graphics/Rect.hpp
index 22f8c9cd..68574553 100644
--- a/include/SFML/Graphics/Rect.hpp
+++ b/include/SFML/Graphics/Rect.hpp
@@ -212,9 +212,9 @@ bool operator !=(const Rect<T>& left, const Rect<T>& right);
 
 #include <SFML/Graphics/Rect.inl>
 
-// Create typedefs for the most common types
-typedef Rect<int>   IntRect;
-typedef Rect<float> FloatRect;
+// Create type aliases for the most common types
+using IntRect = Rect<int>;
+using FloatRect = Rect<float>;
 
 } // namespace sf
 
@@ -245,7 +245,7 @@ typedef Rect<float> FloatRect;
 /// don't intersect.
 ///
 /// sf::Rect is a template and may be used with any numeric type, but
-/// for simplicity the instantiations used by SFML are typedef'd:
+/// for simplicity type aliases for the instantiations used by SFML are given:
 /// \li sf::Rect<int> is sf::IntRect
 /// \li sf::Rect<float> is sf::FloatRect
 ///
diff --git a/include/SFML/Graphics/Shader.hpp b/include/SFML/Graphics/Shader.hpp
index cb2fb9f2..f930a50e 100644
--- a/include/SFML/Graphics/Shader.hpp
+++ b/include/SFML/Graphics/Shader.hpp
@@ -739,8 +739,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef std::unordered_map<int, const Texture*> TextureTable;
-    typedef std::unordered_map<std::string, int> UniformTable;
+    using TextureTable = std::unordered_map<int, const Texture *>;
+    using UniformTable = std::unordered_map<std::string, int>;
 
     ////////////////////////////////////////////////////////////
     // Member data
diff --git a/include/SFML/Network/Http.hpp b/include/SFML/Network/Http.hpp
index ab2c6772..32a28512 100644
--- a/include/SFML/Network/Http.hpp
+++ b/include/SFML/Network/Http.hpp
@@ -173,7 +173,7 @@ public:
         ////////////////////////////////////////////////////////////
         // Types
         ////////////////////////////////////////////////////////////
-        typedef std::map<std::string, std::string> FieldTable; // Use an ordered map for predictable payloads
+        using FieldTable = std::map<std::string, std::string>; // Use an ordered map for predictable payloads
 
         ////////////////////////////////////////////////////////////
         // Member data
@@ -333,7 +333,7 @@ public:
         ////////////////////////////////////////////////////////////
         // Types
         ////////////////////////////////////////////////////////////
-        typedef std::map<std::string, std::string> FieldTable; // Use an ordered map for predictable payloads
+        using FieldTable = std::map<std::string, std::string>; // Use an ordered map for predictable payloads
 
         ////////////////////////////////////////////////////////////
         // Member data
diff --git a/include/SFML/Network/Packet.hpp b/include/SFML/Network/Packet.hpp
index 7056009a..2f7ea123 100644
--- a/include/SFML/Network/Packet.hpp
+++ b/include/SFML/Network/Packet.hpp
@@ -47,7 +47,7 @@ class UdpSocket;
 class SFML_NETWORK_API Packet
 {
     // A bool-like type that cannot be converted to integer or pointer types
-    typedef bool (Packet::*BoolType)(std::size_t);
+    using BoolType = bool (Packet::*)(std::size_t);
 
 public:
 
diff --git a/include/SFML/Network/SocketHandle.hpp b/include/SFML/Network/SocketHandle.hpp
index 20dea0b9..821d7b6a 100644
--- a/include/SFML/Network/SocketHandle.hpp
+++ b/include/SFML/Network/SocketHandle.hpp
@@ -43,11 +43,11 @@ namespace sf
 ////////////////////////////////////////////////////////////
 #if defined(SFML_SYSTEM_WINDOWS)
 
-    typedef UINT_PTR SocketHandle;
+    using SocketHandle = UINT_PTR;
 
 #else
 
-    typedef int SocketHandle;
+    using SocketHandle = int;
 
 #endif
 
diff --git a/include/SFML/System/String.hpp b/include/SFML/System/String.hpp
index c48d7c40..025b9acd 100644
--- a/include/SFML/System/String.hpp
+++ b/include/SFML/System/String.hpp
@@ -49,8 +49,8 @@ public:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef std::basic_string<Uint32>::iterator       Iterator;      //!< Iterator type
-    typedef std::basic_string<Uint32>::const_iterator ConstIterator; //!< Read-only iterator type
+    using Iterator = std::basic_string<Uint32>::iterator;      //!< Iterator type
+    using ConstIterator = std::basic_string<Uint32>::const_iterator; //!< Read-only iterator type
 
     ////////////////////////////////////////////////////////////
     // Static member data
diff --git a/include/SFML/System/Utf.hpp b/include/SFML/System/Utf.hpp
index f614d796..8b94b9aa 100644
--- a/include/SFML/System/Utf.hpp
+++ b/include/SFML/System/Utf.hpp
@@ -730,10 +730,10 @@ public:
 
 #include <SFML/System/Utf.inl>
 
-// Make typedefs to get rid of the template syntax
-typedef Utf<8>  Utf8;
-typedef Utf<16> Utf16;
-typedef Utf<32> Utf32;
+// Make type aliases to get rid of the template syntax
+using Utf8 = Utf<8>;
+using Utf16 = Utf<16>;
+using Utf32 = Utf<32>;
 
 } // namespace sf
 
@@ -756,8 +756,8 @@ typedef Utf<32> Utf32;
 /// can use any character / string type for a given encoding.
 ///
 /// It has 3 specializations:
-/// \li sf::Utf<8> (typedef'd to sf::Utf8)
-/// \li sf::Utf<16> (typedef'd to sf::Utf16)
-/// \li sf::Utf<32> (typedef'd to sf::Utf32)
+/// \li sf::Utf<8> (with sf::Utf8 type alias)
+/// \li sf::Utf<16> (with sf::Utf16 type alias)
+/// \li sf::Utf<32> (with sf::Utf32 type alias)
 ///
 ////////////////////////////////////////////////////////////
diff --git a/include/SFML/System/Vector2.hpp b/include/SFML/System/Vector2.hpp
index e064c434..4b498427 100644
--- a/include/SFML/System/Vector2.hpp
+++ b/include/SFML/System/Vector2.hpp
@@ -250,9 +250,9 @@ bool operator !=(const Vector2<T>& left, const Vector2<T>& right);
 #include <SFML/System/Vector2.inl>
 
 // Define the most common types
-typedef Vector2<int>          Vector2i;
-typedef Vector2<unsigned int> Vector2u;
-typedef Vector2<float>        Vector2f;
+using Vector2i = Vector2<int>;
+using Vector2u = Vector2<unsigned int>;
+using Vector2f = Vector2<float>;
 
 } // namespace sf
 
@@ -274,7 +274,7 @@ typedef Vector2<float>        Vector2f;
 /// and comparisons (==, !=), for example int or float.
 ///
 /// You generally don't have to care about the templated form (sf::Vector2<T>),
-/// the most common specializations have special typedefs:
+/// the most common specializations have special type aliases:
 /// \li sf::Vector2<float> is sf::Vector2f
 /// \li sf::Vector2<int> is sf::Vector2i
 /// \li sf::Vector2<unsigned int> is sf::Vector2u
diff --git a/include/SFML/System/Vector3.hpp b/include/SFML/System/Vector3.hpp
index 5a8c5f24..3e186c95 100644
--- a/include/SFML/System/Vector3.hpp
+++ b/include/SFML/System/Vector3.hpp
@@ -252,8 +252,8 @@ bool operator !=(const Vector3<T>& left, const Vector3<T>& right);
 #include <SFML/System/Vector3.inl>
 
 // Define the most common types
-typedef Vector3<int>   Vector3i;
-typedef Vector3<float> Vector3f;
+using Vector3i = Vector3<int>;
+using Vector3f = Vector3<float>;
 
 } // namespace sf
 
@@ -275,7 +275,7 @@ typedef Vector3<float> Vector3f;
 /// and comparisons (==, !=), for example int or float.
 ///
 /// You generally don't have to care about the templated form (sf::Vector3<T>),
-/// the most common specializations have special typedefs:
+/// the most common specializations have special type aliases:
 /// \li sf::Vector3<float> is sf::Vector3f
 /// \li sf::Vector3<int> is sf::Vector3i
 ///
diff --git a/include/SFML/Window/Context.hpp b/include/SFML/Window/Context.hpp
index 73dc2cd4..febce11c 100644
--- a/include/SFML/Window/Context.hpp
+++ b/include/SFML/Window/Context.hpp
@@ -41,7 +41,7 @@ namespace priv
     class GlContext;
 }
 
-typedef void (*GlFunctionPointer)();
+using GlFunctionPointer = void (*)();
 
 ////////////////////////////////////////////////////////////
 /// \brief Class holding a valid drawing context
diff --git a/include/SFML/Window/GlResource.hpp b/include/SFML/Window/GlResource.hpp
index dcc4f43d..e770ba9f 100644
--- a/include/SFML/Window/GlResource.hpp
+++ b/include/SFML/Window/GlResource.hpp
@@ -37,7 +37,7 @@ namespace sf
 
 class Context;
 
-typedef void(*ContextDestroyCallback)(void*);
+using ContextDestroyCallback = void (*)(void *);
 
 ////////////////////////////////////////////////////////////
 /// \brief Base class for classes that require an OpenGL context
diff --git a/include/SFML/Window/Vulkan.hpp b/include/SFML/Window/Vulkan.hpp
index 7454c989..0dc8ab57 100644
--- a/include/SFML/Window/Vulkan.hpp
+++ b/include/SFML/Window/Vulkan.hpp
@@ -34,15 +34,15 @@
 #include <stdint.h>
 
 
-typedef struct VkInstance_T* VkInstance;
+using VkInstance = struct VkInstance_T*;
 
 #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
 
-typedef struct VkSurfaceKHR_T* VkSurfaceKHR;
+using VkSurfaceKHR = struct VkSurfaceKHR_T*;
 
 #else
 
-typedef uint64_t VkSurfaceKHR;
+using VkSurfaceKHR = uint64_t;
 
 #endif
 
@@ -52,7 +52,7 @@ struct VkAllocationCallbacks;
 namespace sf
 {
 
-typedef void (*VulkanFunctionPointer)();
+using VulkanFunctionPointer = void (*)();
 
 ////////////////////////////////////////////////////////////
 /// \brief Vulkan helper functions
@@ -109,6 +109,6 @@ public:
 /// \class sf::Vulkan
 /// \ingroup window
 ///
-/// 
+///
 ///
 ////////////////////////////////////////////////////////////
diff --git a/include/SFML/Window/WindowBase.hpp b/include/SFML/Window/WindowBase.hpp
index e3eaf6fe..fbbe76eb 100644
--- a/include/SFML/Window/WindowBase.hpp
+++ b/include/SFML/Window/WindowBase.hpp
@@ -384,7 +384,7 @@ public:
     /// \brief Get the OS-specific handle of the window
     ///
     /// The type of the returned handle is sf::WindowHandle,
-    /// which is a typedef to the handle type defined by the OS.
+    /// which is a type alias to the handle type defined by the OS.
     /// You shouldn't need to use this function, unless you have
     /// very specific stuff to implement that SFML doesn't support,
     /// or implement a temporary workaround until a bug is fixed.
diff --git a/include/SFML/Window/WindowHandle.hpp b/include/SFML/Window/WindowHandle.hpp
index 8c35ef4a..eb78107d 100644
--- a/include/SFML/Window/WindowHandle.hpp
+++ b/include/SFML/Window/WindowHandle.hpp
@@ -30,7 +30,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.hpp>
 
-// Windows' HWND is a typedef on struct HWND__*
+// Windows' HWND is a type alias for struct HWND__*
 #if defined(SFML_SYSTEM_WINDOWS)
     struct HWND__;
 #endif
@@ -40,32 +40,32 @@ namespace sf
 #if defined(SFML_SYSTEM_WINDOWS)
 
     // Window handle is HWND (HWND__*) on Windows
-    typedef HWND__* WindowHandle;
+    using WindowHandle = HWND__ *;
 
 #elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_OPENBSD) || defined(SFML_SYSTEM_NETBSD)
 
     // Window handle is Window (unsigned long) on Unix - X11
-    typedef unsigned long WindowHandle;
+    using WindowHandle = unsigned long;
 
 #elif defined(SFML_SYSTEM_MACOS)
 
     // Window handle is NSWindow or NSView (void*) on Mac OS X - Cocoa
-    typedef void* WindowHandle;
+    using WindowHandle = void*;
 
 #elif defined(SFML_SYSTEM_IOS)
 
     // Window handle is UIWindow (void*) on iOS - UIKit
-    typedef void* WindowHandle;
+    using WindowHandle = void*;
 
 #elif defined(SFML_SYSTEM_ANDROID)
 
     // Window handle is ANativeWindow* (void*) on Android
-    typedef void* WindowHandle;
+    using WindowHandle = void*;
 
 #elif defined(SFML_DOXYGEN)
 
-    // Define typedef symbol so that Doxygen can attach some documentation to it
-    typedef "platform-specific" WindowHandle;
+    // Define type alias symbol so that Doxygen can attach some documentation to it
+    using WindowHandle = "platform-specific";
 
 #endif
 
diff --git a/src/SFML/Graphics/RenderTarget.cpp b/src/SFML/Graphics/RenderTarget.cpp
index e7ac0e69..9ab9cf75 100644
--- a/src/SFML/Graphics/RenderTarget.cpp
+++ b/src/SFML/Graphics/RenderTarget.cpp
@@ -71,7 +71,7 @@ namespace
 
         // Map to help us detect whether a different RenderTarget
         // has been activated within a single context
-        typedef std::unordered_map<sf::Uint64, sf::Uint64> ContextRenderTargetMap;
+        using ContextRenderTargetMap = std::unordered_map<sf::Uint64, sf::Uint64>;
         ContextRenderTargetMap contextRenderTargetMap;
 
         // Check if a RenderTarget with the given ID is active in the current context
diff --git a/src/SFML/Main/SFMLActivity.cpp b/src/SFML/Main/SFMLActivity.cpp
index fb3a2105..9cce1bd7 100644
--- a/src/SFML/Main/SFMLActivity.cpp
+++ b/src/SFML/Main/SFMLActivity.cpp
@@ -35,7 +35,7 @@
 #define LOGE(...) ((void)__android_log_print(ANDROID_LOG_INFO, "sfml-activity", __VA_ARGS__))
 
 namespace {
-    typedef void (*activityOnCreatePointer)(ANativeActivity*, void*, size_t);
+    using activityOnCreatePointer = void (*)(ANativeActivity*, void*, size_t);
 }
 
 const char *getLibraryName(JNIEnv* lJNIEnv, jobject& objectActivityInfo)
diff --git a/src/SFML/Network/Unix/SocketImpl.hpp b/src/SFML/Network/Unix/SocketImpl.hpp
index c43fa401..bcf795d7 100644
--- a/src/SFML/Network/Unix/SocketImpl.hpp
+++ b/src/SFML/Network/Unix/SocketImpl.hpp
@@ -54,8 +54,8 @@ public:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef socklen_t AddrLength;
-    typedef size_t Size;
+    using AddrLength = socklen_t;
+    using Size = size_t;
 
     ////////////////////////////////////////////////////////////
     /// \brief Create an internal sockaddr_in address
diff --git a/src/SFML/Network/Win32/SocketImpl.hpp b/src/SFML/Network/Win32/SocketImpl.hpp
index 3663719e..5d6b398d 100644
--- a/src/SFML/Network/Win32/SocketImpl.hpp
+++ b/src/SFML/Network/Win32/SocketImpl.hpp
@@ -57,8 +57,8 @@ public:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef int AddrLength;
-    typedef int Size;
+    using AddrLength = int;
+    using Size = int;
 
     ////////////////////////////////////////////////////////////
     /// \brief Create an internal sockaddr_in address
diff --git a/src/SFML/Window/GlContext.cpp b/src/SFML/Window/GlContext.cpp
index 149d773e..2250128e 100644
--- a/src/SFML/Window/GlContext.cpp
+++ b/src/SFML/Window/GlContext.cpp
@@ -48,12 +48,12 @@
 
     #if defined(SFML_OPENGL_ES)
 
-        typedef sf::priv::EglContext ContextType;
+        using ContextType = sf::priv::EglContext;
 
     #else
 
         #include <SFML/Window/Win32/WglContext.hpp>
-        typedef sf::priv::WglContext ContextType;
+        using ContextType = sf::priv::WglContext;
 
     #endif
 
@@ -61,48 +61,48 @@
 
     #if defined(SFML_OPENGL_ES)
 
-        typedef sf::priv::EglContext ContextType;
+        using ContextType = sf::priv::EglContext;
 
     #else
 
         #include <SFML/Window/Unix/GlxContext.hpp>
-        typedef sf::priv::GlxContext ContextType;
+        using ContextType = sf::priv::GlxContext;
 
     #endif
 
 #elif defined(SFML_SYSTEM_MACOS)
 
     #include <SFML/Window/OSX/SFContext.hpp>
-    typedef sf::priv::SFContext ContextType;
+    using ContextType = sf::priv::SFContext;
 
 #elif defined(SFML_SYSTEM_IOS)
 
     #include <SFML/Window/iOS/EaglContext.hpp>
-    typedef sf::priv::EaglContext ContextType;
+    using ContextType = sf::priv::EaglContext;
 
 #elif defined(SFML_SYSTEM_ANDROID)
 
-    typedef sf::priv::EglContext ContextType;
+    using ContextType = sf::priv::EglContext;
 
 #endif
 
 #if defined(SFML_SYSTEM_WINDOWS)
 
-    typedef void (APIENTRY *glEnableFuncType)(GLenum);
-    typedef GLenum (APIENTRY *glGetErrorFuncType)();
-    typedef void (APIENTRY *glGetIntegervFuncType)(GLenum, GLint*);
-    typedef const GLubyte* (APIENTRY *glGetStringFuncType)(GLenum);
-    typedef const GLubyte* (APIENTRY *glGetStringiFuncType)(GLenum, GLuint);
-    typedef GLboolean (APIENTRY *glIsEnabledFuncType)(GLenum);
+    using glEnableFuncType = void (APIENTRY *)(GLenum);
+    using glGetErrorFuncType = GLenum (APIENTRY *)();
+    using glGetIntegervFuncType = void (APIENTRY *)(GLenum, GLint*);
+    using glGetStringFuncType = const GLubyte* (APIENTRY *)(GLenum);
+    using glGetStringiFuncType = const GLubyte* (APIENTRY *)(GLenum, GLuint);
+    using glIsEnabledFuncType = GLboolean (APIENTRY *)(GLenum);
 
 #else
 
-    typedef void (*glEnableFuncType)(GLenum);
-    typedef GLenum (*glGetErrorFuncType)();
-    typedef void (*glGetIntegervFuncType)(GLenum, GLint*);
-    typedef const GLubyte* (*glGetStringFuncType)(GLenum);
-    typedef const GLubyte* (*glGetStringiFuncType)(GLenum, GLuint);
-    typedef GLboolean (*glIsEnabledFuncType)(GLenum);
+    using glEnableFuncType = void (*)(GLenum);
+    using glGetErrorFuncType = GLenum (*)();
+    using glGetIntegervFuncType = void (*)(GLenum, GLint*);
+    using glGetStringFuncType = const GLubyte* (*)(GLenum);
+    using glGetStringiFuncType = const GLubyte* (*)(GLenum, GLuint);
+    using glIsEnabledFuncType = GLboolean (*)(GLenum);
 
 #endif
 
@@ -176,7 +176,7 @@ namespace
         // context is going to be destroyed
         // Unshareable OpenGL resources rely on this to clean up properly
         // whenever a context containing them is destroyed
-        typedef std::unordered_map<sf::ContextDestroyCallback, void*> ContextDestroyCallbacks;
+        using ContextDestroyCallbacks = std::unordered_map<sf::ContextDestroyCallback, void *>;
         ContextDestroyCallbacks contextDestroyCallbacks;
 
         // This structure contains all the state necessary to
diff --git a/src/SFML/Window/OSX/AutoreleasePoolWrapper.hpp b/src/SFML/Window/OSX/AutoreleasePoolWrapper.hpp
index bbe4763a..e75bd841 100644
--- a/src/SFML/Window/OSX/AutoreleasePoolWrapper.hpp
+++ b/src/SFML/Window/OSX/AutoreleasePoolWrapper.hpp
@@ -32,11 +32,11 @@
 #ifdef __OBJC__
 
 @class NSAutoreleasePool;
-typedef NSAutoreleasePool* NSAutoreleasePoolRef;
+using NSAutoreleasePoolRef = NSAutoreleasePool*;
 
 #else // If C++
 
-typedef void* NSAutoreleasePoolRef;
+using NSAutoreleasePoolRef = void*;
 
 #endif
 
diff --git a/src/SFML/Window/OSX/CursorImpl.hpp b/src/SFML/Window/OSX/CursorImpl.hpp
index fe950914..5ab9d03c 100644
--- a/src/SFML/Window/OSX/CursorImpl.hpp
+++ b/src/SFML/Window/OSX/CursorImpl.hpp
@@ -39,11 +39,11 @@
 #ifdef __OBJC__
 
 @class NSCursor;
-typedef NSCursor* NSCursorRef;
+using NSCursorRef = NSCursor*;
 
 #else // If C++
 
-typedef void* NSCursorRef;
+using NSCursorRef = void*;
 
 #endif
 
diff --git a/src/SFML/Window/OSX/HIDInputManager.hpp b/src/SFML/Window/OSX/HIDInputManager.hpp
index 2d0b001f..e5ad4fd1 100644
--- a/src/SFML/Window/OSX/HIDInputManager.hpp
+++ b/src/SFML/Window/OSX/HIDInputManager.hpp
@@ -42,7 +42,7 @@ namespace sf
 namespace priv
 {
 
-typedef std::vector<IOHIDElementRef> IOHIDElements;
+using IOHIDElements = std::vector<IOHIDElementRef>;
 
 ////////////////////////////////////////////////////////////
 /// \brief sf::priv::InputImpl helper
diff --git a/src/SFML/Window/OSX/JoystickImpl.hpp b/src/SFML/Window/OSX/JoystickImpl.hpp
index 4d0da40e..b640769f 100644
--- a/src/SFML/Window/OSX/JoystickImpl.hpp
+++ b/src/SFML/Window/OSX/JoystickImpl.hpp
@@ -116,9 +116,9 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    typedef long                                                    Location;
-    typedef std::unordered_map<sf::Joystick::Axis, IOHIDElementRef> AxisMap;
-    typedef std::vector<IOHIDElementRef>                            ButtonsVector;
+    using Location = long;
+    using AxisMap = std::unordered_map<sf::Joystick::Axis, IOHIDElementRef>;
+    using ButtonsVector = std::vector<IOHIDElementRef>;
 
     AxisMap                  m_axis;           ///< Axes (but not POV/Hat) of the joystick
     IOHIDElementRef          m_hat;            ///< POV/Hat axis of the joystick
diff --git a/src/SFML/Window/OSX/SFContext.hpp b/src/SFML/Window/OSX/SFContext.hpp
index 5d231358..417bea26 100644
--- a/src/SFML/Window/OSX/SFContext.hpp
+++ b/src/SFML/Window/OSX/SFContext.hpp
@@ -37,19 +37,19 @@
 #ifdef __OBJC__
 
 @class NSOpenGLContext;
-typedef NSOpenGLContext* NSOpenGLContextRef;
+using NSOpenGLContextRef = NSOpenGLContext*;
 
 @class NSOpenGLView;
-typedef NSOpenGLView* NSOpenGLViewRef;
+using NSOpenGLViewRef = NSOpenGLView*;
 
 @class NSWindow;
-typedef NSWindow* NSWindowRef;
+using NSWindowRef = NSWindow*;
 
 #else // If C++
 
-typedef void* NSOpenGLContextRef;
-typedef void* NSOpenGLViewRef;
-typedef void* NSWindowRef;
+using NSOpenGLContextRef = void*;
+using NSOpenGLViewRef = void*;
+using NSWindowRef = void*;
 
 #endif
 
diff --git a/src/SFML/Window/OSX/WindowImplCocoa.hpp b/src/SFML/Window/OSX/WindowImplCocoa.hpp
index 005eb76c..6756ec02 100644
--- a/src/SFML/Window/OSX/WindowImplCocoa.hpp
+++ b/src/SFML/Window/OSX/WindowImplCocoa.hpp
@@ -39,17 +39,17 @@
 #ifdef __OBJC__
 
 #import <SFML/Window/OSX/WindowImplDelegateProtocol.h>
-typedef id<WindowImplDelegateProtocol,NSObject> WindowImplDelegateRef;
+using WindowImplDelegateRef = id<WindowImplDelegateProtocol,NSObject>;
 
 @class NSOpenGLContext;
-typedef NSOpenGLContext* NSOpenGLContextRef;
+using NSOpenGLContextRef = NSOpenGLContext*;
 
 #else // If C++
 
-typedef unsigned short unichar; // See NSString.h
+using unichar = unsigned short; // See NSString.h
 
-typedef void* WindowImplDelegateRef;
-typedef void* NSOpenGLContextRef;
+using WindowImplDelegateRef = void*;
+using NSOpenGLContextRef = void*;
 
 #endif
 
diff --git a/src/SFML/Window/Unix/Display.cpp b/src/SFML/Window/Unix/Display.cpp
index f2e82fd3..0e7050ce 100644
--- a/src/SFML/Window/Unix/Display.cpp
+++ b/src/SFML/Window/Unix/Display.cpp
@@ -42,7 +42,7 @@ namespace
     unsigned int referenceCount = 0;
     sf::Mutex mutex;
 
-    typedef std::unordered_map<std::string, Atom> AtomMap;
+    using AtomMap = std::unordered_map<std::string, Atom>;
     AtomMap atoms;
 }
 
diff --git a/src/SFML/Window/Unix/JoystickImpl.cpp b/src/SFML/Window/Unix/JoystickImpl.cpp
index 013a089d..e9091be9 100644
--- a/src/SFML/Window/Unix/JoystickImpl.cpp
+++ b/src/SFML/Window/Unix/JoystickImpl.cpp
@@ -48,7 +48,7 @@ namespace
         bool plugged;
     };
 
-    typedef std::vector<JoystickRecord> JoystickList;
+    using JoystickList = std::vector<JoystickRecord>;
     JoystickList joystickList;
 
     bool isJoystick(udev_device* udevDevice)
diff --git a/src/SFML/Window/Unix/WindowImplX11.cpp b/src/SFML/Window/Unix/WindowImplX11.cpp
index a026a4d6..5b422725 100644
--- a/src/SFML/Window/Unix/WindowImplX11.cpp
+++ b/src/SFML/Window/Unix/WindowImplX11.cpp
@@ -52,10 +52,10 @@
 
 #ifdef SFML_OPENGL_ES
     #include <SFML/Window/EglContext.hpp>
-    typedef sf::priv::EglContext ContextType;
+    using ContextType = sf::priv::EglContext;
 #else
     #include <SFML/Window/Unix/GlxContext.hpp>
-    typedef sf::priv::GlxContext ContextType;
+    using ContextType = sf::priv::GlxContext;
 #endif
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Vulkan.cpp b/src/SFML/Window/Vulkan.cpp
index 25533965..a109d35d 100644
--- a/src/SFML/Window/Vulkan.cpp
+++ b/src/SFML/Window/Vulkan.cpp
@@ -30,12 +30,12 @@
 #if defined(SFML_SYSTEM_WINDOWS)
 
 #include <SFML/Window/Win32/VulkanImplWin32.hpp>
-typedef sf::priv::VulkanImplWin32 VulkanImplType;
+using VulkanImplType = sf::priv::VulkanImplWin32;
 
 #elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_OPENBSD) || defined(SFML_SYSTEM_NETBSD)
 
 #include <SFML/Window/Unix/VulkanImplX11.hpp>
-typedef sf::priv::VulkanImplX11 VulkanImplType;
+using VulkanImplType = sf::priv::VulkanImplX11;
 
 #else
 
diff --git a/src/SFML/Window/Win32/JoystickImpl.cpp b/src/SFML/Window/Win32/JoystickImpl.cpp
index e2144cfa..22ecc896 100644
--- a/src/SFML/Window/Win32/JoystickImpl.cpp
+++ b/src/SFML/Window/Win32/JoystickImpl.cpp
@@ -78,7 +78,7 @@ namespace
         bool plugged;
     };
 
-    typedef std::vector<JoystickRecord> JoystickList;
+    using JoystickList = std::vector<JoystickRecord>;
     JoystickList joystickList;
 
     struct JoystickBlacklistEntry
@@ -87,7 +87,7 @@ namespace
         unsigned int productId;
     };
 
-    typedef std::vector<JoystickBlacklistEntry> JoystickBlacklist;
+    using JoystickBlacklist = std::vector<JoystickBlacklistEntry>;
     JoystickBlacklist joystickBlacklist;
 
     const DWORD directInputEventBufferSize = 32;
@@ -403,7 +403,7 @@ void JoystickImpl::initializeDInput()
     if (dinput8dll)
     {
         // Try to get the address of the DirectInput8Create entry point
-        typedef HRESULT(WINAPI *DirectInput8CreateFunc)(HINSTANCE, DWORD, REFIID, LPVOID*, LPUNKNOWN);
+        using DirectInput8CreateFunc = HRESULT (*)(HINSTANCE, DWORD, const IID &, LPVOID *, LPUNKNOWN);
         DirectInput8CreateFunc directInput8Create = reinterpret_cast<DirectInput8CreateFunc>(reinterpret_cast<void*>(GetProcAddress(dinput8dll, "DirectInput8Create")));
 
         if (directInput8Create)
diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp
index 15545a81..69ccfb7a 100755
--- a/src/SFML/Window/Win32/WindowImplWin32.cpp
+++ b/src/SFML/Window/Win32/WindowImplWin32.cpp
@@ -85,7 +85,7 @@ namespace
                 ProcessPerMonitorDpiAware = 2
             };
 
-            typedef HRESULT (WINAPI* SetProcessDpiAwarenessFuncType)(ProcessDpiAwareness);
+            using SetProcessDpiAwarenessFuncType = HRESULT (*)(ProcessDpiAwareness);
             SetProcessDpiAwarenessFuncType SetProcessDpiAwarenessFunc = reinterpret_cast<SetProcessDpiAwarenessFuncType>(reinterpret_cast<void*>(GetProcAddress(shCoreDll, "SetProcessDpiAwareness")));
 
             if (SetProcessDpiAwarenessFunc)
@@ -113,7 +113,7 @@ namespace
 
         if (user32Dll)
         {
-            typedef BOOL (WINAPI* SetProcessDPIAwareFuncType)(void);
+            using SetProcessDPIAwareFuncType = BOOL (*)();
             SetProcessDPIAwareFuncType SetProcessDPIAwareFunc = reinterpret_cast<SetProcessDPIAwareFuncType>(reinterpret_cast<void*>(GetProcAddress(user32Dll, "SetProcessDPIAware")));
 
             if (SetProcessDPIAwareFunc)
diff --git a/src/SFML/Window/WindowImpl.cpp b/src/SFML/Window/WindowImpl.cpp
index a13ce40d..15ddc302 100644
--- a/src/SFML/Window/WindowImpl.cpp
+++ b/src/SFML/Window/WindowImpl.cpp
@@ -36,37 +36,37 @@
 #if defined(SFML_SYSTEM_WINDOWS)
 
     #include <SFML/Window/Win32/WindowImplWin32.hpp>
-    typedef sf::priv::WindowImplWin32 WindowImplType;
+    using WindowImplType = sf::priv::WindowImplWin32;
 
     #include <SFML/Window/Win32/VulkanImplWin32.hpp>
-    typedef sf::priv::VulkanImplWin32 VulkanImplType;
+    using VulkanImplType = sf::priv::VulkanImplWin32;
 
 #elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_OPENBSD) || defined(SFML_SYSTEM_NETBSD)
 
     #include <SFML/Window/Unix/WindowImplX11.hpp>
-    typedef sf::priv::WindowImplX11 WindowImplType;
+    using WindowImplType = sf::priv::WindowImplX11;
 
     #include <SFML/Window/Unix/VulkanImplX11.hpp>
-    typedef sf::priv::VulkanImplX11 VulkanImplType;
+    using VulkanImplType = sf::priv::VulkanImplX11;
 
 #elif defined(SFML_SYSTEM_MACOS)
 
     #include <SFML/Window/OSX/WindowImplCocoa.hpp>
-    typedef sf::priv::WindowImplCocoa WindowImplType;
+    using WindowImplType = sf::priv::WindowImplCocoa;
 
     #define SFML_VULKAN_IMPLEMENTATION_NOT_AVAILABLE
 
 #elif defined(SFML_SYSTEM_IOS)
 
     #include <SFML/Window/iOS/WindowImplUIKit.hpp>
-    typedef sf::priv::WindowImplUIKit WindowImplType;
+    using WindowImplType = sf::priv::WindowImplUIKit;
 
     #define SFML_VULKAN_IMPLEMENTATION_NOT_AVAILABLE
 
 #elif defined(SFML_SYSTEM_ANDROID)
 
     #include <SFML/Window/Android/WindowImplAndroid.hpp>
-    typedef sf::priv::WindowImplAndroid WindowImplType;
+    using WindowImplType = sf::priv::WindowImplAndroid;
 
     #define SFML_VULKAN_IMPLEMENTATION_NOT_AVAILABLE