Changed Doxygen single-line comment format

Single line comments starting with `///` are interpreted by
Microsoft Visual Studio as documentation containing XML code.

Therefore single line comments starting with `///<` unfortunately
cause a parsing error, as IntelliSense will assume the `<` is the
start of an XML tag. This is not the case, but unfortunately,
IntelliSense will still complain about the following space
character rather than displaying the raw string. This commit alters
all such comments to start with `//!<` instead, which prevents the
issue.

This fixes issue #1622.

include/SFML/Audio/InputSoundFile.hpp

@@ -206,13 +206,13 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    SoundFileReader* m_reader;       ///< Reader that handles I/O on the file's format
-    InputStream*     m_stream;       ///< Input stream used to access the file's data
-    bool             m_streamOwned;  ///< Is the stream internal or external?
-    Uint64           m_sampleOffset; ///< Sample Read Position
-    Uint64           m_sampleCount;  ///< Total number of samples in the file
-    unsigned int     m_channelCount; ///< Number of channels of the sound
-    unsigned int     m_sampleRate;   ///< Number of samples per second
+    SoundFileReader* m_reader;       //!< Reader that handles I/O on the file's format
+    InputStream*     m_stream;       //!< Input stream used to access the file's data
+    bool             m_streamOwned;  //!< Is the stream internal or external?
+    Uint64           m_sampleOffset; //!< Sample Read Position
+    Uint64           m_sampleCount;  //!< Total number of samples in the file
+    unsigned int     m_channelCount; //!< Number of channels of the sound
+    unsigned int     m_sampleRate;   //!< Number of samples per second
 };
 
 } // namespace sf

include/SFML/Audio/Music.hpp

@@ -79,8 +79,8 @@ public:
 
         }
 
-        T offset; ///< The beginning offset of the time range
-        T length; ///< The length of the time range
+        T offset; //!< The beginning offset of the time range
+        T length; //!< The length of the time range
     };
 
     // Define the relevant Span types
@@ -276,10 +276,10 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    InputSoundFile     m_file;     ///< The streamed music file
-    std::vector<Int16> m_samples;  ///< Temporary buffer of samples
-    Mutex              m_mutex;    ///< Mutex protecting the data
-    Span<Uint64>       m_loopSpan; ///< Loop Range Specifier
+    InputSoundFile     m_file;     //!< The streamed music file
+    std::vector<Int16> m_samples;  //!< Temporary buffer of samples
+    Mutex              m_mutex;    //!< Mutex protecting the data
+    Span<Uint64>       m_loopSpan; //!< Loop Range Specifier
 };
 
 } // namespace sf

include/SFML/Audio/OutputSoundFile.hpp

@@ -93,7 +93,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    SoundFileWriter* m_writer; ///< Writer that handles I/O on the file's format
+    SoundFileWriter* m_writer; //!< Writer that handles I/O on the file's format
 };
 
 } // namespace sf

include/SFML/Audio/Sound.hpp

@@ -217,7 +217,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    const SoundBuffer* m_buffer; ///< Sound buffer bound to the source
+    const SoundBuffer* m_buffer; //!< Sound buffer bound to the source
 };
 
 } // namespace sf

include/SFML/Audio/SoundBuffer.hpp

@@ -267,15 +267,15 @@ private:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef std::set<Sound*> SoundList; ///< Set of unique sound instances
+    typedef std::set<Sound*> SoundList; //!< Set of unique sound instances
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    unsigned int       m_buffer;   ///< OpenAL buffer identifier
-    std::vector<Int16> m_samples;  ///< Samples buffer
-    Time               m_duration; ///< Sound duration
-    mutable SoundList  m_sounds;   ///< List of sounds that are using this buffer
+    unsigned int       m_buffer;   //!< OpenAL buffer identifier
+    std::vector<Int16> m_samples;  //!< Samples buffer
+    Time               m_duration; //!< Sound duration
+    mutable SoundList  m_sounds;   //!< List of sounds that are using this buffer
 };
 
 } // namespace sf

include/SFML/Audio/SoundBufferRecorder.hpp

@@ -96,8 +96,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::vector<Int16> m_samples; ///< Temporary sample buffer to hold the recorded data
-    SoundBuffer        m_buffer;  ///< Sound buffer that will contain the recorded data
+    std::vector<Int16> m_samples; //!< Temporary sample buffer to hold the recorded data
+    SoundBuffer        m_buffer;  //!< Sound buffer that will contain the recorded data
 };
 
 } // namespace sf

include/SFML/Audio/SoundFileFactory.hpp

@@ -160,8 +160,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Static member data
     ////////////////////////////////////////////////////////////
-    static ReaderFactoryArray s_readers; ///< List of all registered readers
-    static WriterFactoryArray s_writers; ///< List of all registered writers
+    static ReaderFactoryArray s_readers; //!< List of all registered readers
+    static WriterFactoryArray s_writers; //!< List of all registered writers
 };
 
 } // namespace sf

include/SFML/Audio/SoundFileReader.hpp

@@ -50,9 +50,9 @@ public:
     ////////////////////////////////////////////////////////////
     struct Info
     {
-        Uint64       sampleCount;  ///< Total number of samples in the file
-        unsigned int channelCount; ///< Number of channels of the sound
-        unsigned int sampleRate;   ///< Samples rate of the sound, in samples per second
+        Uint64       sampleCount;  //!< Total number of samples in the file
+        unsigned int channelCount; //!< Number of channels of the sound
+        unsigned int sampleRate;   //!< Samples rate of the sound, in samples per second
     };
 
     ////////////////////////////////////////////////////////////

include/SFML/Audio/SoundRecorder.hpp

@@ -285,13 +285,13 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Thread             m_thread;             ///< Thread running the background recording task
-    std::vector<Int16> m_samples;            ///< Buffer to store captured samples
-    unsigned int       m_sampleRate;         ///< Sample rate
-    Time               m_processingInterval; ///< Time period between calls to onProcessSamples
-    bool               m_isCapturing;        ///< Capturing state
-    std::string        m_deviceName;         ///< Name of the audio capture device
-    unsigned int       m_channelCount;       ///< Number of recording channels
+    Thread             m_thread;             //!< Thread running the background recording task
+    std::vector<Int16> m_samples;            //!< Buffer to store captured samples
+    unsigned int       m_sampleRate;         //!< Sample rate
+    Time               m_processingInterval; //!< Time period between calls to onProcessSamples
+    bool               m_isCapturing;        //!< Capturing state
+    std::string        m_deviceName;         //!< Name of the audio capture device
+    unsigned int       m_channelCount;       //!< Number of recording channels
 };
 
 } // namespace sf

include/SFML/Audio/SoundSource.hpp

@@ -49,9 +49,9 @@ public:
     ////////////////////////////////////////////////////////////
     enum Status
     {
-        Stopped, ///< Sound is not playing
-        Paused,  ///< Sound is paused
-        Playing  ///< Sound is playing
+        Stopped, //!< Sound is not playing
+        Paused,  //!< Sound is paused
+        Playing  //!< Sound is playing
     };
 
     ////////////////////////////////////////////////////////////
@@ -306,7 +306,7 @@ protected:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    unsigned int m_source; ///< OpenAL source identifier
+    unsigned int m_source; //!< OpenAL source identifier
 };
 
 } // namespace sf

include/SFML/Audio/SoundStream.hpp

@@ -52,8 +52,8 @@ public:
     ////////////////////////////////////////////////////////////
     struct Chunk
     {
-        const Int16* samples;     ///< Pointer to the audio samples
-        std::size_t  sampleCount; ///< Number of samples pointed by Samples
+        const Int16* samples;     //!< Pointer to the audio samples
+        std::size_t  sampleCount; //!< Number of samples pointed by Samples
     };
 
     ////////////////////////////////////////////////////////////
@@ -182,7 +182,7 @@ protected:
 
     enum
     {
-        NoLoop = -1 ///< "Invalid" endSeeks value, telling us to continue uninterrupted
+        NoLoop = -1 //!< "Invalid" endSeeks value, telling us to continue uninterrupted
     };
 
     ////////////////////////////////////////////////////////////
@@ -299,24 +299,24 @@ private:
 
     enum
     {
-        BufferCount = 3,    ///< Number of audio buffers used by the streaming loop
-        BufferRetries = 2   ///< Number of retries (excluding initial try) for onGetData()
+        BufferCount = 3,    //!< Number of audio buffers used by the streaming loop
+        BufferRetries = 2   //!< Number of retries (excluding initial try) for onGetData()
     };
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Thread        m_thread;                   ///< Thread running the background tasks
-    mutable Mutex m_threadMutex;              ///< Thread mutex
-    Status        m_threadStartState;         ///< State the thread starts in (Playing, Paused, Stopped)
-    bool          m_isStreaming;              ///< Streaming state (true = playing, false = stopped)
-    unsigned int  m_buffers[BufferCount];     ///< Sound buffers used to store temporary audio data
-    unsigned int  m_channelCount;             ///< Number of channels (1 = mono, 2 = stereo, ...)
-    unsigned int  m_sampleRate;               ///< Frequency (samples / second)
-    Uint32        m_format;                   ///< Format of the internal sound buffers
-    bool          m_loop;                     ///< Loop flag (true to loop, false to play once)
-    Uint64        m_samplesProcessed;         ///< Number of buffers processed since beginning of the stream
-    Int64         m_bufferSeeks[BufferCount]; ///< If buffer is an "end buffer", holds next seek position, else NoLoop. For play offset calculation.
+    Thread        m_thread;                   //!< Thread running the background tasks
+    mutable Mutex m_threadMutex;              //!< Thread mutex
+    Status        m_threadStartState;         //!< State the thread starts in (Playing, Paused, Stopped)
+    bool          m_isStreaming;              //!< Streaming state (true = playing, false = stopped)
+    unsigned int  m_buffers[BufferCount];     //!< Sound buffers used to store temporary audio data
+    unsigned int  m_channelCount;             //!< Number of channels (1 = mono, 2 = stereo, ...)
+    unsigned int  m_sampleRate;               //!< Frequency (samples / second)
+    Uint32        m_format;                   //!< Format of the internal sound buffers
+    bool          m_loop;                     //!< Loop flag (true to loop, false to play once)
+    Uint64        m_samplesProcessed;         //!< Number of buffers processed since beginning of the stream
+    Int64         m_bufferSeeks[BufferCount]; //!< If buffer is an "end buffer", holds next seek position, else NoLoop. For play offset calculation.
 };
 
 } // namespace sf

include/SFML/Graphics/BlendMode.hpp

@@ -48,16 +48,16 @@ struct SFML_GRAPHICS_API BlendMode
     ////////////////////////////////////////////////////////
     enum Factor
     {
-        Zero,             ///< (0, 0, 0, 0)
-        One,              ///< (1, 1, 1, 1)
-        SrcColor,         ///< (src.r, src.g, src.b, src.a)
-        OneMinusSrcColor, ///< (1, 1, 1, 1) - (src.r, src.g, src.b, src.a)
-        DstColor,         ///< (dst.r, dst.g, dst.b, dst.a)
-        OneMinusDstColor, ///< (1, 1, 1, 1) - (dst.r, dst.g, dst.b, dst.a)
-        SrcAlpha,         ///< (src.a, src.a, src.a, src.a)
-        OneMinusSrcAlpha, ///< (1, 1, 1, 1) - (src.a, src.a, src.a, src.a)
-        DstAlpha,         ///< (dst.a, dst.a, dst.a, dst.a)
-        OneMinusDstAlpha  ///< (1, 1, 1, 1) - (dst.a, dst.a, dst.a, dst.a)
+        Zero,             //!< (0, 0, 0, 0)
+        One,              //!< (1, 1, 1, 1)
+        SrcColor,         //!< (src.r, src.g, src.b, src.a)
+        OneMinusSrcColor, //!< (1, 1, 1, 1) - (src.r, src.g, src.b, src.a)
+        DstColor,         //!< (dst.r, dst.g, dst.b, dst.a)
+        OneMinusDstColor, //!< (1, 1, 1, 1) - (dst.r, dst.g, dst.b, dst.a)
+        SrcAlpha,         //!< (src.a, src.a, src.a, src.a)
+        OneMinusSrcAlpha, //!< (1, 1, 1, 1) - (src.a, src.a, src.a, src.a)
+        DstAlpha,         //!< (dst.a, dst.a, dst.a, dst.a)
+        OneMinusDstAlpha  //!< (1, 1, 1, 1) - (dst.a, dst.a, dst.a, dst.a)
     };
 
     ////////////////////////////////////////////////////////
@@ -68,9 +68,9 @@ struct SFML_GRAPHICS_API BlendMode
     ////////////////////////////////////////////////////////
     enum Equation
     {
-        Add,            ///< Pixel = Src * SrcFactor + Dst * DstFactor
-        Subtract,       ///< Pixel = Src * SrcFactor - Dst * DstFactor
-        ReverseSubtract ///< Pixel = Dst * DstFactor - Src * SrcFactor
+        Add,            //!< Pixel = Src * SrcFactor + Dst * DstFactor
+        Subtract,       //!< Pixel = Src * SrcFactor - Dst * DstFactor
+        ReverseSubtract //!< Pixel = Dst * DstFactor - Src * SrcFactor
     };
 
     ////////////////////////////////////////////////////////////
@@ -112,12 +112,12 @@ struct SFML_GRAPHICS_API BlendMode
     ////////////////////////////////////////////////////////////
     // Member Data
     ////////////////////////////////////////////////////////////
-    Factor   colorSrcFactor; ///< Source blending factor for the color channels
-    Factor   colorDstFactor; ///< Destination blending factor for the color channels
-    Equation colorEquation;  ///< Blending equation for the color channels
-    Factor   alphaSrcFactor; ///< Source blending factor for the alpha channel
-    Factor   alphaDstFactor; ///< Destination blending factor for the alpha channel
-    Equation alphaEquation;  ///< Blending equation for the alpha channel
+    Factor   colorSrcFactor; //!< Source blending factor for the color channels
+    Factor   colorDstFactor; //!< Destination blending factor for the color channels
+    Equation colorEquation;  //!< Blending equation for the color channels
+    Factor   alphaSrcFactor; //!< Source blending factor for the alpha channel
+    Factor   alphaDstFactor; //!< Destination blending factor for the alpha channel
+    Equation alphaEquation;  //!< Blending equation for the alpha channel
 };
 
 ////////////////////////////////////////////////////////////
@@ -147,10 +147,10 @@ SFML_GRAPHICS_API bool operator !=(const BlendMode& left, const BlendMode& right
 ////////////////////////////////////////////////////////////
 // Commonly used blending modes
 ////////////////////////////////////////////////////////////
-SFML_GRAPHICS_API extern const BlendMode BlendAlpha;    ///< Blend source and dest according to dest alpha
-SFML_GRAPHICS_API extern const BlendMode BlendAdd;      ///< Add source to dest
-SFML_GRAPHICS_API extern const BlendMode BlendMultiply; ///< Multiply source and dest
-SFML_GRAPHICS_API extern const BlendMode BlendNone;     ///< Overwrite dest with source
+SFML_GRAPHICS_API extern const BlendMode BlendAlpha;    //!< Blend source and dest according to dest alpha
+SFML_GRAPHICS_API extern const BlendMode BlendAdd;      //!< Add source to dest
+SFML_GRAPHICS_API extern const BlendMode BlendMultiply; //!< Multiply source and dest
+SFML_GRAPHICS_API extern const BlendMode BlendNone;     //!< Overwrite dest with source
 
 } // namespace sf
 

include/SFML/Graphics/CircleShape.hpp

@@ -111,8 +111,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    float       m_radius;     ///< Radius of the circle
-    std::size_t m_pointCount; ///< Number of points composing the circle
+    float       m_radius;     //!< Radius of the circle
+    std::size_t m_pointCount; //!< Number of points composing the circle
 };
 
 } // namespace sf

include/SFML/Graphics/Color.hpp

@@ -80,23 +80,23 @@ public:
     ////////////////////////////////////////////////////////////
     // Static member data
     ////////////////////////////////////////////////////////////
-    static const Color Black;       ///< Black predefined color
-    static const Color White;       ///< White predefined color
-    static const Color Red;         ///< Red predefined color
-    static const Color Green;       ///< Green predefined color
-    static const Color Blue;        ///< Blue predefined color
-    static const Color Yellow;      ///< Yellow predefined color
-    static const Color Magenta;     ///< Magenta predefined color
-    static const Color Cyan;        ///< Cyan predefined color
-    static const Color Transparent; ///< Transparent (black) predefined color
+    static const Color Black;       //!< Black predefined color
+    static const Color White;       //!< White predefined color
+    static const Color Red;         //!< Red predefined color
+    static const Color Green;       //!< Green predefined color
+    static const Color Blue;        //!< Blue predefined color
+    static const Color Yellow;      //!< Yellow predefined color
+    static const Color Magenta;     //!< Magenta predefined color
+    static const Color Cyan;        //!< Cyan predefined color
+    static const Color Transparent; //!< Transparent (black) predefined color
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Uint8 r; ///< Red component
-    Uint8 g; ///< Green component
-    Uint8 b; ///< Blue component
-    Uint8 a; ///< Alpha (opacity) component
+    Uint8 r; //!< Red component
+    Uint8 g; //!< Green component
+    Uint8 b; //!< Blue component
+    Uint8 a; //!< Alpha (opacity) component
 };
 
 ////////////////////////////////////////////////////////////

include/SFML/Graphics/ConvexShape.hpp

@@ -112,7 +112,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::vector<Vector2f> m_points; ///< Points composing the convex polygon
+    std::vector<Vector2f> m_points; //!< Points composing the convex polygon
 };
 
 } // namespace sf

include/SFML/Graphics/Font.hpp

@@ -57,7 +57,7 @@ public:
     ////////////////////////////////////////////////////////////
     struct Info
     {
-        std::string family; ///< The font family
+        std::string family; //!< The font family
     };
 
 public:
@@ -273,15 +273,15 @@ private:
     {
         Row(unsigned int rowTop, unsigned int rowHeight) : width(0), top(rowTop), height(rowHeight) {}
 
-        unsigned int width;  ///< Current width of the row
-        unsigned int top;    ///< Y position of the row into the texture
-        unsigned int height; ///< Height of the row
+        unsigned int width;  //!< Current width of the row
+        unsigned int top;    //!< Y position of the row into the texture
+        unsigned int height; //!< Height of the row
     };
 
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef std::map<Uint64, Glyph> GlyphTable; ///< Table mapping a codepoint to its glyph
+    typedef std::map<Uint64, Glyph> GlyphTable; //!< Table mapping a codepoint to its glyph
 
     ////////////////////////////////////////////////////////////
     /// \brief Structure defining a page of glyphs
@@ -291,10 +291,10 @@ private:
     {
         Page();
 
-        GlyphTable       glyphs;  ///< Table mapping code points to their corresponding glyph
-        Texture          texture; ///< Texture containing the pixels of the glyphs
-        unsigned int     nextRow; ///< Y position of the next new row in the texture
-        std::vector<Row> rows;    ///< List containing the position of all the existing rows
+        GlyphTable       glyphs;  //!< Table mapping code points to their corresponding glyph
+        Texture          texture; //!< Texture containing the pixels of the glyphs
+        unsigned int     nextRow; //!< Y position of the next new row in the texture
+        std::vector<Row> rows;    //!< List containing the position of all the existing rows
     };
 
     ////////////////////////////////////////////////////////////
@@ -341,21 +341,21 @@ private:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef std::map<unsigned int, Page> PageTable; ///< Table mapping a character size to its page (texture)
+    typedef std::map<unsigned int, Page> PageTable; //!< Table mapping a character size to its page (texture)
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    void*                      m_library;     ///< Pointer to the internal library interface (it is typeless to avoid exposing implementation details)
-    void*                      m_face;        ///< Pointer to the internal font face (it is typeless to avoid exposing implementation details)
-    void*                      m_streamRec;   ///< Pointer to the stream rec instance (it is typeless to avoid exposing implementation details)
-    void*                      m_stroker;     ///< Pointer to the stroker (it is typeless to avoid exposing implementation details)
-    int*                       m_refCount;    ///< Reference counter used by implicit sharing
-    Info                       m_info;        ///< Information about the font
-    mutable PageTable          m_pages;       ///< Table containing the glyphs pages by character size
-    mutable std::vector<Uint8> m_pixelBuffer; ///< Pixel buffer holding a glyph's pixels before being written to the texture
+    void*                      m_library;     //!< Pointer to the internal library interface (it is typeless to avoid exposing implementation details)
+    void*                      m_face;        //!< Pointer to the internal font face (it is typeless to avoid exposing implementation details)
+    void*                      m_streamRec;   //!< Pointer to the stream rec instance (it is typeless to avoid exposing implementation details)
+    void*                      m_stroker;     //!< Pointer to the stroker (it is typeless to avoid exposing implementation details)
+    int*                       m_refCount;    //!< Reference counter used by implicit sharing
+    Info                       m_info;        //!< Information about the font
+    mutable PageTable          m_pages;       //!< Table containing the glyphs pages by character size
+    mutable std::vector<Uint8> m_pixelBuffer; //!< Pixel buffer holding a glyph's pixels before being written to the texture
     #ifdef SFML_SYSTEM_ANDROID
-    void*                      m_stream; ///< Asset file streamer (if loaded from file)
+    void*                      m_stream; //!< Asset file streamer (if loaded from file)
     #endif
 };
 

include/SFML/Graphics/Glsl.inl

@@ -81,7 +81,7 @@ struct Matrix
         copyMatrix(transform, *this);
     }
 
-    float array[Columns * Rows]; ///< Array holding matrix data
+    float array[Columns * Rows]; //!< Array holding matrix data
 };
 
 ////////////////////////////////////////////////////////////
@@ -148,8 +148,8 @@ struct Vector4
         copyVector(color, *this);
     }
 
-    T x; ///< 1st component (X) of the 4D vector
-    T y; ///< 2nd component (Y) of the 4D vector
-    T z; ///< 3rd component (Z) of the 4D vector
-    T w; ///< 4th component (W) of the 4D vector
+    T x; //!< 1st component (X) of the 4D vector
+    T y; //!< 2nd component (Y) of the 4D vector
+    T z; //!< 3rd component (Z) of the 4D vector
+    T w; //!< 4th component (W) of the 4D vector
 };

include/SFML/Graphics/Glyph.hpp

@@ -51,9 +51,9 @@ public:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    float     advance;     ///< Offset to move horizontally to the next character
-    FloatRect bounds;      ///< Bounding rectangle of the glyph, in coordinates relative to the baseline
-    IntRect   textureRect; ///< Texture coordinates of the glyph inside the font's texture
+    float     advance;     //!< Offset to move horizontally to the next character
+    FloatRect bounds;      //!< Bounding rectangle of the glyph, in coordinates relative to the baseline
+    IntRect   textureRect; //!< Texture coordinates of the glyph inside the font's texture
 };
 
 } // namespace sf

include/SFML/Graphics/Image.hpp

@@ -263,8 +263,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Vector2u           m_size;   ///< Image size
-    std::vector<Uint8> m_pixels; ///< Pixels of the image
+    Vector2u           m_size;   //!< Image size
+    std::vector<Uint8> m_pixels; //!< Pixels of the image
 };
 
 } // namespace sf

include/SFML/Graphics/PrimitiveType.hpp

@@ -38,18 +38,18 @@ namespace sf
 ////////////////////////////////////////////////////////////
 enum PrimitiveType
 {
-    Points,        ///< List of individual points
-    Lines,         ///< List of individual lines
-    LineStrip,     ///< List of connected lines, a point uses the previous point to form a line
-    Triangles,     ///< List of individual triangles
-    TriangleStrip, ///< List of connected triangles, a point uses the two previous points to form a triangle
-    TriangleFan,   ///< List of connected triangles, a point uses the common center and the previous point to form a triangle
-    Quads,         ///< List of individual quads (deprecated, don't work with OpenGL ES)
+    Points,        //!< List of individual points
+    Lines,         //!< List of individual lines
+    LineStrip,     //!< List of connected lines, a point uses the previous point to form a line
+    Triangles,     //!< List of individual triangles
+    TriangleStrip, //!< List of connected triangles, a point uses the two previous points to form a triangle
+    TriangleFan,   //!< List of connected triangles, a point uses the common center and the previous point to form a triangle
+    Quads,         //!< List of individual quads (deprecated, don't work with OpenGL ES)
 
     // Deprecated names
-    LinesStrip     = LineStrip,     ///< \deprecated Use LineStrip instead
-    TrianglesStrip = TriangleStrip, ///< \deprecated Use TriangleStrip instead
-    TrianglesFan   = TriangleFan    ///< \deprecated Use TriangleFan instead
+    LinesStrip     = LineStrip,     //!< \deprecated Use LineStrip instead
+    TrianglesStrip = TriangleStrip, //!< \deprecated Use TriangleStrip instead
+    TrianglesFan   = TriangleFan    //!< \deprecated Use TriangleFan instead
 };
 
 } // namespace sf

include/SFML/Graphics/Rect.hpp

@@ -174,10 +174,10 @@ public:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    T left;   ///< Left coordinate of the rectangle
-    T top;    ///< Top coordinate of the rectangle
-    T width;  ///< Width of the rectangle
-    T height; ///< Height of the rectangle
+    T left;   //!< Left coordinate of the rectangle
+    T top;    //!< Top coordinate of the rectangle
+    T width;  //!< Width of the rectangle
+    T height; //!< Height of the rectangle
 };
 
 ////////////////////////////////////////////////////////////

include/SFML/Graphics/RectangleShape.hpp

@@ -99,7 +99,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Vector2f m_size; ///< Size of the rectangle
+    Vector2f m_size; //!< Size of the rectangle
 };
 
 } // namespace sf

include/SFML/Graphics/RenderStates.hpp

@@ -107,15 +107,15 @@ public:
     ////////////////////////////////////////////////////////////
     // Static member data
     ////////////////////////////////////////////////////////////
-    static const RenderStates Default; ///< Special instance holding the default render states
+    static const RenderStates Default; //!< Special instance holding the default render states
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    BlendMode      blendMode; ///< Blending mode
-    Transform      transform; ///< Transform
-    const Texture* texture;   ///< Texture
-    const Shader*  shader;    ///< Shader
+    BlendMode      blendMode; //!< Blending mode
+    Transform      transform; //!< Transform
+    const Texture* texture;   //!< Texture
+    const Shader*  shader;    //!< Shader
 };
 
 } // namespace sf

include/SFML/Graphics/RenderTarget.hpp

@@ -458,23 +458,23 @@ private:
     {
         enum {VertexCacheSize = 4};
 
-        bool      enable;         ///< Is the cache enabled?
-        bool      glStatesSet;    ///< Are our internal GL states set yet?
-        bool      viewChanged;    ///< Has the current view changed since last draw?
-        BlendMode lastBlendMode;  ///< Cached blending mode
-        Uint64    lastTextureId;  ///< Cached texture
-        bool      texCoordsArrayEnabled; ///< Is GL_TEXTURE_COORD_ARRAY client state enabled?
-        bool      useVertexCache; ///< Did we previously use the vertex cache?
-        Vertex    vertexCache[VertexCacheSize]; ///< Pre-transformed vertices cache
+        bool      enable;         //!< Is the cache enabled?
+        bool      glStatesSet;    //!< Are our internal GL states set yet?
+        bool      viewChanged;    //!< Has the current view changed since last draw?
+        BlendMode lastBlendMode;  //!< Cached blending mode
+        Uint64    lastTextureId;  //!< Cached texture
+        bool      texCoordsArrayEnabled; //!< Is GL_TEXTURE_COORD_ARRAY client state enabled?
+        bool      useVertexCache; //!< Did we previously use the vertex cache?
+        Vertex    vertexCache[VertexCacheSize]; //!< Pre-transformed vertices cache
     };
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    View        m_defaultView; ///< Default view
-    View        m_view;        ///< Current view
-    StatesCache m_cache;       ///< Render states cache
-    Uint64      m_id;          ///< Unique number that identifies the RenderTarget
+    View        m_defaultView; //!< Default view
+    View        m_view;        //!< Current view
+    StatesCache m_cache;       //!< Render states cache
+    Uint64      m_id;          //!< Unique number that identifies the RenderTarget
 };
 
 } // namespace sf

include/SFML/Graphics/RenderTexture.hpp

@@ -238,8 +238,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    priv::RenderTextureImpl* m_impl;    ///< Platform/hardware specific implementation
-    Texture                  m_texture; ///< Target texture to draw on
+    priv::RenderTextureImpl* m_impl;    //!< Platform/hardware specific implementation
+    Texture                  m_texture; //!< Target texture to draw on
 };
 
 } // namespace sf

include/SFML/Graphics/RenderWindow.hpp

@@ -183,7 +183,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    unsigned int m_defaultFrameBuffer; ///< Framebuffer to bind when targeting this window
+    unsigned int m_defaultFrameBuffer; //!< Framebuffer to bind when targeting this window
 };
 
 } // namespace sf

include/SFML/Graphics/Shader.hpp

@@ -59,9 +59,9 @@ public:
     ////////////////////////////////////////////////////////////
     enum Type
     {
-        Vertex,   ///< %Vertex shader
-        Geometry, ///< Geometry shader
-        Fragment  ///< Fragment (pixel) shader
+        Vertex,   //!< %Vertex shader
+        Geometry, //!< Geometry shader
+        Fragment  //!< Fragment (pixel) shader
     };
 
     ////////////////////////////////////////////////////////////
@@ -745,10 +745,10 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    unsigned int m_shaderProgram;  ///< OpenGL identifier for the program
-    int          m_currentTexture; ///< Location of the current texture in the shader
-    TextureTable m_textures;       ///< Texture variables in the shader, mapped to their location
-    UniformTable m_uniforms;       ///< Parameters location cache
+    unsigned int m_shaderProgram;  //!< OpenGL identifier for the program
+    int          m_currentTexture; //!< Location of the current texture in the shader
+    TextureTable m_textures;       //!< Texture variables in the shader, mapped to their location
+    UniformTable m_uniforms;       //!< Parameters location cache
 };
 
 } // namespace sf

include/SFML/Graphics/Shape.hpp

@@ -305,15 +305,15 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    const Texture* m_texture;          ///< Texture of the shape
-    IntRect        m_textureRect;      ///< Rectangle defining the area of the source texture to display
-    Color          m_fillColor;        ///< Fill color
-    Color          m_outlineColor;     ///< Outline color
-    float          m_outlineThickness; ///< Thickness of the shape's outline
-    VertexArray    m_vertices;         ///< Vertex array containing the fill geometry
-    VertexArray    m_outlineVertices;  ///< Vertex array containing the outline geometry
-    FloatRect      m_insideBounds;     ///< Bounding rectangle of the inside (fill)
-    FloatRect      m_bounds;           ///< Bounding rectangle of the whole shape (outline + fill)
+    const Texture* m_texture;          //!< Texture of the shape
+    IntRect        m_textureRect;      //!< Rectangle defining the area of the source texture to display
+    Color          m_fillColor;        //!< Fill color
+    Color          m_outlineColor;     //!< Outline color
+    float          m_outlineThickness; //!< Thickness of the shape's outline
+    VertexArray    m_vertices;         //!< Vertex array containing the fill geometry
+    VertexArray    m_outlineVertices;  //!< Vertex array containing the outline geometry
+    FloatRect      m_insideBounds;     //!< Bounding rectangle of the inside (fill)
+    FloatRect      m_bounds;           //!< Bounding rectangle of the whole shape (outline + fill)
 };
 
 } // namespace sf

include/SFML/Graphics/Sprite.hpp

@@ -215,9 +215,9 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Vertex         m_vertices[4]; ///< Vertices defining the sprite's geometry
-    const Texture* m_texture;     ///< Texture of the sprite
-    IntRect        m_textureRect; ///< Rectangle defining the area of the source texture to display
+    Vertex         m_vertices[4]; //!< Vertices defining the sprite's geometry
+    const Texture* m_texture;     //!< Texture of the sprite
+    IntRect        m_textureRect; //!< Rectangle defining the area of the source texture to display
 };
 
 } // namespace sf

include/SFML/Graphics/Text.hpp

@@ -55,11 +55,11 @@ public:
     ////////////////////////////////////////////////////////////
     enum Style
     {
-        Regular       = 0,      ///< Regular characters, no style
-        Bold          = 1 << 0, ///< Bold characters
-        Italic        = 1 << 1, ///< Italic characters
-        Underlined    = 1 << 2, ///< Underlined characters
-        StrikeThrough = 1 << 3  ///< Strike through characters
+        Regular       = 0,      //!< Regular characters, no style
+        Bold          = 1 << 0, //!< Bold characters
+        Italic        = 1 << 1, //!< Italic characters
+        Underlined    = 1 << 2, //!< Underlined characters
+        StrikeThrough = 1 << 3  //!< Strike through characters
     };
 
     ////////////////////////////////////////////////////////////
@@ -435,20 +435,20 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    String              m_string;              ///< String to display
-    const Font*         m_font;                ///< Font used to display the string
-    unsigned int        m_characterSize;       ///< Base size of characters, in pixels
-    float               m_letterSpacingFactor; ///< Spacing factor between letters
-    float               m_lineSpacingFactor;   ///< Spacing factor between lines
-    Uint32              m_style;               ///< Text style (see Style enum)
-    Color               m_fillColor;           ///< Text fill color
-    Color               m_outlineColor;        ///< Text outline color
-    float               m_outlineThickness;    ///< Thickness of the text's outline
-    mutable VertexArray m_vertices;            ///< Vertex array containing the fill geometry
-    mutable VertexArray m_outlineVertices;     ///< Vertex array containing the outline geometry
-    mutable FloatRect   m_bounds;              ///< Bounding rectangle of the text (in local coordinates)
-    mutable bool        m_geometryNeedUpdate;  ///< Does the geometry need to be recomputed?
-    mutable Uint64      m_fontTextureId;       ///< The font texture id
+    String              m_string;              //!< String to display
+    const Font*         m_font;                //!< Font used to display the string
+    unsigned int        m_characterSize;       //!< Base size of characters, in pixels
+    float               m_letterSpacingFactor; //!< Spacing factor between letters
+    float               m_lineSpacingFactor;   //!< Spacing factor between lines
+    Uint32              m_style;               //!< Text style (see Style enum)
+    Color               m_fillColor;           //!< Text fill color
+    Color               m_outlineColor;        //!< Text outline color
+    float               m_outlineThickness;    //!< Thickness of the text's outline
+    mutable VertexArray m_vertices;            //!< Vertex array containing the fill geometry
+    mutable VertexArray m_outlineVertices;     //!< Vertex array containing the outline geometry
+    mutable FloatRect   m_bounds;              //!< Bounding rectangle of the text (in local coordinates)
+    mutable bool        m_geometryNeedUpdate;  //!< Does the geometry need to be recomputed?
+    mutable Uint64      m_fontTextureId;       //!< The font texture id
 };
 
 } // namespace sf

include/SFML/Graphics/Texture.hpp

@@ -55,8 +55,8 @@ public:
     ////////////////////////////////////////////////////////////
     enum CoordinateType
     {
-        Normalized, ///< Texture coordinates in range [0 .. 1]
-        Pixels      ///< Texture coordinates in range [0 .. size]
+        Normalized, //!< Texture coordinates in range [0 .. 1]
+        Pixels      //!< Texture coordinates in range [0 .. size]
     };
 
 public:
@@ -616,16 +616,16 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Vector2u     m_size;          ///< Public texture size
-    Vector2u     m_actualSize;    ///< Actual texture size (can be greater than public size because of padding)
-    unsigned int m_texture;       ///< Internal texture identifier
-    bool         m_isSmooth;      ///< Status of the smooth filter
-    bool         m_sRgb;          ///< Should the texture source be converted from sRGB?
-    bool         m_isRepeated;    ///< Is the texture in repeat mode?
-    mutable bool m_pixelsFlipped; ///< To work around the inconsistency in Y orientation
-    bool         m_fboAttachment; ///< Is this texture owned by a framebuffer object?
-    bool         m_hasMipmap;     ///< Has the mipmap been generated?
-    Uint64       m_cacheId;       ///< Unique number that identifies the texture to the render target's cache
+    Vector2u     m_size;          //!< Public texture size
+    Vector2u     m_actualSize;    //!< Actual texture size (can be greater than public size because of padding)
+    unsigned int m_texture;       //!< Internal texture identifier
+    bool         m_isSmooth;      //!< Status of the smooth filter
+    bool         m_sRgb;          //!< Should the texture source be converted from sRGB?
+    bool         m_isRepeated;    //!< Is the texture in repeat mode?
+    mutable bool m_pixelsFlipped; //!< To work around the inconsistency in Y orientation
+    bool         m_fboAttachment; //!< Is this texture owned by a framebuffer object?
+    bool         m_hasMipmap;     //!< Has the mipmap been generated?
+    Uint64       m_cacheId;       //!< Unique number that identifies the texture to the render target's cache
 };
 
 } // namespace sf

include/SFML/Graphics/Transform.hpp

@@ -351,14 +351,14 @@ public:
     ////////////////////////////////////////////////////////////
     // Static member data
     ////////////////////////////////////////////////////////////
-    static const Transform Identity; ///< The identity transform (does nothing)
+    static const Transform Identity; //!< The identity transform (does nothing)
 
 private:
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    float m_matrix[16]; ///< 4x4 matrix defining the transformation
+    float m_matrix[16]; //!< 4x4 matrix defining the transformation
 };
 
 ////////////////////////////////////////////////////////////

include/SFML/Graphics/Transformable.hpp

@@ -316,14 +316,14 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Vector2f          m_origin;                     ///< Origin of translation/rotation/scaling of the object
-    Vector2f          m_position;                   ///< Position of the object in the 2D world
-    float             m_rotation;                   ///< Orientation of the object, in degrees
-    Vector2f          m_scale;                      ///< Scale of the object
-    mutable Transform m_transform;                  ///< Combined transformation of the object
-    mutable bool      m_transformNeedUpdate;        ///< Does the transform need to be recomputed?
-    mutable Transform m_inverseTransform;           ///< Combined transformation of the object
-    mutable bool      m_inverseTransformNeedUpdate; ///< Does the transform need to be recomputed?
+    Vector2f          m_origin;                     //!< Origin of translation/rotation/scaling of the object
+    Vector2f          m_position;                   //!< Position of the object in the 2D world
+    float             m_rotation;                   //!< Orientation of the object, in degrees
+    Vector2f          m_scale;                      //!< Scale of the object
+    mutable Transform m_transform;                  //!< Combined transformation of the object
+    mutable bool      m_transformNeedUpdate;        //!< Does the transform need to be recomputed?
+    mutable Transform m_inverseTransform;           //!< Combined transformation of the object
+    mutable bool      m_inverseTransformNeedUpdate; //!< Does the transform need to be recomputed?
 };
 
 } // namespace sf

include/SFML/Graphics/Vertex.hpp

@@ -94,9 +94,9 @@ public:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Vector2f  position;  ///< 2D position of the vertex
-    Color     color;     ///< Color of the vertex
-    Vector2f  texCoords; ///< Coordinates of the texture's pixel to map to the vertex
+    Vector2f  position;  //!< 2D position of the vertex
+    Color     color;     //!< Color of the vertex
+    Vector2f  texCoords; //!< Coordinates of the texture's pixel to map to the vertex
 };
 
 } // namespace sf

include/SFML/Graphics/VertexArray.hpp

@@ -187,8 +187,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::vector<Vertex> m_vertices;      ///< Vertices contained in the array
-    PrimitiveType       m_primitiveType; ///< Type of primitives to draw
+    std::vector<Vertex> m_vertices;      //!< Vertices contained in the array
+    PrimitiveType       m_primitiveType; //!< Type of primitives to draw
 };
 
 } // namespace sf

include/SFML/Graphics/VertexBuffer.hpp

@@ -59,9 +59,9 @@ public:
     ////////////////////////////////////////////////////////////
     enum Usage
     {
-        Stream,  ///< Constantly changing data
-        Dynamic, ///< Occasionally changing data
-        Static   ///< Rarely changing data
+        Stream,  //!< Constantly changing data
+        Dynamic, //!< Occasionally changing data
+        Static   //!< Rarely changing data
     };
 
     ////////////////////////////////////////////////////////////
@@ -334,10 +334,10 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    unsigned int  m_buffer;        ///< Internal buffer identifier
-    std::size_t   m_size;          ///< Size in Vertexes of the currently allocated buffer
-    PrimitiveType m_primitiveType; ///< Type of primitives to draw
-    Usage         m_usage;         ///< How this vertex buffer is to be used
+    unsigned int  m_buffer;        //!< Internal buffer identifier
+    std::size_t   m_size;          //!< Size in Vertexes of the currently allocated buffer
+    PrimitiveType m_primitiveType; //!< Type of primitives to draw
+    Usage         m_usage;         //!< How this vertex buffer is to be used
 };
 
 } // namespace sf

include/SFML/Graphics/View.hpp

@@ -269,14 +269,14 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Vector2f          m_center;              ///< Center of the view, in scene coordinates
-    Vector2f          m_size;                ///< Size of the view, in scene coordinates
-    float             m_rotation;            ///< Angle of rotation of the view rectangle, in degrees
-    FloatRect         m_viewport;            ///< Viewport rectangle, expressed as a factor of the render-target's size
-    mutable Transform m_transform;           ///< Precomputed projection transform corresponding to the view
-    mutable Transform m_inverseTransform;    ///< Precomputed inverse projection transform corresponding to the view
-    mutable bool      m_transformUpdated;    ///< Internal state telling if the transform needs to be updated
-    mutable bool      m_invTransformUpdated; ///< Internal state telling if the inverse transform needs to be updated
+    Vector2f          m_center;              //!< Center of the view, in scene coordinates
+    Vector2f          m_size;                //!< Size of the view, in scene coordinates
+    float             m_rotation;            //!< Angle of rotation of the view rectangle, in degrees
+    FloatRect         m_viewport;            //!< Viewport rectangle, expressed as a factor of the render-target's size
+    mutable Transform m_transform;           //!< Precomputed projection transform corresponding to the view
+    mutable Transform m_inverseTransform;    //!< Precomputed inverse projection transform corresponding to the view
+    mutable bool      m_transformUpdated;    //!< Internal state telling if the transform needs to be updated
+    mutable bool      m_invTransformUpdated; //!< Internal state telling if the inverse transform needs to be updated
 };
 
 } // namespace sf

include/SFML/Network/Ftp.hpp

@@ -54,9 +54,9 @@ public:
     ////////////////////////////////////////////////////////////
     enum TransferMode
     {
-        Binary, ///< Binary mode (file is transfered as a sequence of bytes)
-        Ascii,  ///< Text mode using ASCII encoding
-        Ebcdic  ///< Text mode using EBCDIC encoding
+        Binary, //!< Binary mode (file is transfered as a sequence of bytes)
+        Ascii,  //!< Text mode using ASCII encoding
+        Ebcdic  //!< Text mode using EBCDIC encoding
     };
 
     ////////////////////////////////////////////////////////////
@@ -75,62 +75,62 @@ public:
         {
             // 1xx: the requested action is being initiated,
             // expect another reply before proceeding with a new command
-            RestartMarkerReply          = 110, ///< Restart marker reply
-            ServiceReadySoon            = 120, ///< Service ready in N minutes
-            DataConnectionAlreadyOpened = 125, ///< Data connection already opened, transfer starting
-            OpeningDataConnection       = 150, ///< File status ok, about to open data connection
+            RestartMarkerReply          = 110, //!< Restart marker reply
+            ServiceReadySoon            = 120, //!< Service ready in N minutes
+            DataConnectionAlreadyOpened = 125, //!< Data connection already opened, transfer starting
+            OpeningDataConnection       = 150, //!< File status ok, about to open data connection
 
             // 2xx: the requested action has been successfully completed
-            Ok                    = 200, ///< Command ok
-            PointlessCommand      = 202, ///< Command not implemented
-            SystemStatus          = 211, ///< System status, or system help reply
-            DirectoryStatus       = 212, ///< Directory status
-            FileStatus            = 213, ///< File status
-            HelpMessage           = 214, ///< Help message
-            SystemType            = 215, ///< NAME system type, where NAME is an official system name from the list in the Assigned Numbers document
-            ServiceReady          = 220, ///< Service ready for new user
-            ClosingConnection     = 221, ///< Service closing control connection
-            DataConnectionOpened  = 225, ///< Data connection open, no transfer in progress
-            ClosingDataConnection = 226, ///< Closing data connection, requested file action successful
-            EnteringPassiveMode   = 227, ///< Entering passive mode
-            LoggedIn              = 230, ///< User logged in, proceed. Logged out if appropriate
-            FileActionOk          = 250, ///< Requested file action ok
-            DirectoryOk           = 257, ///< PATHNAME created
+            Ok                    = 200, //!< Command ok
+            PointlessCommand      = 202, //!< Command not implemented
+            SystemStatus          = 211, //!< System status, or system help reply
+            DirectoryStatus       = 212, //!< Directory status
+            FileStatus            = 213, //!< File status
+            HelpMessage           = 214, //!< Help message
+            SystemType            = 215, //!< NAME system type, where NAME is an official system name from the list in the Assigned Numbers document
+            ServiceReady          = 220, //!< Service ready for new user
+            ClosingConnection     = 221, //!< Service closing control connection
+            DataConnectionOpened  = 225, //!< Data connection open, no transfer in progress
+            ClosingDataConnection = 226, //!< Closing data connection, requested file action successful
+            EnteringPassiveMode   = 227, //!< Entering passive mode
+            LoggedIn              = 230, //!< User logged in, proceed. Logged out if appropriate
+            FileActionOk          = 250, //!< Requested file action ok
+            DirectoryOk           = 257, //!< PATHNAME created
 
             // 3xx: the command has been accepted, but the requested action
             // is dormant, pending receipt of further information
-            NeedPassword       = 331, ///< User name ok, need password
-            NeedAccountToLogIn = 332, ///< Need account for login
-            NeedInformation    = 350, ///< Requested file action pending further information
+            NeedPassword       = 331, //!< User name ok, need password
+            NeedAccountToLogIn = 332, //!< Need account for login
+            NeedInformation    = 350, //!< Requested file action pending further information
 
             // 4xx: the command was not accepted and the requested action did not take place,
             // but the error condition is temporary and the action may be requested again
-            ServiceUnavailable        = 421, ///< Service not available, closing control connection
-            DataConnectionUnavailable = 425, ///< Can't open data connection
-            TransferAborted           = 426, ///< Connection closed, transfer aborted
-            FileActionAborted         = 450, ///< Requested file action not taken
-            LocalError                = 451, ///< Requested action aborted, local error in processing
-            InsufficientStorageSpace  = 452, ///< Requested action not taken; insufficient storage space in system, file unavailable
+            ServiceUnavailable        = 421, //!< Service not available, closing control connection
+            DataConnectionUnavailable = 425, //!< Can't open data connection
+            TransferAborted           = 426, //!< Connection closed, transfer aborted
+            FileActionAborted         = 450, //!< Requested file action not taken
+            LocalError                = 451, //!< Requested action aborted, local error in processing
+            InsufficientStorageSpace  = 452, //!< Requested action not taken; insufficient storage space in system, file unavailable
 
             // 5xx: the command was not accepted and
             // the requested action did not take place
-            CommandUnknown          = 500, ///< Syntax error, command unrecognized
-            ParametersUnknown       = 501, ///< Syntax error in parameters or arguments
-            CommandNotImplemented   = 502, ///< Command not implemented
-            BadCommandSequence      = 503, ///< Bad sequence of commands
-            ParameterNotImplemented = 504, ///< Command not implemented for that parameter
-            NotLoggedIn             = 530, ///< Not logged in
-            NeedAccountToStore      = 532, ///< Need account for storing files
-            FileUnavailable         = 550, ///< Requested action not taken, file unavailable
-            PageTypeUnknown         = 551, ///< Requested action aborted, page type unknown
-            NotEnoughMemory         = 552, ///< Requested file action aborted, exceeded storage allocation
-            FilenameNotAllowed      = 553, ///< Requested action not taken, file name not allowed
+            CommandUnknown          = 500, //!< Syntax error, command unrecognized
+            ParametersUnknown       = 501, //!< Syntax error in parameters or arguments
+            CommandNotImplemented   = 502, //!< Command not implemented
+            BadCommandSequence      = 503, //!< Bad sequence of commands
+            ParameterNotImplemented = 504, //!< Command not implemented for that parameter
+            NotLoggedIn             = 530, //!< Not logged in
+            NeedAccountToStore      = 532, //!< Need account for storing files
+            FileUnavailable         = 550, //!< Requested action not taken, file unavailable
+            PageTypeUnknown         = 551, //!< Requested action aborted, page type unknown
+            NotEnoughMemory         = 552, //!< Requested file action aborted, exceeded storage allocation
+            FilenameNotAllowed      = 553, //!< Requested action not taken, file name not allowed
 
             // 10xx: SFML custom codes
-            InvalidResponse  = 1000, ///< Not part of the FTP standard, generated by SFML when a received response cannot be parsed
-            ConnectionFailed = 1001, ///< Not part of the FTP standard, generated by SFML when the low-level socket connection with the server fails
-            ConnectionClosed = 1002, ///< Not part of the FTP standard, generated by SFML when the low-level socket connection is unexpectedly closed
-            InvalidFile      = 1003  ///< Not part of the FTP standard, generated by SFML when a local file cannot be read or written
+            InvalidResponse  = 1000, //!< Not part of the FTP standard, generated by SFML when a received response cannot be parsed
+            ConnectionFailed = 1001, //!< Not part of the FTP standard, generated by SFML when the low-level socket connection with the server fails
+            ConnectionClosed = 1002, //!< Not part of the FTP standard, generated by SFML when the low-level socket connection is unexpectedly closed
+            InvalidFile      = 1003  //!< Not part of the FTP standard, generated by SFML when a local file cannot be read or written
         };
 
         ////////////////////////////////////////////////////////////
@@ -177,8 +177,8 @@ public:
         ////////////////////////////////////////////////////////////
         // Member data
         ////////////////////////////////////////////////////////////
-        Status      m_status;  ///< Status code returned from the server
-        std::string m_message; ///< Last message received from the server
+        Status      m_status;  //!< Status code returned from the server
+        std::string m_message; //!< Last message received from the server
     };
 
     ////////////////////////////////////////////////////////////
@@ -210,7 +210,7 @@ public:
         ////////////////////////////////////////////////////////////
         // Member data
         ////////////////////////////////////////////////////////////
-        std::string m_directory; ///< Directory extracted from the response message
+        std::string m_directory; //!< Directory extracted from the response message
     };
 
 
@@ -244,7 +244,7 @@ public:
         ////////////////////////////////////////////////////////////
         // Member data
         ////////////////////////////////////////////////////////////
-        std::vector<std::string> m_listing; ///< Directory/file names extracted from the data
+        std::vector<std::string> m_listing; //!< Directory/file names extracted from the data
     };
 
 
@@ -533,8 +533,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    TcpSocket   m_commandSocket; ///< Socket holding the control connection with the server
-    std::string m_receiveBuffer; ///< Received command data that is yet to be processed
+    TcpSocket   m_commandSocket; //!< Socket holding the control connection with the server
+    std::string m_receiveBuffer; //!< Received command data that is yet to be processed
 };
 
 } // namespace sf

include/SFML/Network/Http.hpp

@@ -61,11 +61,11 @@ public:
         ////////////////////////////////////////////////////////////
         enum Method
         {
-            Get,   ///< Request in get mode, standard method to retrieve a page
-            Post,  ///< Request in post mode, usually to send data to a page
-            Head,  ///< Request a page's header only
-            Put,   ///< Request in put mode, useful for a REST API
-            Delete ///< Request in delete mode, useful for a REST API
+            Get,   //!< Request in get mode, standard method to retrieve a page
+            Post,  //!< Request in post mode, usually to send data to a page
+            Head,  //!< Request a page's header only
+            Put,   //!< Request in put mode, useful for a REST API
+            Delete //!< Request in delete mode, useful for a REST API
         };
 
         ////////////////////////////////////////////////////////////
@@ -178,12 +178,12 @@ public:
         ////////////////////////////////////////////////////////////
         // Member data
         ////////////////////////////////////////////////////////////
-        FieldTable   m_fields;       ///< Fields of the header associated to their value
-        Method       m_method;       ///< Method to use for the request
-        std::string  m_uri;          ///< Target URI of the request
-        unsigned int m_majorVersion; ///< Major HTTP version
-        unsigned int m_minorVersion; ///< Minor HTTP version
-        std::string  m_body;         ///< Body of the request
+        FieldTable   m_fields;       //!< Fields of the header associated to their value
+        Method       m_method;       //!< Method to use for the request
+        std::string  m_uri;          //!< Target URI of the request
+        unsigned int m_majorVersion; //!< Major HTTP version
+        unsigned int m_minorVersion; //!< Minor HTTP version
+        std::string  m_body;         //!< Body of the request
     };
 
     ////////////////////////////////////////////////////////////
@@ -201,37 +201,37 @@ public:
         enum Status
         {
             // 2xx: success
-            Ok             = 200, ///< Most common code returned when operation was successful
-            Created        = 201, ///< The resource has successfully been created
-            Accepted       = 202, ///< The request has been accepted, but will be processed later by the server
-            NoContent      = 204, ///< The server didn't send any data in return
-            ResetContent   = 205, ///< The server informs the client that it should clear the view (form) that caused the request to be sent
-            PartialContent = 206, ///< The server has sent a part of the resource, as a response to a partial GET request
+            Ok             = 200, //!< Most common code returned when operation was successful
+            Created        = 201, //!< The resource has successfully been created
+            Accepted       = 202, //!< The request has been accepted, but will be processed later by the server
+            NoContent      = 204, //!< The server didn't send any data in return
+            ResetContent   = 205, //!< The server informs the client that it should clear the view (form) that caused the request to be sent
+            PartialContent = 206, //!< The server has sent a part of the resource, as a response to a partial GET request
 
             // 3xx: redirection
-            MultipleChoices  = 300, ///< The requested page can be accessed from several locations
-            MovedPermanently = 301, ///< The requested page has permanently moved to a new location
-            MovedTemporarily = 302, ///< The requested page has temporarily moved to a new location
-            NotModified      = 304, ///< For conditional requests, means the requested page hasn't changed and doesn't need to be refreshed
+            MultipleChoices  = 300, //!< The requested page can be accessed from several locations
+            MovedPermanently = 301, //!< The requested page has permanently moved to a new location
+            MovedTemporarily = 302, //!< The requested page has temporarily moved to a new location
+            NotModified      = 304, //!< For conditional requests, means the requested page hasn't changed and doesn't need to be refreshed
 
             // 4xx: client error
-            BadRequest          = 400, ///< The server couldn't understand the request (syntax error)
-            Unauthorized        = 401, ///< The requested page needs an authentication to be accessed
-            Forbidden           = 403, ///< The requested page cannot be accessed at all, even with authentication
-            NotFound            = 404, ///< The requested page doesn't exist
-            RangeNotSatisfiable = 407, ///< The server can't satisfy the partial GET request (with a "Range" header field)
+            BadRequest          = 400, //!< The server couldn't understand the request (syntax error)
+            Unauthorized        = 401, //!< The requested page needs an authentication to be accessed
+            Forbidden           = 403, //!< The requested page cannot be accessed at all, even with authentication
+            NotFound            = 404, //!< The requested page doesn't exist
+            RangeNotSatisfiable = 407, //!< The server can't satisfy the partial GET request (with a "Range" header field)
 
             // 5xx: server error
-            InternalServerError = 500, ///< The server encountered an unexpected error
-            NotImplemented      = 501, ///< The server doesn't implement a requested feature
-            BadGateway          = 502, ///< The gateway server has received an error from the source server
-            ServiceNotAvailable = 503, ///< The server is temporarily unavailable (overloaded, in maintenance, ...)
-            GatewayTimeout      = 504, ///< The gateway server couldn't receive a response from the source server
-            VersionNotSupported = 505, ///< The server doesn't support the requested HTTP version
+            InternalServerError = 500, //!< The server encountered an unexpected error
+            NotImplemented      = 501, //!< The server doesn't implement a requested feature
+            BadGateway          = 502, //!< The gateway server has received an error from the source server
+            ServiceNotAvailable = 503, //!< The server is temporarily unavailable (overloaded, in maintenance, ...)
+            GatewayTimeout      = 504, //!< The gateway server couldn't receive a response from the source server
+            VersionNotSupported = 505, //!< The server doesn't support the requested HTTP version
 
             // 10xx: SFML custom codes
-            InvalidResponse  = 1000, ///< Response is not a valid HTTP one
-            ConnectionFailed = 1001  ///< Connection with server failed
+            InvalidResponse  = 1000, //!< Response is not a valid HTTP one
+            ConnectionFailed = 1001  //!< Connection with server failed
         };
 
         ////////////////////////////////////////////////////////////
@@ -338,11 +338,11 @@ public:
         ////////////////////////////////////////////////////////////
         // Member data
         ////////////////////////////////////////////////////////////
-        FieldTable   m_fields;       ///< Fields of the header
-        Status       m_status;       ///< Status code
-        unsigned int m_majorVersion; ///< Major HTTP version
-        unsigned int m_minorVersion; ///< Minor HTTP version
-        std::string  m_body;         ///< Body of the response
+        FieldTable   m_fields;       //!< Fields of the header
+        Status       m_status;       //!< Status code
+        unsigned int m_majorVersion; //!< Major HTTP version
+        unsigned int m_minorVersion; //!< Minor HTTP version
+        std::string  m_body;         //!< Body of the response
     };
 
     ////////////////////////////////////////////////////////////
@@ -409,10 +409,10 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    TcpSocket      m_connection; ///< Connection to the host
-    IpAddress      m_host;       ///< Web host address
-    std::string    m_hostName;   ///< Web host name
-    unsigned short m_port;       ///< Port used for connection with host
+    TcpSocket      m_connection; //!< Connection to the host
+    IpAddress      m_host;       //!< Web host address
+    std::string    m_hostName;   //!< Web host name
+    unsigned short m_port;       //!< Port used for connection with host
 };
 
 } // namespace sf

include/SFML/Network/IpAddress.hpp

@@ -181,10 +181,10 @@ public:
     ////////////////////////////////////////////////////////////
     // Static member data
     ////////////////////////////////////////////////////////////
-    static const IpAddress None;      ///< Value representing an empty/invalid address
-    static const IpAddress Any;       ///< Value representing any address (0.0.0.0)
-    static const IpAddress LocalHost; ///< The "localhost" address (for connecting a computer to itself locally)
-    static const IpAddress Broadcast; ///< The "broadcast" address (for sending UDP messages to everyone on a local network)
+    static const IpAddress None;      //!< Value representing an empty/invalid address
+    static const IpAddress Any;       //!< Value representing any address (0.0.0.0)
+    static const IpAddress LocalHost; //!< The "localhost" address (for connecting a computer to itself locally)
+    static const IpAddress Broadcast; //!< The "broadcast" address (for sending UDP messages to everyone on a local network)
 
 private:
 
@@ -201,8 +201,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Uint32 m_address; ///< Address stored as an unsigned 32 bits integer
-    bool   m_valid;   ///< Is the address valid?
+    Uint32 m_address; //!< Address stored as an unsigned 32 bits integer
+    bool   m_valid;   //!< Is the address valid?
 };
 
 ////////////////////////////////////////////////////////////

include/SFML/Network/Packet.hpp

@@ -400,10 +400,10 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::vector<char> m_data;    ///< Data stored in the packet
-    std::size_t       m_readPos; ///< Current reading position in the packet
-    std::size_t       m_sendPos; ///< Current send position in the packet (for handling partial sends)
-    bool              m_isValid; ///< Reading state of the packet
+    std::vector<char> m_data;    //!< Data stored in the packet
+    std::size_t       m_readPos; //!< Current reading position in the packet
+    std::size_t       m_sendPos; //!< Current send position in the packet (for handling partial sends)
+    bool              m_isValid; //!< Reading state of the packet
 };
 
 } // namespace sf

include/SFML/Network/Socket.hpp

@@ -52,11 +52,11 @@ public:
     ////////////////////////////////////////////////////////////
     enum Status
     {
-        Done,         ///< The socket has sent / received the data
-        NotReady,     ///< The socket is not ready to send / receive data yet
-        Partial,      ///< The socket sent a part of the data
-        Disconnected, ///< The TCP socket has been disconnected
-        Error         ///< An unexpected error happened
+        Done,         //!< The socket has sent / received the data
+        NotReady,     //!< The socket is not ready to send / receive data yet
+        Partial,      //!< The socket sent a part of the data
+        Disconnected, //!< The TCP socket has been disconnected
+        Error         //!< An unexpected error happened
     };
 
     ////////////////////////////////////////////////////////////
@@ -65,7 +65,7 @@ public:
     ////////////////////////////////////////////////////////////
     enum
     {
-        AnyPort = 0 ///< Special value that tells the system to pick any available port
+        AnyPort = 0 //!< Special value that tells the system to pick any available port
     };
 
 public:
@@ -113,8 +113,8 @@ protected:
     ////////////////////////////////////////////////////////////
     enum Type
     {
-        Tcp, ///< TCP protocol
-        Udp  ///< UDP protocol
+        Tcp, //!< TCP protocol
+        Udp  //!< UDP protocol
     };
 
     ////////////////////////////////////////////////////////////
@@ -173,9 +173,9 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Type         m_type;       ///< Type of the socket (TCP or UDP)
-    SocketHandle m_socket;     ///< Socket descriptor
-    bool         m_isBlocking; ///< Current blocking mode of the socket
+    Type         m_type;       //!< Type of the socket (TCP or UDP)
+    SocketHandle m_socket;     //!< Socket descriptor
+    bool         m_isBlocking; //!< Current blocking mode of the socket
 };
 
 } // namespace sf

include/SFML/Network/SocketSelector.hpp

@@ -158,7 +158,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    SocketSelectorImpl* m_impl; ///< Opaque pointer to the implementation (which requires OS-specific types)
+    SocketSelectorImpl* m_impl; //!< Opaque pointer to the implementation (which requires OS-specific types)
 };
 
 } // namespace sf

include/SFML/Network/TcpSocket.hpp

@@ -220,15 +220,15 @@ private:
     {
         PendingPacket();
 
-        Uint32            Size;         ///< Data of packet size
-        std::size_t       SizeReceived; ///< Number of size bytes received so far
-        std::vector<char> Data;         ///< Data of the packet
+        Uint32            Size;         //!< Data of packet size
+        std::size_t       SizeReceived; //!< Number of size bytes received so far
+        std::vector<char> Data;         //!< Data of the packet
     };
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    PendingPacket m_pendingPacket; ///< Temporary data of the packet currently being received
+    PendingPacket m_pendingPacket; //!< Temporary data of the packet currently being received
 };
 
 } // namespace sf

include/SFML/Network/UdpSocket.hpp

@@ -51,7 +51,7 @@ public:
     ////////////////////////////////////////////////////////////
     enum
     {
-        MaxDatagramSize = 65507 ///< The maximum number of bytes that can be sent in a single UDP datagram
+        MaxDatagramSize = 65507 //!< The maximum number of bytes that can be sent in a single UDP datagram
     };
 
     ////////////////////////////////////////////////////////////
@@ -193,7 +193,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::vector<char> m_buffer; ///< Temporary buffer holding the received data in Receive(Packet)
+    std::vector<char> m_buffer; //!< Temporary buffer holding the received data in Receive(Packet)
 };
 
 } // namespace sf

include/SFML/System/Clock.hpp

@@ -78,7 +78,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Time m_startTime; ///< Time of last reset, in microseconds
+    Time m_startTime; //!< Time of last reset, in microseconds
 };
 
 } // namespace sf

include/SFML/System/FileInputStream.hpp

@@ -125,7 +125,7 @@ private:
 #ifdef SFML_SYSTEM_ANDROID
     priv::ResourceStream* m_file;
 #else
-    std::FILE* m_file; ///< stdio file stream
+    std::FILE* m_file; //!< stdio file stream
 #endif
 };
 

include/SFML/System/Lock.hpp

@@ -67,7 +67,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Mutex& m_mutex; ///< Mutex to lock / unlock
+    Mutex& m_mutex; //!< Mutex to lock / unlock
 };
 
 } // namespace sf

include/SFML/System/MemoryInputStream.hpp

@@ -104,9 +104,9 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    const char* m_data;   ///< Pointer to the data in memory
-    Int64       m_size;   ///< Total size of the data
-    Int64       m_offset; ///< Current reading position
+    const char* m_data;   //!< Pointer to the data in memory
+    Int64       m_size;   //!< Total size of the data
+    Int64       m_offset; //!< Current reading position
 };
 
 } // namespace sf

include/SFML/System/Mutex.hpp

@@ -85,7 +85,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    priv::MutexImpl* m_mutexImpl; ///< OS-specific implementation
+    priv::MutexImpl* m_mutexImpl; //!< OS-specific implementation
 };
 
 } // namespace sf

include/SFML/System/String.hpp

@@ -49,13 +49,13 @@ public:
     ////////////////////////////////////////////////////////////
     // Types
     ////////////////////////////////////////////////////////////
-    typedef std::basic_string<Uint32>::iterator       Iterator;      ///< Iterator type
-    typedef std::basic_string<Uint32>::const_iterator ConstIterator; ///< Read-only iterator type
+    typedef std::basic_string<Uint32>::iterator       Iterator;      //!< Iterator type
+    typedef std::basic_string<Uint32>::const_iterator ConstIterator; //!< Read-only iterator type
 
     ////////////////////////////////////////////////////////////
     // Static member data
     ////////////////////////////////////////////////////////////
-    static const std::size_t InvalidPos; ///< Represents an invalid position in the string
+    static const std::size_t InvalidPos; //!< Represents an invalid position in the string
 
     ////////////////////////////////////////////////////////////
     /// \brief Default constructor
@@ -524,7 +524,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::basic_string<Uint32> m_string; ///< Internal string of UTF-32 characters
+    std::basic_string<Uint32> m_string; //!< Internal string of UTF-32 characters
 };
 
 ////////////////////////////////////////////////////////////

include/SFML/System/Thread.hpp

@@ -186,8 +186,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    priv::ThreadImpl* m_impl;       ///< OS-specific implementation of the thread
-    priv::ThreadFunc* m_entryPoint; ///< Abstraction of the function to run
+    priv::ThreadImpl* m_impl;       //!< OS-specific implementation of the thread
+    priv::ThreadFunc* m_entryPoint; //!< Abstraction of the function to run
 };
 
 #include <SFML/System/Thread.inl>

include/SFML/System/ThreadLocal.hpp

@@ -83,7 +83,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    priv::ThreadLocalImpl* m_impl; ///< Pointer to the OS specific implementation
+    priv::ThreadLocalImpl* m_impl; //!< Pointer to the OS specific implementation
 };
 
 } // namespace sf

include/SFML/System/Time.hpp

@@ -82,7 +82,7 @@ public:
     ////////////////////////////////////////////////////////////
     // Static member data
     ////////////////////////////////////////////////////////////
-    static const Time Zero; ///< Predefined "zero" time value
+    static const Time Zero; //!< Predefined "zero" time value
 
 private:
 
@@ -106,7 +106,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Int64 m_microseconds; ///< Time value stored as microseconds
+    Int64 m_microseconds; //!< Time value stored as microseconds
 };
 
 ////////////////////////////////////////////////////////////

include/SFML/System/Vector2.hpp

@@ -72,8 +72,8 @@ public:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    T x; ///< X coordinate of the vector
-    T y; ///< Y coordinate of the vector
+    T x; //!< X coordinate of the vector
+    T y; //!< Y coordinate of the vector
 };
 
 ////////////////////////////////////////////////////////////

include/SFML/System/Vector3.hpp

@@ -73,9 +73,9 @@ public:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    T x; ///< X coordinate of the vector
-    T y; ///< Y coordinate of the vector
-    T z; ///< Z coordinate of the vector
+    T x; //!< X coordinate of the vector
+    T y; //!< Y coordinate of the vector
+    T z; //!< Z coordinate of the vector
 };
 
 ////////////////////////////////////////////////////////////

include/SFML/Window/Context.hpp

@@ -150,7 +150,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    priv::GlContext* m_context; ///< Internal OpenGL context
+    priv::GlContext* m_context; //!< Internal OpenGL context
 };
 
 } // namespace sf

include/SFML/Window/ContextSettings.hpp

@@ -42,9 +42,9 @@ struct ContextSettings
     ////////////////////////////////////////////////////////////
     enum Attribute
     {
-        Default = 0,      ///< Non-debug, compatibility context (this and the core attribute are mutually exclusive)
-        Core    = 1 << 0, ///< Core attribute
-        Debug   = 1 << 2  ///< Debug attribute
+        Default = 0,      //!< Non-debug, compatibility context (this and the core attribute are mutually exclusive)
+        Core    = 1 << 0, //!< Core attribute
+        Debug   = 1 << 2  //!< Debug attribute
     };
 
     ////////////////////////////////////////////////////////////
@@ -73,13 +73,13 @@ struct ContextSettings
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    unsigned int depthBits;         ///< Bits of the depth buffer
-    unsigned int stencilBits;       ///< Bits of the stencil buffer
-    unsigned int antialiasingLevel; ///< Level of antialiasing
-    unsigned int majorVersion;      ///< Major number of the context version to create
-    unsigned int minorVersion;      ///< Minor number of the context version to create
-    Uint32       attributeFlags;    ///< The attribute flags to create the context with
-    bool         sRgbCapable;       ///< Whether the context framebuffer is sRGB capable
+    unsigned int depthBits;         //!< Bits of the depth buffer
+    unsigned int stencilBits;       //!< Bits of the stencil buffer
+    unsigned int antialiasingLevel; //!< Level of antialiasing
+    unsigned int majorVersion;      //!< Major number of the context version to create
+    unsigned int minorVersion;      //!< Minor number of the context version to create
+    Uint32       attributeFlags;    //!< The attribute flags to create the context with
+    bool         sRgbCapable;       //!< Whether the context framebuffer is sRGB capable
 };
 
 } // namespace sf

include/SFML/Window/Cursor.hpp

@@ -75,19 +75,19 @@ public:
     ////////////////////////////////////////////////////////////
     enum Type
     {
-        Arrow,                  ///< Arrow cursor (default)
-        ArrowWait,              ///< Busy arrow cursor
-        Wait,                   ///< Busy cursor
-        Text,                   ///< I-beam, cursor when hovering over a field allowing text entry
-        Hand,                   ///< Pointing hand cursor
-        SizeHorizontal,         ///< Horizontal double arrow cursor
-        SizeVertical,           ///< Vertical double arrow cursor
-        SizeTopLeftBottomRight, ///< Double arrow cursor going from top-left to bottom-right
-        SizeBottomLeftTopRight, ///< Double arrow cursor going from bottom-left to top-right
-        SizeAll,                ///< Combination of SizeHorizontal and SizeVertical
-        Cross,                  ///< Crosshair cursor
-        Help,                   ///< Help cursor
-        NotAllowed              ///< Action not allowed cursor
+        Arrow,                  //!< Arrow cursor (default)
+        ArrowWait,              //!< Busy arrow cursor
+        Wait,                   //!< Busy cursor
+        Text,                   //!< I-beam, cursor when hovering over a field allowing text entry
+        Hand,                   //!< Pointing hand cursor
+        SizeHorizontal,         //!< Horizontal double arrow cursor
+        SizeVertical,           //!< Vertical double arrow cursor
+        SizeTopLeftBottomRight, //!< Double arrow cursor going from top-left to bottom-right
+        SizeBottomLeftTopRight, //!< Double arrow cursor going from bottom-left to top-right
+        SizeAll,                //!< Combination of SizeHorizontal and SizeVertical
+        Cross,                  //!< Crosshair cursor
+        Help,                   //!< Help cursor
+        NotAllowed              //!< Action not allowed cursor
     };
 
 public:
@@ -179,7 +179,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    priv::CursorImpl* m_impl; ///< Platform-specific implementation of the cursor
+    priv::CursorImpl* m_impl; //!< Platform-specific implementation of the cursor
 };
 
 } // namespace sf

include/SFML/Window/Event.hpp

@@ -51,8 +51,8 @@ public:
     ////////////////////////////////////////////////////////////
     struct SizeEvent
     {
-        unsigned int width;  ///< New width, in pixels
-        unsigned int height; ///< New height, in pixels
+        unsigned int width;  //!< New width, in pixels
+        unsigned int height; //!< New height, in pixels
     };
 
     ////////////////////////////////////////////////////////////
@@ -61,11 +61,11 @@ public:
     ////////////////////////////////////////////////////////////
     struct KeyEvent
     {
-        Keyboard::Key code;    ///< Code of the key that has been pressed
-        bool          alt;     ///< Is the Alt key pressed?
-        bool          control; ///< Is the Control key pressed?
-        bool          shift;   ///< Is the Shift key pressed?
-        bool          system;  ///< Is the System key pressed?
+        Keyboard::Key code;    //!< Code of the key that has been pressed
+        bool          alt;     //!< Is the Alt key pressed?
+        bool          control; //!< Is the Control key pressed?
+        bool          shift;   //!< Is the Shift key pressed?
+        bool          system;  //!< Is the System key pressed?
     };
 
     ////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ public:
     ////////////////////////////////////////////////////////////
     struct TextEvent
     {
-        Uint32 unicode; ///< UTF-32 Unicode value of the character
+        Uint32 unicode; //!< UTF-32 Unicode value of the character
     };
 
     ////////////////////////////////////////////////////////////
@@ -83,8 +83,8 @@ public:
     ////////////////////////////////////////////////////////////
     struct MouseMoveEvent
     {
-        int x; ///< X position of the mouse pointer, relative to the left of the owner window
-        int y; ///< Y position of the mouse pointer, relative to the top of the owner window
+        int x; //!< X position of the mouse pointer, relative to the left of the owner window
+        int y; //!< Y position of the mouse pointer, relative to the top of the owner window
     };
 
     ////////////////////////////////////////////////////////////
@@ -94,9 +94,9 @@ public:
     ////////////////////////////////////////////////////////////
     struct MouseButtonEvent
     {
-        Mouse::Button button; ///< Code of the button that has been pressed
-        int           x;      ///< X position of the mouse pointer, relative to the left of the owner window
-        int           y;      ///< Y position of the mouse pointer, relative to the top of the owner window
+        Mouse::Button button; //!< Code of the button that has been pressed
+        int           x;      //!< X position of the mouse pointer, relative to the left of the owner window
+        int           y;      //!< Y position of the mouse pointer, relative to the top of the owner window
     };
 
     ////////////////////////////////////////////////////////////
@@ -108,9 +108,9 @@ public:
     ////////////////////////////////////////////////////////////
     struct MouseWheelEvent
     {
-        int delta; ///< Number of ticks the wheel has moved (positive is up, negative is down)
-        int x;     ///< X position of the mouse pointer, relative to the left of the owner window
-        int y;     ///< Y position of the mouse pointer, relative to the top of the owner window
+        int delta; //!< Number of ticks the wheel has moved (positive is up, negative is down)
+        int x;     //!< X position of the mouse pointer, relative to the left of the owner window
+        int y;     //!< Y position of the mouse pointer, relative to the top of the owner window
     };
 
     ////////////////////////////////////////////////////////////
@@ -119,10 +119,10 @@ public:
     ////////////////////////////////////////////////////////////
     struct MouseWheelScrollEvent
     {
-        Mouse::Wheel wheel; ///< Which wheel (for mice with multiple ones)
-        float        delta; ///< Wheel offset (positive is up/left, negative is down/right). High-precision mice may use non-integral offsets.
-        int          x;     ///< X position of the mouse pointer, relative to the left of the owner window
-        int          y;     ///< Y position of the mouse pointer, relative to the top of the owner window
+        Mouse::Wheel wheel; //!< Which wheel (for mice with multiple ones)
+        float        delta; //!< Wheel offset (positive is up/left, negative is down/right). High-precision mice may use non-integral offsets.
+        int          x;     //!< X position of the mouse pointer, relative to the left of the owner window
+        int          y;     //!< Y position of the mouse pointer, relative to the top of the owner window
     };
 
     ////////////////////////////////////////////////////////////
@@ -132,7 +132,7 @@ public:
     ////////////////////////////////////////////////////////////
     struct JoystickConnectEvent
     {
-        unsigned int joystickId; ///< Index of the joystick (in range [0 .. Joystick::Count - 1])
+        unsigned int joystickId; //!< Index of the joystick (in range [0 .. Joystick::Count - 1])
     };
 
     ////////////////////////////////////////////////////////////
@@ -141,9 +141,9 @@ public:
     ////////////////////////////////////////////////////////////
     struct JoystickMoveEvent
     {
-        unsigned int   joystickId; ///< Index of the joystick (in range [0 .. Joystick::Count - 1])
-        Joystick::Axis axis;       ///< Axis on which the joystick moved
-        float          position;   ///< New position on the axis (in range [-100 .. 100])
+        unsigned int   joystickId; //!< Index of the joystick (in range [0 .. Joystick::Count - 1])
+        Joystick::Axis axis;       //!< Axis on which the joystick moved
+        float          position;   //!< New position on the axis (in range [-100 .. 100])
     };
 
     ////////////////////////////////////////////////////////////
@@ -153,8 +153,8 @@ public:
     ////////////////////////////////////////////////////////////
     struct JoystickButtonEvent
     {
-        unsigned int joystickId; ///< Index of the joystick (in range [0 .. Joystick::Count - 1])
-        unsigned int button;     ///< Index of the button that has been pressed (in range [0 .. Joystick::ButtonCount - 1])
+        unsigned int joystickId; //!< Index of the joystick (in range [0 .. Joystick::Count - 1])
+        unsigned int button;     //!< Index of the button that has been pressed (in range [0 .. Joystick::ButtonCount - 1])
     };
 
     ////////////////////////////////////////////////////////////
@@ -163,9 +163,9 @@ public:
     ////////////////////////////////////////////////////////////
     struct TouchEvent
     {
-        unsigned int finger; ///< Index of the finger in case of multi-touch events
-        int x;               ///< X position of the touch, relative to the left of the owner window
-        int y;               ///< Y position of the touch, relative to the top of the owner window
+        unsigned int finger; //!< Index of the finger in case of multi-touch events
+        int x;               //!< X position of the touch, relative to the left of the owner window
+        int y;               //!< Y position of the touch, relative to the top of the owner window
     };
 
     ////////////////////////////////////////////////////////////
@@ -174,10 +174,10 @@ public:
     ////////////////////////////////////////////////////////////
     struct SensorEvent
     {
-        Sensor::Type type; ///< Type of the sensor
-        float x;           ///< Current value of the sensor on X axis
-        float y;           ///< Current value of the sensor on Y axis
-        float z;           ///< Current value of the sensor on Z axis
+        Sensor::Type type; //!< Type of the sensor
+        float x;           //!< Current value of the sensor on X axis
+        float y;           //!< Current value of the sensor on Y axis
+        float z;           //!< Current value of the sensor on Z axis
     };
 
     ////////////////////////////////////////////////////////////
@@ -186,52 +186,52 @@ public:
     ////////////////////////////////////////////////////////////
     enum EventType
     {
-        Closed,                 ///< The window requested to be closed (no data)
-        Resized,                ///< The window was resized (data in event.size)
-        LostFocus,              ///< The window lost the focus (no data)
-        GainedFocus,            ///< The window gained the focus (no data)
-        TextEntered,            ///< A character was entered (data in event.text)
-        KeyPressed,             ///< A key was pressed (data in event.key)
-        KeyReleased,            ///< A key was released (data in event.key)
-        MouseWheelMoved,        ///< The mouse wheel was scrolled (data in event.mouseWheel) (deprecated)
-        MouseWheelScrolled,     ///< The mouse wheel was scrolled (data in event.mouseWheelScroll)
-        MouseButtonPressed,     ///< A mouse button was pressed (data in event.mouseButton)
-        MouseButtonReleased,    ///< A mouse button was released (data in event.mouseButton)
-        MouseMoved,             ///< The mouse cursor moved (data in event.mouseMove)
-        MouseEntered,           ///< The mouse cursor entered the area of the window (no data)
-        MouseLeft,              ///< The mouse cursor left the area of the window (no data)
-        JoystickButtonPressed,  ///< A joystick button was pressed (data in event.joystickButton)
-        JoystickButtonReleased, ///< A joystick button was released (data in event.joystickButton)
-        JoystickMoved,          ///< The joystick moved along an axis (data in event.joystickMove)
-        JoystickConnected,      ///< A joystick was connected (data in event.joystickConnect)
-        JoystickDisconnected,   ///< A joystick was disconnected (data in event.joystickConnect)
-        TouchBegan,             ///< A touch event began (data in event.touch)
-        TouchMoved,             ///< A touch moved (data in event.touch)
-        TouchEnded,             ///< A touch event ended (data in event.touch)
-        SensorChanged,          ///< A sensor value changed (data in event.sensor)
+        Closed,                 //!< The window requested to be closed (no data)
+        Resized,                //!< The window was resized (data in event.size)
+        LostFocus,              //!< The window lost the focus (no data)
+        GainedFocus,            //!< The window gained the focus (no data)
+        TextEntered,            //!< A character was entered (data in event.text)
+        KeyPressed,             //!< A key was pressed (data in event.key)
+        KeyReleased,            //!< A key was released (data in event.key)
+        MouseWheelMoved,        //!< The mouse wheel was scrolled (data in event.mouseWheel) (deprecated)
+        MouseWheelScrolled,     //!< The mouse wheel was scrolled (data in event.mouseWheelScroll)
+        MouseButtonPressed,     //!< A mouse button was pressed (data in event.mouseButton)
+        MouseButtonReleased,    //!< A mouse button was released (data in event.mouseButton)
+        MouseMoved,             //!< The mouse cursor moved (data in event.mouseMove)
+        MouseEntered,           //!< The mouse cursor entered the area of the window (no data)
+        MouseLeft,              //!< The mouse cursor left the area of the window (no data)
+        JoystickButtonPressed,  //!< A joystick button was pressed (data in event.joystickButton)
+        JoystickButtonReleased, //!< A joystick button was released (data in event.joystickButton)
+        JoystickMoved,          //!< The joystick moved along an axis (data in event.joystickMove)
+        JoystickConnected,      //!< A joystick was connected (data in event.joystickConnect)
+        JoystickDisconnected,   //!< A joystick was disconnected (data in event.joystickConnect)
+        TouchBegan,             //!< A touch event began (data in event.touch)
+        TouchMoved,             //!< A touch moved (data in event.touch)
+        TouchEnded,             //!< A touch event ended (data in event.touch)
+        SensorChanged,          //!< A sensor value changed (data in event.sensor)
 
-        Count                   ///< Keep last -- the total number of event types
+        Count                   //!< Keep last -- the total number of event types
     };
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    EventType type; ///< Type of the event
+    EventType type; //!< Type of the event
 
     union
     {
-        SizeEvent             size;              ///< Size event parameters (Event::Resized)
-        KeyEvent              key;               ///< Key event parameters (Event::KeyPressed, Event::KeyReleased)
-        TextEvent             text;              ///< Text event parameters (Event::TextEntered)
-        MouseMoveEvent        mouseMove;         ///< Mouse move event parameters (Event::MouseMoved)
-        MouseButtonEvent      mouseButton;       ///< Mouse button event parameters (Event::MouseButtonPressed, Event::MouseButtonReleased)
-        MouseWheelEvent       mouseWheel;        ///< Mouse wheel event parameters (Event::MouseWheelMoved) (deprecated)
-        MouseWheelScrollEvent mouseWheelScroll;  ///< Mouse wheel event parameters (Event::MouseWheelScrolled)
-        JoystickMoveEvent     joystickMove;      ///< Joystick move event parameters (Event::JoystickMoved)
-        JoystickButtonEvent   joystickButton;    ///< Joystick button event parameters (Event::JoystickButtonPressed, Event::JoystickButtonReleased)
-        JoystickConnectEvent  joystickConnect;   ///< Joystick (dis)connect event parameters (Event::JoystickConnected, Event::JoystickDisconnected)
-        TouchEvent            touch;             ///< Touch events parameters (Event::TouchBegan, Event::TouchMoved, Event::TouchEnded)
-        SensorEvent           sensor;            ///< Sensor event parameters (Event::SensorChanged)
+        SizeEvent             size;              //!< Size event parameters (Event::Resized)
+        KeyEvent              key;               //!< Key event parameters (Event::KeyPressed, Event::KeyReleased)
+        TextEvent             text;              //!< Text event parameters (Event::TextEntered)
+        MouseMoveEvent        mouseMove;         //!< Mouse move event parameters (Event::MouseMoved)
+        MouseButtonEvent      mouseButton;       //!< Mouse button event parameters (Event::MouseButtonPressed, Event::MouseButtonReleased)
+        MouseWheelEvent       mouseWheel;        //!< Mouse wheel event parameters (Event::MouseWheelMoved) (deprecated)
+        MouseWheelScrollEvent mouseWheelScroll;  //!< Mouse wheel event parameters (Event::MouseWheelScrolled)
+        JoystickMoveEvent     joystickMove;      //!< Joystick move event parameters (Event::JoystickMoved)
+        JoystickButtonEvent   joystickButton;    //!< Joystick button event parameters (Event::JoystickButtonPressed, Event::JoystickButtonReleased)
+        JoystickConnectEvent  joystickConnect;   //!< Joystick (dis)connect event parameters (Event::JoystickConnected, Event::JoystickDisconnected)
+        TouchEvent            touch;             //!< Touch events parameters (Event::TouchBegan, Event::TouchMoved, Event::TouchEnded)
+        SensorEvent           sensor;            //!< Sensor event parameters (Event::SensorChanged)
     };
 };
 

include/SFML/Window/Joystick.hpp

@@ -48,9 +48,9 @@ public:
     ////////////////////////////////////////////////////////////
     enum
     {
-        Count       = 8,  ///< Maximum number of supported joysticks
-        ButtonCount = 32, ///< Maximum number of supported buttons
-        AxisCount   = 8   ///< Maximum number of supported axes
+        Count       = 8,  //!< Maximum number of supported joysticks
+        ButtonCount = 32, //!< Maximum number of supported buttons
+        AxisCount   = 8   //!< Maximum number of supported axes
     };
 
     ////////////////////////////////////////////////////////////
@@ -59,14 +59,14 @@ public:
     ////////////////////////////////////////////////////////////
     enum Axis
     {
-        X,    ///< The X axis
-        Y,    ///< The Y axis
-        Z,    ///< The Z axis
-        R,    ///< The R axis
-        U,    ///< The U axis
-        V,    ///< The V axis
-        PovX, ///< The X axis of the point-of-view hat
-        PovY  ///< The Y axis of the point-of-view hat
+        X,    //!< The X axis
+        Y,    //!< The Y axis
+        Z,    //!< The Z axis
+        R,    //!< The R axis
+        U,    //!< The U axis
+        V,    //!< The V axis
+        PovX, //!< The X axis of the point-of-view hat
+        PovY  //!< The Y axis of the point-of-view hat
     };
 
     ////////////////////////////////////////////////////////////
@@ -77,9 +77,9 @@ public:
     {
         Identification();
 
-        String       name;      ///< Name of the joystick
-        unsigned int vendorId;  ///< Manufacturer identifier
-        unsigned int productId; ///< Product identifier
+        String       name;      //!< Name of the joystick
+        unsigned int vendorId;  //!< Manufacturer identifier
+        unsigned int productId; //!< Product identifier
     };
 
     ////////////////////////////////////////////////////////////

include/SFML/Window/Keyboard.hpp

@@ -47,118 +47,118 @@ public:
     ////////////////////////////////////////////////////////////
     enum Key
     {
-        Unknown = -1, ///< Unhandled key
-        A = 0,        ///< The A key
-        B,            ///< The B key
-        C,            ///< The C key
-        D,            ///< The D key
-        E,            ///< The E key
-        F,            ///< The F key
-        G,            ///< The G key
-        H,            ///< The H key
-        I,            ///< The I key
-        J,            ///< The J key
-        K,            ///< The K key
-        L,            ///< The L key
-        M,            ///< The M key
-        N,            ///< The N key
-        O,            ///< The O key
-        P,            ///< The P key
-        Q,            ///< The Q key
-        R,            ///< The R key
-        S,            ///< The S key
-        T,            ///< The T key
-        U,            ///< The U key
-        V,            ///< The V key
-        W,            ///< The W key
-        X,            ///< The X key
-        Y,            ///< The Y key
-        Z,            ///< The Z key
-        Num0,         ///< The 0 key
-        Num1,         ///< The 1 key
-        Num2,         ///< The 2 key
-        Num3,         ///< The 3 key
-        Num4,         ///< The 4 key
-        Num5,         ///< The 5 key
-        Num6,         ///< The 6 key
-        Num7,         ///< The 7 key
-        Num8,         ///< The 8 key
-        Num9,         ///< The 9 key
-        Escape,       ///< The Escape key
-        LControl,     ///< The left Control key
-        LShift,       ///< The left Shift key
-        LAlt,         ///< The left Alt key
-        LSystem,      ///< The left OS specific key: window (Windows and Linux), apple (MacOS X), ...
-        RControl,     ///< The right Control key
-        RShift,       ///< The right Shift key
-        RAlt,         ///< The right Alt key
-        RSystem,      ///< The right OS specific key: window (Windows and Linux), apple (MacOS X), ...
-        Menu,         ///< The Menu key
-        LBracket,     ///< The [ key
-        RBracket,     ///< The ] key
-        Semicolon,    ///< The ; key
-        Comma,        ///< The , key
-        Period,       ///< The . key
-        Quote,        ///< The ' key
-        Slash,        ///< The / key
-        Backslash,    ///< The \ key
-        Tilde,        ///< The ~ key
-        Equal,        ///< The = key
-        Hyphen,       ///< The - key (hyphen)
-        Space,        ///< The Space key
-        Enter,        ///< The Enter/Return keys
-        Backspace,    ///< The Backspace key
-        Tab,          ///< The Tabulation key
-        PageUp,       ///< The Page up key
-        PageDown,     ///< The Page down key
-        End,          ///< The End key
-        Home,         ///< The Home key
-        Insert,       ///< The Insert key
-        Delete,       ///< The Delete key
-        Add,          ///< The + key
-        Subtract,     ///< The - key (minus, usually from numpad)
-        Multiply,     ///< The * key
-        Divide,       ///< The / key
-        Left,         ///< Left arrow
-        Right,        ///< Right arrow
-        Up,           ///< Up arrow
-        Down,         ///< Down arrow
-        Numpad0,      ///< The numpad 0 key
-        Numpad1,      ///< The numpad 1 key
-        Numpad2,      ///< The numpad 2 key
-        Numpad3,      ///< The numpad 3 key
-        Numpad4,      ///< The numpad 4 key
-        Numpad5,      ///< The numpad 5 key
-        Numpad6,      ///< The numpad 6 key
-        Numpad7,      ///< The numpad 7 key
-        Numpad8,      ///< The numpad 8 key
-        Numpad9,      ///< The numpad 9 key
-        F1,           ///< The F1 key
-        F2,           ///< The F2 key
-        F3,           ///< The F3 key
-        F4,           ///< The F4 key
-        F5,           ///< The F5 key
-        F6,           ///< The F6 key
-        F7,           ///< The F7 key
-        F8,           ///< The F8 key
-        F9,           ///< The F9 key
-        F10,          ///< The F10 key
-        F11,          ///< The F11 key
-        F12,          ///< The F12 key
-        F13,          ///< The F13 key
-        F14,          ///< The F14 key
-        F15,          ///< The F15 key
-        Pause,        ///< The Pause key
+        Unknown = -1, //!< Unhandled key
+        A = 0,        //!< The A key
+        B,            //!< The B key
+        C,            //!< The C key
+        D,            //!< The D key
+        E,            //!< The E key
+        F,            //!< The F key
+        G,            //!< The G key
+        H,            //!< The H key
+        I,            //!< The I key
+        J,            //!< The J key
+        K,            //!< The K key
+        L,            //!< The L key
+        M,            //!< The M key
+        N,            //!< The N key
+        O,            //!< The O key
+        P,            //!< The P key
+        Q,            //!< The Q key
+        R,            //!< The R key
+        S,            //!< The S key
+        T,            //!< The T key
+        U,            //!< The U key
+        V,            //!< The V key
+        W,            //!< The W key
+        X,            //!< The X key
+        Y,            //!< The Y key
+        Z,            //!< The Z key
+        Num0,         //!< The 0 key
+        Num1,         //!< The 1 key
+        Num2,         //!< The 2 key
+        Num3,         //!< The 3 key
+        Num4,         //!< The 4 key
+        Num5,         //!< The 5 key
+        Num6,         //!< The 6 key
+        Num7,         //!< The 7 key
+        Num8,         //!< The 8 key
+        Num9,         //!< The 9 key
+        Escape,       //!< The Escape key
+        LControl,     //!< The left Control key
+        LShift,       //!< The left Shift key
+        LAlt,         //!< The left Alt key
+        LSystem,      //!< The left OS specific key: window (Windows and Linux), apple (MacOS X), ...
+        RControl,     //!< The right Control key
+        RShift,       //!< The right Shift key
+        RAlt,         //!< The right Alt key
+        RSystem,      //!< The right OS specific key: window (Windows and Linux), apple (MacOS X), ...
+        Menu,         //!< The Menu key
+        LBracket,     //!< The [ key
+        RBracket,     //!< The ] key
+        Semicolon,    //!< The ; key
+        Comma,        //!< The , key
+        Period,       //!< The . key
+        Quote,        //!< The ' key
+        Slash,        //!< The / key
+        Backslash,    //!< The \ key
+        Tilde,        //!< The ~ key
+        Equal,        //!< The = key
+        Hyphen,       //!< The - key (hyphen)
+        Space,        //!< The Space key
+        Enter,        //!< The Enter/Return keys
+        Backspace,    //!< The Backspace key
+        Tab,          //!< The Tabulation key
+        PageUp,       //!< The Page up key
+        PageDown,     //!< The Page down key
+        End,          //!< The End key
+        Home,         //!< The Home key
+        Insert,       //!< The Insert key
+        Delete,       //!< The Delete key
+        Add,          //!< The + key
+        Subtract,     //!< The - key (minus, usually from numpad)
+        Multiply,     //!< The * key
+        Divide,       //!< The / key
+        Left,         //!< Left arrow
+        Right,        //!< Right arrow
+        Up,           //!< Up arrow
+        Down,         //!< Down arrow
+        Numpad0,      //!< The numpad 0 key
+        Numpad1,      //!< The numpad 1 key
+        Numpad2,      //!< The numpad 2 key
+        Numpad3,      //!< The numpad 3 key
+        Numpad4,      //!< The numpad 4 key
+        Numpad5,      //!< The numpad 5 key
+        Numpad6,      //!< The numpad 6 key
+        Numpad7,      //!< The numpad 7 key
+        Numpad8,      //!< The numpad 8 key
+        Numpad9,      //!< The numpad 9 key
+        F1,           //!< The F1 key
+        F2,           //!< The F2 key
+        F3,           //!< The F3 key
+        F4,           //!< The F4 key
+        F5,           //!< The F5 key
+        F6,           //!< The F6 key
+        F7,           //!< The F7 key
+        F8,           //!< The F8 key
+        F9,           //!< The F9 key
+        F10,          //!< The F10 key
+        F11,          //!< The F11 key
+        F12,          //!< The F12 key
+        F13,          //!< The F13 key
+        F14,          //!< The F14 key
+        F15,          //!< The F15 key
+        Pause,        //!< The Pause key
 
-        KeyCount,     ///< Keep last -- the total number of keyboard keys
+        KeyCount,     //!< Keep last -- the total number of keyboard keys
 
         // Deprecated values:
 
-        Dash      = Hyphen,       ///< \deprecated Use Hyphen instead
-        BackSpace = Backspace,    ///< \deprecated Use Backspace instead
-        BackSlash = Backslash,    ///< \deprecated Use Backslash instead
-        SemiColon = Semicolon,    ///< \deprecated Use Semicolon instead
-        Return    = Enter         ///< \deprecated Use Enter instead
+        Dash      = Hyphen,       //!< \deprecated Use Hyphen instead
+        BackSpace = Backspace,    //!< \deprecated Use Backspace instead
+        BackSlash = Backslash,    //!< \deprecated Use Backslash instead
+        SemiColon = Semicolon,    //!< \deprecated Use Semicolon instead
+        Return    = Enter         //!< \deprecated Use Enter instead
     };
 
     ////////////////////////////////////////////////////////////

include/SFML/Window/Mouse.hpp

@@ -50,13 +50,13 @@ public:
     ////////////////////////////////////////////////////////////
     enum Button
     {
-        Left,       ///< The left mouse button
-        Right,      ///< The right mouse button
-        Middle,     ///< The middle (wheel) mouse button
-        XButton1,   ///< The first extra mouse button
-        XButton2,   ///< The second extra mouse button
+        Left,       //!< The left mouse button
+        Right,      //!< The right mouse button
+        Middle,     //!< The middle (wheel) mouse button
+        XButton1,   //!< The first extra mouse button
+        XButton2,   //!< The second extra mouse button
 
-        ButtonCount ///< Keep last -- the total number of mouse buttons
+        ButtonCount //!< Keep last -- the total number of mouse buttons
     };
 
     ////////////////////////////////////////////////////////////
@@ -65,8 +65,8 @@ public:
     ////////////////////////////////////////////////////////////
     enum Wheel
     {
-        VerticalWheel,  ///< The vertical mouse wheel
-        HorizontalWheel ///< The horizontal mouse wheel
+        VerticalWheel,  //!< The vertical mouse wheel
+        HorizontalWheel //!< The horizontal mouse wheel
     };
 
     ////////////////////////////////////////////////////////////

include/SFML/Window/Sensor.hpp

@@ -49,14 +49,14 @@ public:
     ////////////////////////////////////////////////////////////
     enum Type
     {
-        Accelerometer,    ///< Measures the raw acceleration (m/s^2)
-        Gyroscope,        ///< Measures the raw rotation rates (degrees/s)
-        Magnetometer,     ///< Measures the ambient magnetic field (micro-teslas)
-        Gravity,          ///< Measures the direction and intensity of gravity, independent of device acceleration (m/s^2)
-        UserAcceleration, ///< Measures the direction and intensity of device acceleration, independent of the gravity (m/s^2)
-        Orientation,      ///< Measures the absolute 3D orientation (degrees)
+        Accelerometer,    //!< Measures the raw acceleration (m/s^2)
+        Gyroscope,        //!< Measures the raw rotation rates (degrees/s)
+        Magnetometer,     //!< Measures the ambient magnetic field (micro-teslas)
+        Gravity,          //!< Measures the direction and intensity of gravity, independent of device acceleration (m/s^2)
+        UserAcceleration, //!< Measures the direction and intensity of device acceleration, independent of the gravity (m/s^2)
+        Orientation,      //!< Measures the absolute 3D orientation (degrees)
 
-        Count             ///< Keep last -- the total number of sensor types
+        Count             //!< Keep last -- the total number of sensor types
     };
 
     ////////////////////////////////////////////////////////////

include/SFML/Window/VideoMode.hpp

@@ -99,9 +99,9 @@ public:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    unsigned int width;        ///< Video mode width, in pixels
-    unsigned int height;       ///< Video mode height, in pixels
-    unsigned int bitsPerPixel; ///< Video mode pixel depth, in bits per pixels
+    unsigned int width;        //!< Video mode width, in pixels
+    unsigned int height;       //!< Video mode height, in pixels
+    unsigned int bitsPerPixel; //!< Video mode pixel depth, in bits per pixels
 };
 
 ////////////////////////////////////////////////////////////

include/SFML/Window/Window.hpp

@@ -276,9 +276,9 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    priv::GlContext*  m_context;        ///< Platform-specific implementation of the OpenGL context
-    Clock             m_clock;          ///< Clock for measuring the elapsed time between frames
-    Time              m_frameTimeLimit; ///< Current framerate limit
+    priv::GlContext*  m_context;        //!< Platform-specific implementation of the OpenGL context
+    Clock             m_clock;          //!< Clock for measuring the elapsed time between frames
+    Time              m_frameTimeLimit; //!< Current framerate limit
 };
 
 } // namespace sf

include/SFML/Window/WindowBase.hpp

@@ -470,8 +470,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    priv::WindowImpl* m_impl;           ///< Platform-specific implementation of the window
-    Vector2u          m_size;           ///< Current size of the window
+    priv::WindowImpl* m_impl;           //!< Platform-specific implementation of the window
+    Vector2u          m_size;           //!< Current size of the window
 };
 
 } // namespace sf

include/SFML/Window/WindowStyle.hpp

@@ -37,13 +37,13 @@ namespace Style
     ////////////////////////////////////////////////////////////
     enum
     {
-        None       = 0,      ///< No border / title bar (this flag and all others are mutually exclusive)
-        Titlebar   = 1 << 0, ///< Title bar + fixed border
-        Resize     = 1 << 1, ///< Title bar + resizable border + maximize button
-        Close      = 1 << 2, ///< Title bar + close button
-        Fullscreen = 1 << 3, ///< Fullscreen mode (this flag and all others are mutually exclusive)
+        None       = 0,      //!< No border / title bar (this flag and all others are mutually exclusive)
+        Titlebar   = 1 << 0, //!< Title bar + fixed border
+        Resize     = 1 << 1, //!< Title bar + resizable border + maximize button
+        Close      = 1 << 2, //!< Title bar + close button
+        Fullscreen = 1 << 3, //!< Fullscreen mode (this flag and all others are mutually exclusive)
 
-        Default = Titlebar | Resize | Close ///< Default window style
+        Default = Titlebar | Resize | Close //!< Default window style
     };
 }
 

src/SFML/Audio/SoundFileReaderFlac.hpp

@@ -132,8 +132,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    FLAC__StreamDecoder* m_decoder;    ///< FLAC decoder
-    ClientData           m_clientData; ///< Structure passed to the decoder callbacks
+    FLAC__StreamDecoder* m_decoder;    //!< FLAC decoder
+    ClientData           m_clientData; //!< Structure passed to the decoder callbacks
 };
 
 } // namespace priv

src/SFML/Audio/SoundFileReaderWav.hpp

@@ -112,10 +112,10 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    InputStream* m_stream;         ///< Source stream to read from
-    unsigned int m_bytesPerSample; ///< Size of a sample, in bytes
-    Uint64       m_dataStart;      ///< Starting position of the audio data in the open file
-    Uint64       m_dataEnd;        ///< Position one byte past the end of the audio data in the open file
+    InputStream* m_stream;         //!< Source stream to read from
+    unsigned int m_bytesPerSample; //!< Size of a sample, in bytes
+    Uint64       m_dataStart;      //!< Starting position of the audio data in the open file
+    Uint64       m_dataEnd;        //!< Position one byte past the end of the audio data in the open file
 };
 
 } // namespace priv

src/SFML/Audio/SoundFileWriterFlac.hpp

@@ -101,9 +101,9 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    FLAC__StreamEncoder* m_encoder;      ///< FLAC stream encoder
-    unsigned int         m_channelCount; ///< Number of channels
-    std::vector<Int32>   m_samples32;    ///< Conversion buffer
+    FLAC__StreamEncoder* m_encoder;      //!< FLAC stream encoder
+    unsigned int         m_channelCount; //!< Number of channels
+    std::vector<Int32>   m_samples32;    //!< Conversion buffer
 };
 
 } // namespace priv

src/SFML/Audio/SoundFileWriterWav.hpp

@@ -112,7 +112,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::ofstream m_file;         ///< File stream to write to
+    std::ofstream m_file;         //!< File stream to write to
 };
 
 } // namespace priv

src/SFML/Graphics/RenderTextureImplDefault.hpp

@@ -102,9 +102,9 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Context*     m_context; ///< P-Buffer based context
-    unsigned int m_width;   ///< Width of the P-Buffer
-    unsigned int m_height;  ///< Height of the P-Buffer
+    Context*     m_context; //!< P-Buffer based context
+    unsigned int m_width;   //!< Width of the P-Buffer
+    unsigned int m_height;  //!< Height of the P-Buffer
 };
 
 } // namespace priv

src/SFML/Graphics/RenderTextureImplFBO.hpp

@@ -125,16 +125,16 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::map<Uint64, unsigned int> m_frameBuffers;            ///< OpenGL frame buffer objects per context
-    std::map<Uint64, unsigned int> m_multisampleFrameBuffers; ///< Optional per-context OpenGL frame buffer objects with multisample attachments
-    unsigned int                   m_depthStencilBuffer;      ///< Optional depth/stencil buffer attached to the frame buffer
-    unsigned int                   m_colorBuffer;             ///< Optional multisample color buffer attached to the frame buffer
-    unsigned int                   m_width;                   ///< Width of the attachments
-    unsigned int                   m_height;                  ///< Height of the attachments
-    Context*                       m_context;                 ///< Backup OpenGL context, used when none already exist
-    unsigned int                   m_textureId;               ///< The ID of the texture to attach to the FBO
-    bool                           m_multisample;             ///< Whether we have to create a multisample frame buffer as well
-    bool                           m_stencil;                 ///< Whether we have stencil attachment
+    std::map<Uint64, unsigned int> m_frameBuffers;            //!< OpenGL frame buffer objects per context
+    std::map<Uint64, unsigned int> m_multisampleFrameBuffers; //!< Optional per-context OpenGL frame buffer objects with multisample attachments
+    unsigned int                   m_depthStencilBuffer;      //!< Optional depth/stencil buffer attached to the frame buffer
+    unsigned int                   m_colorBuffer;             //!< Optional multisample color buffer attached to the frame buffer
+    unsigned int                   m_width;                   //!< Width of the attachments
+    unsigned int                   m_height;                  //!< Height of the attachments
+    Context*                       m_context;                 //!< Backup OpenGL context, used when none already exist
+    unsigned int                   m_textureId;               //!< The ID of the texture to attach to the FBO
+    bool                           m_multisample;             //!< Whether we have to create a multisample frame buffer as well
+    bool                           m_stencil;                 //!< Whether we have stencil attachment
 };
 
 } // namespace priv

src/SFML/Graphics/Shader.cpp

@@ -211,10 +211,10 @@ struct Shader::UniformBinder : private NonCopyable
             glCheck(GLEXT_glUseProgramObject(savedProgram));
     }
 
-    TransientContextLock lock;           ///< Lock to keep context active while uniform is bound
-    GLEXT_GLhandle       savedProgram;   ///< Handle to the previously active program object
-    GLEXT_GLhandle       currentProgram; ///< Handle to the program object of the modified sf::Shader instance
-    GLint                location;       ///< Uniform location, used by the surrounding sf::Shader code
+    TransientContextLock lock;           //!< Lock to keep context active while uniform is bound
+    GLEXT_GLhandle       savedProgram;   //!< Handle to the previously active program object
+    GLEXT_GLhandle       currentProgram; //!< Handle to the program object of the modified sf::Shader instance
+    GLint                location;       //!< Uniform location, used by the surrounding sf::Shader code
 };
 
 

src/SFML/Graphics/TextureSaver.hpp

@@ -64,7 +64,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    GLint m_textureBinding; ///< Texture binding to restore
+    GLint m_textureBinding; //!< Texture binding to restore
 };
 
 } // namespace priv

src/SFML/Network/Ftp.cpp

@@ -60,8 +60,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Ftp&      m_ftp;        ///< Reference to the owner Ftp instance
-    TcpSocket m_dataSocket; ///< Socket used for data transfers
+    Ftp&      m_ftp;        //!< Reference to the owner Ftp instance
+    TcpSocket m_dataSocket; //!< Socket used for data transfers
 };
 
 

src/SFML/Network/SocketSelector.cpp

@@ -42,10 +42,10 @@ namespace sf
 ////////////////////////////////////////////////////////////
 struct SocketSelector::SocketSelectorImpl
 {
-    fd_set allSockets;   ///< Set containing all the sockets handles
-    fd_set socketsReady; ///< Set containing handles of the sockets that are ready
-    int    maxSocket;    ///< Maximum socket handle
-    int    socketCount;  ///< Number of socket handles
+    fd_set allSockets;   //!< Set containing all the sockets handles
+    fd_set socketsReady; //!< Set containing handles of the sockets that are ready
+    int    maxSocket;    //!< Maximum socket handle
+    int    socketCount;  //!< Number of socket handles
 };
 
 

src/SFML/System/Win32/MutexImpl.hpp

@@ -72,7 +72,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    CRITICAL_SECTION m_mutex; ///< Win32 handle of the mutex
+    CRITICAL_SECTION m_mutex; //!< Win32 handle of the mutex
 };
 
 } // namespace priv

src/SFML/System/Win32/ThreadImpl.hpp

@@ -97,8 +97,8 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    HANDLE m_thread; ///< Win32 thread handle
-    unsigned int m_threadId; ///< Win32 thread identifier
+    HANDLE m_thread; //!< Win32 thread handle
+    unsigned int m_threadId; //!< Win32 thread identifier
 };
 
 } // namespace priv

src/SFML/System/Win32/ThreadLocalImpl.hpp

@@ -76,7 +76,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    DWORD m_index; ///< Index of our thread-local storage slot
+    DWORD m_index; //!< Index of our thread-local storage slot
 };
 
 } // namespace priv

src/SFML/Window/EglContext.hpp

@@ -188,10 +188,10 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    EGLDisplay  m_display; ///< The internal EGL display
-    EGLContext  m_context; ///< The internal EGL context
-    EGLSurface  m_surface; ///< The internal EGL surface
-    EGLConfig   m_config;  ///< The internal EGL config
+    EGLDisplay  m_display; //!< The internal EGL display
+    EGLContext  m_context; //!< The internal EGL context
+    EGLSurface  m_surface; //!< The internal EGL surface
+    EGLConfig   m_config;  //!< The internal EGL config
 
 };
 

src/SFML/Window/GlContext.hpp

@@ -273,7 +273,7 @@ protected:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    ContextSettings m_settings; ///< Creation settings of the context
+    ContextSettings m_settings; //!< Creation settings of the context
 
 private:
 
@@ -294,7 +294,7 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    const Uint64 m_id; ///< Unique number that identifies the context
+    const Uint64 m_id; //!< Unique number that identifies the context
 };
 
 } // namespace priv

src/SFML/Window/JoystickImpl.hpp

@@ -50,8 +50,8 @@ struct JoystickCaps
         std::fill(axes, axes + Joystick::AxisCount, false);
     }
 
-    unsigned int buttonCount;               ///< Number of buttons supported by the joystick
-    bool         axes[Joystick::AxisCount]; ///< Support for each axis
+    unsigned int buttonCount;               //!< Number of buttons supported by the joystick
+    bool         axes[Joystick::AxisCount]; //!< Support for each axis
 };
 
 
@@ -68,9 +68,9 @@ struct JoystickState
         std::fill(buttons, buttons + Joystick::ButtonCount, false);
     }
 
-    bool  connected;                      ///< Is the joystick currently connected?
-    float axes[Joystick::AxisCount];      ///< Position of each axis, in range [-100, 100]
-    bool  buttons[Joystick::ButtonCount]; ///< Status of each button (true = pressed)
+    bool  connected;                      //!< Is the joystick currently connected?
+    float axes[Joystick::AxisCount];      //!< Position of each axis, in range [-100, 100]
+    bool  buttons[Joystick::ButtonCount]; //!< Status of each button (true = pressed)
 };
 
 } // namespace priv

src/SFML/Window/JoystickManager.hpp

@@ -109,16 +109,16 @@ private:
     ////////////////////////////////////////////////////////////
     struct Item
     {
-        JoystickImpl             joystick;       ///< Joystick implementation
-        JoystickState            state;          ///< The current joystick state
-        JoystickCaps             capabilities;   ///< The joystick capabilities
-        Joystick::Identification identification; ///< The joystick identification
+        JoystickImpl             joystick;       //!< Joystick implementation
+        JoystickState            state;          //!< The current joystick state
+        JoystickCaps             capabilities;   //!< The joystick capabilities
+        Joystick::Identification identification; //!< The joystick identification
     };
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Item m_joysticks[Joystick::Count]; ///< Joysticks information and state
+    Item m_joysticks[Joystick::Count]; //!< Joysticks information and state
 };
 
 } // namespace priv

src/SFML/Window/SensorManager.hpp

@@ -118,16 +118,16 @@ private:
     ////////////////////////////////////////////////////////////
     struct Item
     {
-        bool available;    ///< Is the sensor available on this device?
-        bool enabled;      ///< Current enable state of the sensor
-        SensorImpl sensor; ///< Sensor implementation
-        Vector3f value;    ///< The current sensor value
+        bool available;    //!< Is the sensor available on this device?
+        bool enabled;      //!< Current enable state of the sensor
+        SensorImpl sensor; //!< Sensor implementation
+        Vector3f value;    //!< The current sensor value
     };
 
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    Item m_sensors[Sensor::Count]; ///< Sensors information and state
+    Item m_sensors[Sensor::Count]; //!< Sensors information and state
 };
 
 } // namespace priv

src/SFML/Window/Win32/JoystickImpl.hpp

@@ -220,13 +220,13 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    unsigned int             m_index;                          ///< Index of the joystick
-    JOYCAPS                  m_caps;                           ///< Joystick capabilities
-    IDirectInputDevice8W*    m_device;                         ///< DirectInput 8.x device
-    DIDEVCAPS                m_deviceCaps;                     ///< DirectInput device capabilities
-    int                      m_axes[Joystick::AxisCount];      ///< Offsets to the bytes containing the axes states, -1 if not available
-    int                      m_buttons[Joystick::ButtonCount]; ///< Offsets to the bytes containing the button states, -1 if not available
-    Joystick::Identification m_identification;                 ///< Joystick identification
+    unsigned int             m_index;                          //!< Index of the joystick
+    JOYCAPS                  m_caps;                           //!< Joystick capabilities
+    IDirectInputDevice8W*    m_device;                         //!< DirectInput 8.x device
+    DIDEVCAPS                m_deviceCaps;                     //!< DirectInput device capabilities
+    int                      m_axes[Joystick::AxisCount];      //!< Offsets to the bytes containing the axes states, -1 if not available
+    int                      m_buttons[Joystick::ButtonCount]; //!< Offsets to the bytes containing the button states, -1 if not available
+    Joystick::Identification m_identification;                 //!< Joystick identification
 };
 
 } // namespace priv

src/SFML/Window/Win32/WglContext.hpp

@@ -179,11 +179,11 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    HWND        m_window;        ///< Window to which the context is attached
-    HPBUFFERARB m_pbuffer;       ///< Handle to a pbuffer if one was created
-    HDC         m_deviceContext; ///< Device context associated to the context
-    HGLRC       m_context;       ///< OpenGL context
-    bool        m_ownsWindow;    ///< Do we own the target window?
+    HWND        m_window;        //!< Window to which the context is attached
+    HPBUFFERARB m_pbuffer;       //!< Handle to a pbuffer if one was created
+    HDC         m_deviceContext; //!< Device context associated to the context
+    HGLRC       m_context;       //!< OpenGL context
+    bool        m_ownsWindow;    //!< Do we own the target window?
 };
 
 } // namespace priv

src/SFML/Window/Win32/WindowImplWin32.hpp

@@ -272,18 +272,18 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    HWND     m_handle;           ///< Win32 handle of the window
-    LONG_PTR m_callback;         ///< Stores the original event callback function of the control
-    bool     m_cursorVisible;    ///< Is the cursor visible or hidden?
-    HCURSOR  m_lastCursor;       ///< Last cursor used -- this data is not owned by the window and is required to be always valid
-    HICON    m_icon;             ///< Custom icon assigned to the window
-    bool     m_keyRepeatEnabled; ///< Automatic key-repeat state for keydown events
-    Vector2u m_lastSize;         ///< The last handled size of the window
-    bool     m_resizing;         ///< Is the window being resized?
-    Uint16   m_surrogate;        ///< First half of the surrogate pair, in case we're receiving a Unicode character in two events
-    bool     m_mouseInside;      ///< Mouse is inside the window?
-    bool     m_fullscreen;       ///< Is the window fullscreen?
-    bool     m_cursorGrabbed;    ///< Is the mouse cursor trapped?
+    HWND     m_handle;           //!< Win32 handle of the window
+    LONG_PTR m_callback;         //!< Stores the original event callback function of the control
+    bool     m_cursorVisible;    //!< Is the cursor visible or hidden?
+    HCURSOR  m_lastCursor;       //!< Last cursor used -- this data is not owned by the window and is required to be always valid
+    HICON    m_icon;             //!< Custom icon assigned to the window
+    bool     m_keyRepeatEnabled; //!< Automatic key-repeat state for keydown events
+    Vector2u m_lastSize;         //!< The last handled size of the window
+    bool     m_resizing;         //!< Is the window being resized?
+    Uint16   m_surrogate;        //!< First half of the surrogate pair, in case we're receiving a Unicode character in two events
+    bool     m_mouseInside;      //!< Mouse is inside the window?
+    bool     m_fullscreen;       //!< Is the window fullscreen?
+    bool     m_cursorGrabbed;    //!< Is the mouse cursor trapped?
 };
 
 } // namespace priv

src/SFML/Window/WindowImpl.hpp

@@ -282,11 +282,11 @@ private:
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    std::queue<Event> m_events;                                              ///< Queue of available events
-    JoystickState     m_joystickStates[Joystick::Count];                     ///< Previous state of the joysticks
-    Vector3f          m_sensorValue[Sensor::Count];                          ///< Previous value of the sensors
-    float             m_joystickThreshold;                                   ///< Joystick threshold (minimum motion for "move" event to be generated)
-    float             m_previousAxes[Joystick::Count][Joystick::AxisCount];  ///< Position of each axis last time a move event triggered, in range [-100, 100]
+    std::queue<Event> m_events;                                              //!< Queue of available events
+    JoystickState     m_joystickStates[Joystick::Count];                     //!< Previous state of the joysticks
+    Vector3f          m_sensorValue[Sensor::Count];                          //!< Previous value of the sensors
+    float             m_joystickThreshold;                                   //!< Joystick threshold (minimum motion for "move" event to be generated)
+    float             m_previousAxes[Joystick::Count][Joystick::AxisCount];  //!< Position of each axis last time a move event triggered, in range [-100, 100]
 };
 
 } // namespace priv