From f6186d880dd2bdbf8428fbc329e6c9167fedc716 Mon Sep 17 00:00:00 2001 From: Vittorio Romeo Date: Thu, 9 Dec 2021 00:48:43 +0000 Subject: [PATCH] Remove deprecated 'Text::[set|get]Color' --- include/SFML/Graphics/Text.hpp | 32 -------------------------------- src/SFML/Graphics/Text.cpp | 14 -------------- 2 files changed, 46 deletions(-) diff --git a/include/SFML/Graphics/Text.hpp b/include/SFML/Graphics/Text.hpp index aa62e2179..a36a1acb6 100644 --- a/include/SFML/Graphics/Text.hpp +++ b/include/SFML/Graphics/Text.hpp @@ -191,24 +191,6 @@ public: //////////////////////////////////////////////////////////// void setStyle(Uint32 style); - //////////////////////////////////////////////////////////// - /// \brief Set the fill color of the 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 color New fill color of the text - /// - /// \see getFillColor - /// - /// \deprecated There is now fill and outline colors instead - /// of a single global color. - /// Use setFillColor() or setOutlineColor() instead. - /// - //////////////////////////////////////////////////////////// - [[deprecated]] void setColor(const Color& color); - //////////////////////////////////////////////////////////// /// \brief Set the fill color of the text /// @@ -323,20 +305,6 @@ public: //////////////////////////////////////////////////////////// Uint32 getStyle() const; - //////////////////////////////////////////////////////////// - /// \brief Get the fill color of the text - /// - /// \return Fill color of the text - /// - /// \see setFillColor - /// - /// \deprecated There is now fill and outline colors instead - /// of a single global color. - /// Use getFillColor() or getOutlineColor() instead. - /// - //////////////////////////////////////////////////////////// - [[deprecated]] const Color& getColor() const; - //////////////////////////////////////////////////////////// /// \brief Get the fill color of the text /// diff --git a/src/SFML/Graphics/Text.cpp b/src/SFML/Graphics/Text.cpp index b22ee2c8e..bd125840b 100644 --- a/src/SFML/Graphics/Text.cpp +++ b/src/SFML/Graphics/Text.cpp @@ -182,13 +182,6 @@ void Text::setStyle(Uint32 style) } -//////////////////////////////////////////////////////////// -void Text::setColor(const Color& color) -{ - setFillColor(color); -} - - //////////////////////////////////////////////////////////// void Text::setFillColor(const Color& color) { @@ -278,13 +271,6 @@ Uint32 Text::getStyle() const } -//////////////////////////////////////////////////////////// -const Color& Text::getColor() const -{ - return getFillColor(); -} - - //////////////////////////////////////////////////////////// const Color& Text::getFillColor() const {