Remove deprecated interfaces

include/SFML/Graphics/PrimitiveType.h

@@ -46,9 +46,4 @@ typedef enum
     sfTriangles,     ///< List of individual triangles
     sfTriangleStrip, ///< List of connected triangles, a point uses the two previous points to form a triangle
     sfTriangleFan,   ///< List of connected triangles, a point uses the common center and the previous point to form a triangle
-    sfQuads,         ///< List of individual quads
-
-    sfLinesStrip     = sfLineStrip,     ///< \deprecated Use sfLineStrip instead
-    sfTrianglesStrip = sfTriangleStrip, ///< \deprecated Use sfTriangleStrip instead
-    sfTrianglesFan   = sfTriangleFan    ///< \deprecated Use sfTriangleFan instead
 } sfPrimitiveType;

include/SFML/Graphics/Text.h

@@ -325,22 +325,6 @@ CSFML_GRAPHICS_API void sfText_setLetterSpacing(sfText* text, float spacingFacto
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API void sfText_setStyle(sfText* text, uint32_t style);
 
-////////////////////////////////////////////////////////////
-/// \brief Set the fill color of a text
-///
-/// By default, the text's fill color is opaque white.
-/// Setting the fill color to a transparent color with an outline
-/// will cause the outline to be displayed in the fill area of the text.
-///
-/// \param text  Text object
-/// \param color New fill color of the text
-///
-/// \deprecated This function is deprecated and may be removed in future releases.
-/// Use sfText_setFillColor instead.
-///
-////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API void sfText_setColor(sfText* text, sfColor color);
-
 ////////////////////////////////////////////////////////////
 /// \brief Set the fill color of a text
 ///
@@ -458,19 +442,6 @@ CSFML_GRAPHICS_API float sfText_getLineSpacing(const sfText* text);
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API uint32_t sfText_getStyle(const sfText* text);
 
-////////////////////////////////////////////////////////////
-/// \brief Get the fill color of a text
-///
-/// \param text Text object
-///
-/// \return Fill color of the text
-///
-/// \deprecated This function is deprecated and may be removed in future releases.
-/// Use sfText_getFillColor instead.
-///
-////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API sfColor sfText_getColor(const sfText* text);
-
 ////////////////////////////////////////////////////////////
 /// \brief Get the fill color of a text
 ///

include/SFML/Window/Keyboard.h

@@ -144,16 +144,6 @@ typedef enum
     sfKeyPause,        ///< The Pause key
 
     sfKeyCount,      ///< Keep last -- the total number of keyboard keys
-
-    // Deprecated values:
-
-    sfKeyTilde     = sfKeyGrave,     ///< \deprecated Use Grave instead
-    sfKeyDash      = sfKeyHyphen,    ///< \deprecated Use Hyphen instead
-    sfKeyBack      = sfKeyBackspace, ///< \deprecated Use Backspace instead
-    sfKeyBackSlash = sfKeyBackslash, ///< \deprecated Use Backslash instead
-    sfKeySemiColon = sfKeySemicolon, ///< \deprecated Use Semicolon instead
-    sfKeyReturn    = sfKeyEnter,     ///< \deprecated Use Enter instead
-    sfKeyQuote     = sfKeyApostrophe ///< \deprecated Use Apostrophe instead
 } sfKeyCode;
 
 

src/SFML/Graphics/Text.cpp

@@ -229,13 +229,6 @@ void sfText_setStyle(sfText* text, uint32_t style)
 }
 
 
-////////////////////////////////////////////////////////////
-void sfText_setColor(sfText* text, sfColor color)
-{
-    sfText_setFillColor(text, color);
-}
-
-
 ////////////////////////////////////////////////////////////
 void sfText_setFillColor(sfText* text, sfColor color)
 {
@@ -315,13 +308,6 @@ uint32_t sfText_getStyle(const sfText* text)
 }
 
 
-////////////////////////////////////////////////////////////
-sfColor sfText_getColor(const sfText* text)
-{
-    return sfText_getFillColor(text);
-}
-
-
 ////////////////////////////////////////////////////////////
 sfColor sfText_getFillColor(const sfText* text)
 {