From acabaadc0b156e2d00029cb1a232d1bc4a6a211c Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Mon, 4 Jul 2022 23:46:34 -0600 Subject: [PATCH] Remove unnecessary `sf::` usage --- test/TestUtilities/GraphicsUtil.cpp | 6 +++--- test/TestUtilities/GraphicsUtil.hpp | 2 +- test/TestUtilities/SystemUtil.cpp | 6 +++--- test/TestUtilities/SystemUtil.hpp | 10 +++++----- test/TestUtilities/WindowUtil.cpp | 2 +- test/TestUtilities/WindowUtil.hpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/TestUtilities/GraphicsUtil.cpp b/test/TestUtilities/GraphicsUtil.cpp index d22a5c14e..3a2d55b71 100644 --- a/test/TestUtilities/GraphicsUtil.cpp +++ b/test/TestUtilities/GraphicsUtil.cpp @@ -7,7 +7,7 @@ namespace sf { -std::ostream& operator<<(std::ostream& os, const sf::BlendMode& blendMode) +std::ostream& operator<<(std::ostream& os, const BlendMode& blendMode) { os << "( " << blendMode.colorSrcFactor << ", " << blendMode.colorDstFactor << ", " << blendMode.colorEquation << ", " << blendMode.alphaSrcFactor << ", " << blendMode.alphaDstFactor << ", " << blendMode.alphaEquation << " )"; @@ -15,7 +15,7 @@ std::ostream& operator<<(std::ostream& os, const sf::BlendMode& blendMode) return os; } -std::ostream& operator<<(std::ostream& os, const sf::Color& color) +std::ostream& operator<<(std::ostream& os, const Color& color) { os << "0x" << std::hex << color.toInteger() << std::dec << " (r=" << static_cast(color.r) << ", g=" << static_cast(color.g) << ", b=" << static_cast(color.b) @@ -24,7 +24,7 @@ std::ostream& operator<<(std::ostream& os, const sf::Color& color) return os; } -std::ostream& operator<<(std::ostream& os, const sf::Transform& transform) +std::ostream& operator<<(std::ostream& os, const Transform& transform) { const auto& matrix = transform.getMatrix(); os << matrix[0] << ", " << matrix[4] << ", " << matrix[12] << ", "; diff --git a/test/TestUtilities/GraphicsUtil.hpp b/test/TestUtilities/GraphicsUtil.hpp index fa4332863..67dbc96d6 100644 --- a/test/TestUtilities/GraphicsUtil.hpp +++ b/test/TestUtilities/GraphicsUtil.hpp @@ -23,7 +23,7 @@ std::ostream& operator<<(std::ostream& os, const Color& color); std::ostream& operator<<(std::ostream& os, const Transform& transform); template -std::ostream& operator<<(std::ostream& os, const sf::Rect& rect) +std::ostream& operator<<(std::ostream& os, const Rect& rect) { const auto flags = os.flags(); os << std::fixed << std::setprecision(std::numeric_limits::max_digits10); diff --git a/test/TestUtilities/SystemUtil.cpp b/test/TestUtilities/SystemUtil.cpp index 08107dd52..63b00b8cb 100644 --- a/test/TestUtilities/SystemUtil.cpp +++ b/test/TestUtilities/SystemUtil.cpp @@ -8,20 +8,20 @@ namespace sf { -std::ostream& operator<<(std::ostream& os, const sf::Angle& angle) +std::ostream& operator<<(std::ostream& os, const Angle& angle) { os << std::fixed << std::setprecision(std::numeric_limits::max_digits10); os << angle.asDegrees() << " deg"; return os; } -std::ostream& operator<<(std::ostream& os, const sf::String& string) +std::ostream& operator<<(std::ostream& os, const String& string) { os << string.toAnsiString(); return os; } -std::ostream& operator<<(std::ostream& os, sf::Time time) +std::ostream& operator<<(std::ostream& os, Time time) { os << time.asMicroseconds() << "us"; return os; diff --git a/test/TestUtilities/SystemUtil.hpp b/test/TestUtilities/SystemUtil.hpp index cfd4d689e..d66c1f433 100644 --- a/test/TestUtilities/SystemUtil.hpp +++ b/test/TestUtilities/SystemUtil.hpp @@ -20,12 +20,12 @@ class Angle; class String; class Time; -std::ostream& operator<<(std::ostream& os, const sf::Angle& angle); -std::ostream& operator<<(std::ostream& os, const sf::String& string); -std::ostream& operator<<(std::ostream& os, sf::Time time); +std::ostream& operator<<(std::ostream& os, const Angle& angle); +std::ostream& operator<<(std::ostream& os, const String& string); +std::ostream& operator<<(std::ostream& os, Time time); template -std::ostream& operator<<(std::ostream& os, const sf::Vector2& vector) +std::ostream& operator<<(std::ostream& os, const Vector2& vector) { os << std::fixed << std::setprecision(std::numeric_limits::max_digits10); os << "(" << vector.x << ", " << vector.y << ")"; @@ -33,7 +33,7 @@ std::ostream& operator<<(std::ostream& os, const sf::Vector2& vector) } template -std::ostream& operator<<(std::ostream& os, const sf::Vector3& vector) +std::ostream& operator<<(std::ostream& os, const Vector3& vector) { os << "(" << vector.x << ", " << vector.y << ", " << vector.z << ")"; return os; diff --git a/test/TestUtilities/WindowUtil.cpp b/test/TestUtilities/WindowUtil.cpp index eb8a79cab..9ff003476 100644 --- a/test/TestUtilities/WindowUtil.cpp +++ b/test/TestUtilities/WindowUtil.cpp @@ -5,7 +5,7 @@ namespace sf { -std::ostream& operator<<(std::ostream& os, const sf::VideoMode& videoMode) +std::ostream& operator<<(std::ostream& os, const VideoMode& videoMode) { os << videoMode.size.x << "x" << videoMode.size.y << "x" << videoMode.bitsPerPixel; return os; diff --git a/test/TestUtilities/WindowUtil.hpp b/test/TestUtilities/WindowUtil.hpp index 56b4cf646..7721fd708 100644 --- a/test/TestUtilities/WindowUtil.hpp +++ b/test/TestUtilities/WindowUtil.hpp @@ -13,7 +13,7 @@ namespace sf { class VideoMode; -std::ostream& operator<<(std::ostream& os, const sf::VideoMode& videoMode); +std::ostream& operator<<(std::ostream& os, const VideoMode& videoMode); } // namespace sf #endif // SFML_TESTUTILITIES_WINDOW_HPP