From 9f65db2e2b5f0f7e6e441d7bbfbe7f151ccee842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 7 Mar 2022 09:55:42 +0100
Subject: [PATCH] Math: use String::contains() instead of std::find().

An old TODO, yay!
---
 src/Magnum/Math/Angle.cpp | 10 +++++-----
 src/Magnum/Math/Half.cpp  |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Magnum/Math/Angle.cpp b/src/Magnum/Math/Angle.cpp
index 60811b9df..5a08cf5ba 100644
--- a/src/Magnum/Math/Angle.cpp
+++ b/src/Magnum/Math/Angle.cpp
@@ -26,7 +26,7 @@
 #include "Angle.h"
 
 #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) || defined(CORRADE_TARGET_EMSCRIPTEN)
-#include <algorithm> /** @todo get rid of this once StringView::find() exists */
+#include <cstdlib>
 #include <Corrade/Containers/StringView.h>
 #include <Corrade/Utility/TweakableParser.h>
 
@@ -38,7 +38,7 @@ std::pair<TweakableState, Magnum::Math::Deg<Magnum::Float>> TweakableParser<Magn
     char* end;
     const Magnum::Float result = std::strtof(value.data(), &end);
 
-    if(end == value.begin() || std::find(value.begin(), value.end(), '.') == value.end()) {
+    if(end == value.begin() || !value.contains('.')) {
         Warning{} << "Utility::TweakableParser:" << value << "is not an angle literal";
         return {TweakableState::Recompile, {}};
     }
@@ -62,7 +62,7 @@ std::pair<TweakableState, Magnum::Math::Deg<Magnum::Double>> TweakableParser<Mag
     char* end;
     const Magnum::Double result = std::strtod(value.data(), &end);
 
-    if(end == value.begin() || std::find(value.begin(), value.end(), '.') == value.end()) {
+    if(end == value.begin() || !value.contains('.')) {
         Warning{} << "Utility::TweakableParser:" << value << "is not an angle literal";
         return {TweakableState::Recompile, {}};
     }
@@ -86,7 +86,7 @@ std::pair<TweakableState, Magnum::Math::Rad<Magnum::Float>> TweakableParser<Magn
     char* end;
     const Magnum::Float result = std::strtof(value.data(), &end);
 
-    if(end == value.begin() || std::find(value.begin(), value.end(), '.') == value.end()) {
+    if(end == value.begin() || !value.contains('.')) {
         Warning{} << "Utility::TweakableParser:" << value << "is not an angle literal";
         return {TweakableState::Recompile, {}};
     }
@@ -110,7 +110,7 @@ std::pair<TweakableState, Magnum::Math::Rad<Magnum::Double>> TweakableParser<Mag
     char* end;
     const Magnum::Double result = std::strtod(value.data(), &end);
 
-    if(end == value.begin() || std::find(value.begin(), value.end(), '.') == value.end()) {
+    if(end == value.begin() || !value.contains('.')) {
         Warning{} << "Utility::TweakableParser:" << value << "is not an angle literal";
         return {TweakableState::Recompile, {}};
     }
diff --git a/src/Magnum/Math/Half.cpp b/src/Magnum/Math/Half.cpp
index 2534254f9..eba7515a2 100644
--- a/src/Magnum/Math/Half.cpp
+++ b/src/Magnum/Math/Half.cpp
@@ -30,7 +30,6 @@
 #include <Corrade/Utility/DebugStl.h>
 
 #if defined(DOXYGEN_GENERATING_OUTPUT) || defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT)) || defined(CORRADE_TARGET_EMSCRIPTEN)
-#include <algorithm> /** @todo get rid of this once StringView::find() exists */
 #include <Corrade/Containers/StringView.h>
 #include <Corrade/Utility/TweakableParser.h>
 #endif
@@ -56,7 +55,7 @@ std::pair<TweakableState, Magnum::Math::Half> TweakableParser<Magnum::Math::Half
     char* end;
     const Magnum::Float result = std::strtof(value.data(), &end);
 
-    if(end == value.begin() || std::find(value.begin(), value.end(), '.') == value.end()) {
+    if(end == value.begin() || !value.contains('.')) {
         Warning{} << "Utility::TweakableParser:" << value << "is not a half literal";
         return {TweakableState::Recompile, {}};
     }