From 16cce399d26af1cb6bdee8c2c04fc5daed3f74b1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 24 Jul 2023 18:22:59 -0700 Subject: [PATCH] QString: use equalStrings in operator== and operator!= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QStringView already did since 6.0. I don't know how we missed this. Change-Id: I5acc02341c5940499682fffd1774f7c3a807317a Reviewed-by: Mårten Nordheim (cherry picked from commit 3c4c7860f08e45de2965ea544a8eb742549bb150) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qstring.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 1ab4ed97874..d4d07316a7e 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -692,7 +692,7 @@ public: static QString number(double, char format='g', int precision=6); friend bool operator==(const QString &s1, const QString &s2) noexcept - { return (s1.size() == s2.size()) && QtPrivate::compareStrings(s1, s2, Qt::CaseSensitive) == 0; } + { return (s1.size() == s2.size()) && QtPrivate::equalStrings(s1, s2); } friend bool operator< (const QString &s1, const QString &s2) noexcept { return QtPrivate::compareStrings(s1, s2, Qt::CaseSensitive) < 0; } friend bool operator> (const QString &s1, const QString &s2) noexcept { return s2 < s1; } @@ -701,7 +701,7 @@ public: friend bool operator>=(const QString &s1, const QString &s2) noexcept { return !(s1 < s2); } friend bool operator==(const QString &s1, QLatin1StringView s2) noexcept - { return (s1.size() == s2.size()) && QtPrivate::compareStrings(s1, s2, Qt::CaseSensitive) == 0; } + { return (s1.size() == s2.size()) && QtPrivate::equalStrings(s1, s2); } friend bool operator< (const QString &s1, QLatin1StringView s2) noexcept { return QtPrivate::compareStrings(s1, s2, Qt::CaseSensitive) < 0; } friend bool operator> (const QString &s1, QLatin1StringView s2) noexcept