From 690cc978eae3812bb07cac602588aa10b8a69c38 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Fri, 23 Aug 2024 14:12:32 +0200
Subject: [PATCH] Rename new QTZ::aliasMatches to hasAlternativeName

Raised in 6.8 API change review. The use of "matches" in a name suggests
pattern-matching, which isn't what happens here.

Task-number: QTBUG-125859
Change-Id: I8aa05b117807b9d1b9b737cd63d44fb4a30f6fa5
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 6b36e5de7656e1d9e23364c596cc82f8068d4452)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/time/qtimezone.cpp                |  2 +-
 src/corelib/time/qtimezone.h                  |  2 +-
 .../corelib/time/qtimezone/tst_qtimezone.cpp  | 30 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/corelib/time/qtimezone.cpp b/src/corelib/time/qtimezone.cpp
index 8ce967cf9fc..f71d7288050 100644
--- a/src/corelib/time/qtimezone.cpp
+++ b/src/corelib/time/qtimezone.cpp
@@ -843,7 +843,7 @@ QByteArray QTimeZone::id() const
 
     This method is only available when feature \c timezone is enabled.
 */
-bool QTimeZone::aliasMatches(QByteArrayView alias) const
+bool QTimeZone::hasAlternativeName(QByteArrayView alias) const
 {
     if (alias == id())
         return true;
diff --git a/src/corelib/time/qtimezone.h b/src/corelib/time/qtimezone.h
index 6c490c4e252..7fd3a6f1288 100644
--- a/src/corelib/time/qtimezone.h
+++ b/src/corelib/time/qtimezone.h
@@ -166,7 +166,7 @@ public:
     };
     typedef QList<OffsetData> OffsetDataList;
 
-    bool aliasMatches(QByteArrayView alias) const;
+    bool hasAlternativeName(QByteArrayView alias) const;
     QByteArray id() const;
     QLocale::Territory territory() const;
 #  if QT_DEPRECATED_SINCE(6, 6)
diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
index e71f32a3cad..34010e9beb8 100644
--- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
+++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
@@ -41,8 +41,8 @@ private Q_SLOTS:
     void availableTimeZoneIds();
     void utcOffsetId_data();
     void utcOffsetId();
-    void aliasMatches_data();
-    void aliasMatches();
+    void hasAlternativeName_data();
+    void hasAlternativeName();
     void specificTransition_data();
     void specificTransition();
     void transitionEachZone_data();
@@ -565,7 +565,7 @@ void tst_QTimeZone::isTimeZoneIdAvailable()
         QVERIFY2(QTimeZone::isTimeZoneIdAvailable(id), id);
         const QTimeZone zone(id);
         QVERIFY2(zone.isValid(), id);
-        QVERIFY2(zone.aliasMatches(id), zone.id() + " != " + id);
+        QVERIFY2(zone.hasAlternativeName(id), zone.id() + " != " + id);
     }
     // availableTimeZoneIds() doesn't list all possible offset IDs, but
     // isTimeZoneIdAvailable() should accept them.
@@ -708,7 +708,7 @@ void tst_QTimeZone::utcOffsetId()
     }
 }
 
-void tst_QTimeZone::aliasMatches_data()
+void tst_QTimeZone::hasAlternativeName_data()
 {
     QTest::addColumn<QByteArray>("iana");
     QTest::addColumn<QByteArray>("alias");
@@ -735,7 +735,7 @@ void tst_QTimeZone::aliasMatches_data()
     QTest::newRow("Enderbury=Enderbury") << "Pacific/Enderbury"_ba << "Pacific/Enderbury"_ba;
 }
 
-void tst_QTimeZone::aliasMatches()
+void tst_QTimeZone::hasAlternativeName()
 {
     QFETCH(const QByteArray, iana);
     QFETCH(const QByteArray, alias);
@@ -749,14 +749,14 @@ void tst_QTimeZone::aliasMatches()
         qDebug("Using %s and %s", zid.constData(), pid.constData());
     });
     QVERIFY2(peer.isValid(), "Construction should have fallen back on IANA ID");
-    QVERIFY(zone.aliasMatches(zone.id()));
-    QVERIFY(zone.aliasMatches(iana));
-    QVERIFY(peer.aliasMatches(peer.id()));
-    QVERIFY(peer.aliasMatches(alias));
-    QVERIFY(zone.aliasMatches(peer.id()));
-    QVERIFY(zone.aliasMatches(alias));
-    QVERIFY(peer.aliasMatches(zone.id()));
-    QVERIFY(peer.aliasMatches(iana));
+    QVERIFY(zone.hasAlternativeName(zone.id()));
+    QVERIFY(zone.hasAlternativeName(iana));
+    QVERIFY(peer.hasAlternativeName(peer.id()));
+    QVERIFY(peer.hasAlternativeName(alias));
+    QVERIFY(zone.hasAlternativeName(peer.id()));
+    QVERIFY(zone.hasAlternativeName(alias));
+    QVERIFY(peer.hasAlternativeName(zone.id()));
+    QVERIFY(peer.hasAlternativeName(iana));
     report.dismiss();
 }
 
@@ -984,7 +984,7 @@ void tst_QTimeZone::stressTest()
     for (const QByteArray &id : idList) {
         QTimeZone testZone = QTimeZone(id);
         QCOMPARE(testZone.isValid(), true);
-        QVERIFY2(testZone.aliasMatches(id), testZone.id() + " != " + id);
+        QVERIFY2(testZone.hasAlternativeName(id), testZone.id() + " != " + id);
         QDateTime testDate = QDateTime(QDate(2015, 1, 1), QTime(0, 0), UTC);
         testZone.territory();
         testZone.comment();
@@ -1920,7 +1920,7 @@ void tst_QTimeZone::stdCompatibility()
     QByteArrayView zoneName = QByteArrayView(timeZone->name());
     QTimeZone tz = QTimeZone::fromStdTimeZonePtr(timeZone);
     if (tz.isValid())
-        QVERIFY2(tz.aliasMatches(zoneName), tz.id().constData());
+        QVERIFY2(tz.hasAlternativeName(zoneName), tz.id().constData());
     else
         QVERIFY(!QTimeZone::isTimeZoneIdAvailable(zoneName.toByteArray()));
 #else