From 37de949d87831640113bc5a3e79bf64ed76edde6 Mon Sep 17 00:00:00 2001
From: vittorioromeo <mail@vittorioromeo.com>
Date: Mon, 30 Sep 2024 23:46:11 +0200
Subject: [PATCH] Actually, don't define

---
 include/SFML/Audio/Export.hpp         | 2 +-
 include/SFML/Audio/Music.hpp          | 2 +-
 include/SFML/Config.hpp               | 6 +++---
 include/SFML/Graphics/Export.hpp      | 2 +-
 include/SFML/Graphics/Transform.hpp   | 2 +-
 include/SFML/Graphics/Vertex.hpp      | 2 +-
 include/SFML/Graphics/VertexArray.hpp | 2 +-
 include/SFML/Network/Export.hpp       | 2 +-
 include/SFML/Network/Ftp.hpp          | 2 +-
 include/SFML/Network/Http.hpp         | 4 ++--
 include/SFML/Network/SocketHandle.hpp | 3 +--
 include/SFML/System/Export.hpp        | 2 +-
 include/SFML/System/Vector3.hpp       | 2 +-
 include/SFML/Window/Export.hpp        | 2 +-
 include/SFML/Window/WindowHandle.hpp  | 3 +--
 src/SFML/Graphics/GLCheck.hpp         | 2 +-
 src/SFML/Network/TcpSocket.cpp        | 2 +-
 src/SFML/Window/EGLCheck.hpp          | 2 +-
 18 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/include/SFML/Audio/Export.hpp b/include/SFML/Audio/Export.hpp
index 57248083d..c50efc0e2 100644
--- a/include/SFML/Audio/Export.hpp
+++ b/include/SFML/Audio/Export.hpp
@@ -31,7 +31,7 @@
 
 
 ////////////////////////////////////////////////////////////
-// Define portable import / export macros
+// Portable import / export macros
 ////////////////////////////////////////////////////////////
 #if defined(SFML_AUDIO_EXPORTS)
 
diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp
index 3b7fb7045..9073f087e 100644
--- a/include/SFML/Audio/Music.hpp
+++ b/include/SFML/Audio/Music.hpp
@@ -63,7 +63,7 @@ public:
         T length{}; //!< The length of the time range
     };
 
-    // Define the relevant Span types
+    // Associated `Span` type
     using TimeSpan = Span<Time>;
 
     ////////////////////////////////////////////////////////////
diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp
index 5a194283d..4714d1a0d 100644
--- a/include/SFML/Config.hpp
+++ b/include/SFML/Config.hpp
@@ -26,7 +26,7 @@
 
 
 ////////////////////////////////////////////////////////////
-// Define the SFML version
+// SFML version
 ////////////////////////////////////////////////////////////
 #define SFML_VERSION_MAJOR      3
 #define SFML_VERSION_MINOR      0
@@ -112,7 +112,7 @@
 
 
 ////////////////////////////////////////////////////////////
-// Define a portable debug macro
+// Portable debug macro
 ////////////////////////////////////////////////////////////
 #if !defined(NDEBUG)
 
@@ -122,7 +122,7 @@
 
 
 ////////////////////////////////////////////////////////////
-// Define helpers to create portable import / export macros for each module
+// Helpers to create portable import / export macros for each module
 ////////////////////////////////////////////////////////////
 #if !defined(SFML_STATIC)
 
diff --git a/include/SFML/Graphics/Export.hpp b/include/SFML/Graphics/Export.hpp
index 7ed198ae5..79b0554d4 100644
--- a/include/SFML/Graphics/Export.hpp
+++ b/include/SFML/Graphics/Export.hpp
@@ -31,7 +31,7 @@
 
 
 ////////////////////////////////////////////////////////////
-// Define portable import / export macros
+// Portable import / export macros
 ////////////////////////////////////////////////////////////
 #if defined(SFML_GRAPHICS_EXPORTS)
 
diff --git a/include/SFML/Graphics/Transform.hpp b/include/SFML/Graphics/Transform.hpp
index c20177cf3..0efd31cbf 100644
--- a/include/SFML/Graphics/Transform.hpp
+++ b/include/SFML/Graphics/Transform.hpp
@@ -41,7 +41,7 @@ namespace sf
 class Angle;
 
 ////////////////////////////////////////////////////////////
-/// \brief Define a 3x3 transform matrix
+/// \brief 3x3 transform matrix
 ///
 ////////////////////////////////////////////////////////////
 class Transform
diff --git a/include/SFML/Graphics/Vertex.hpp b/include/SFML/Graphics/Vertex.hpp
index f9fe52288..7fbdf9b58 100644
--- a/include/SFML/Graphics/Vertex.hpp
+++ b/include/SFML/Graphics/Vertex.hpp
@@ -35,7 +35,7 @@
 namespace sf
 {
 ////////////////////////////////////////////////////////////
-/// \brief Define a point with color and texture coordinates
+/// \brief Point with color and texture coordinates
 ///
 /// By default, the vertex color is white and texture coordinates are (0, 0).
 ///
diff --git a/include/SFML/Graphics/VertexArray.hpp b/include/SFML/Graphics/VertexArray.hpp
index 0be21acdd..6dc472819 100644
--- a/include/SFML/Graphics/VertexArray.hpp
+++ b/include/SFML/Graphics/VertexArray.hpp
@@ -45,7 +45,7 @@ namespace sf
 class RenderTarget;
 
 ////////////////////////////////////////////////////////////
-/// \brief Define a set of one or more 2D primitives
+/// \brief Set of one or more 2D primitives
 ///
 ////////////////////////////////////////////////////////////
 class SFML_GRAPHICS_API VertexArray : public Drawable
diff --git a/include/SFML/Network/Export.hpp b/include/SFML/Network/Export.hpp
index 981336b21..b5ba14acc 100644
--- a/include/SFML/Network/Export.hpp
+++ b/include/SFML/Network/Export.hpp
@@ -31,7 +31,7 @@
 
 
 ////////////////////////////////////////////////////////////
-// Define portable import / export macros
+// Portable import / export macros
 ////////////////////////////////////////////////////////////
 #if defined(SFML_NETWORK_EXPORTS)
 
diff --git a/include/SFML/Network/Ftp.hpp b/include/SFML/Network/Ftp.hpp
index ee1d316f4..ee95dd022 100644
--- a/include/SFML/Network/Ftp.hpp
+++ b/include/SFML/Network/Ftp.hpp
@@ -61,7 +61,7 @@ public:
     };
 
     ////////////////////////////////////////////////////////////
-    /// \brief Define a FTP response
+    /// \brief FTP response
     ///
     ////////////////////////////////////////////////////////////
     class SFML_NETWORK_API Response
diff --git a/include/SFML/Network/Http.hpp b/include/SFML/Network/Http.hpp
index 0380a9670..a911de475 100644
--- a/include/SFML/Network/Http.hpp
+++ b/include/SFML/Network/Http.hpp
@@ -50,7 +50,7 @@ class SFML_NETWORK_API Http
 {
 public:
     ////////////////////////////////////////////////////////////
-    /// \brief Define a HTTP request
+    /// \brief HTTP request
     ///
     ////////////////////////////////////////////////////////////
     class SFML_NETWORK_API Request
@@ -187,7 +187,7 @@ public:
     };
 
     ////////////////////////////////////////////////////////////
-    /// \brief Define a HTTP response
+    /// \brief HTTP response
     ///
     ////////////////////////////////////////////////////////////
     class SFML_NETWORK_API Response
diff --git a/include/SFML/Network/SocketHandle.hpp b/include/SFML/Network/SocketHandle.hpp
index 8c11c4bd9..f7963fa84 100644
--- a/include/SFML/Network/SocketHandle.hpp
+++ b/include/SFML/Network/SocketHandle.hpp
@@ -37,8 +37,7 @@
 namespace sf
 {
 ////////////////////////////////////////////////////////////
-// Define the low-level socket handle type, specific to
-// each platform
+// Low-level socket handle type, specific to each platform
 ////////////////////////////////////////////////////////////
 #if defined(SFML_SYSTEM_WINDOWS)
 
diff --git a/include/SFML/System/Export.hpp b/include/SFML/System/Export.hpp
index a6e99ec74..3dcb38398 100644
--- a/include/SFML/System/Export.hpp
+++ b/include/SFML/System/Export.hpp
@@ -31,7 +31,7 @@
 
 
 ////////////////////////////////////////////////////////////
-// Define portable import / export macros
+// Portable import / export macros
 ////////////////////////////////////////////////////////////
 #if defined(SFML_SYSTEM_EXPORTS)
 
diff --git a/include/SFML/System/Vector3.hpp b/include/SFML/System/Vector3.hpp
index 78b0f874b..49e6674a2 100644
--- a/include/SFML/System/Vector3.hpp
+++ b/include/SFML/System/Vector3.hpp
@@ -308,7 +308,7 @@ template <typename T>
 template <typename T>
 [[nodiscard]] constexpr bool operator!=(const Vector3<T>& left, const Vector3<T>& right);
 
-// Define the most common types
+// Aliases for the most common types
 using Vector3i = Vector3<int>;
 using Vector3f = Vector3<float>;
 
diff --git a/include/SFML/Window/Export.hpp b/include/SFML/Window/Export.hpp
index a0e04608c..5eaaefcb1 100644
--- a/include/SFML/Window/Export.hpp
+++ b/include/SFML/Window/Export.hpp
@@ -31,7 +31,7 @@
 
 
 ////////////////////////////////////////////////////////////
-// Define portable import / export macros
+// Portable import / export macros
 ////////////////////////////////////////////////////////////
 #if defined(SFML_WINDOW_EXPORTS)
 
diff --git a/include/SFML/Window/WindowHandle.hpp b/include/SFML/Window/WindowHandle.hpp
index e2c06ef46..7456ae31a 100644
--- a/include/SFML/Window/WindowHandle.hpp
+++ b/include/SFML/Window/WindowHandle.hpp
@@ -76,8 +76,7 @@ using WindowHandle = "platform-specific";
 /// \typedef sf::WindowHandle
 /// \ingroup window
 ///
-/// Define a low-level window handle type, specific to
-/// each platform.
+/// Low-level window handle type, specific to each platform.
 ///
 /// Platform        | Type
 /// ----------------|------------------------------------------------------------
diff --git a/src/SFML/Graphics/GLCheck.hpp b/src/SFML/Graphics/GLCheck.hpp
index 7368d12f7..ef11943c8 100644
--- a/src/SFML/Graphics/GLCheck.hpp
+++ b/src/SFML/Graphics/GLCheck.hpp
@@ -53,7 +53,7 @@ namespace sf::priv
 bool glCheckError(const std::filesystem::path& file, unsigned int line, std::string_view expression);
 
 ////////////////////////////////////////////////////////////
-/// Define a macro to quickly check every OpenGL API call
+/// Macro to quickly check every OpenGL API call
 ////////////////////////////////////////////////////////////
 #ifdef SFML_DEBUG
 // In debug mode, perform a test on every OpenGL call
diff --git a/src/SFML/Network/TcpSocket.cpp b/src/SFML/Network/TcpSocket.cpp
index cbaa17187..53649a7dc 100644
--- a/src/SFML/Network/TcpSocket.cpp
+++ b/src/SFML/Network/TcpSocket.cpp
@@ -45,7 +45,7 @@
 
 namespace
 {
-// Define the low-level send/receive flags, which depend on the OS
+// Low-level send/receive flags (OS-dependent)
 #ifdef SFML_SYSTEM_LINUX
 const int flags = MSG_NOSIGNAL;
 #else
diff --git a/src/SFML/Window/EGLCheck.hpp b/src/SFML/Window/EGLCheck.hpp
index 523577535..4ca6247cb 100644
--- a/src/SFML/Window/EGLCheck.hpp
+++ b/src/SFML/Window/EGLCheck.hpp
@@ -53,7 +53,7 @@ namespace sf::priv
 bool eglCheckError(const std::filesystem::path& file, unsigned int line, std::string_view expression);
 
 ////////////////////////////////////////////////////////////
-/// Define a macro to quickly check every EGL API call
+/// Macro to quickly check every EGL API call
 ////////////////////////////////////////////////////////////
 #ifdef SFML_DEBUG