diff options
author | Ivan Solovev <ivan.solovev@qt.io> | 2022-04-05 15:19:17 +0200 |
---|---|---|
committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-04-08 00:13:01 +0200 |
commit | c366d57594bfb84c215fda2b101bcd7f37b93dcd (patch) | |
tree | 59f2a4342ac7f528bc90d71f245a55c07f114570 | |
parent | 44f3fe1cf4e2319e012207eba3afe7adfe09cad6 (diff) |
Android: minor refactor in QTimeZonePrivate backend
getDisplayName() now returns QString instead of QJniObject. It's more
clear and allows to save some QJniObject::toString() calls in other
parts of code.
Pick-to: 6.3 6.2
Change-Id: I0f2061cf1dff21c09c2272bf1e9126ff1ea0ed3e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
-rw-r--r-- | src/corelib/time/qtimezoneprivate_android.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/time/qtimezoneprivate_android.cpp b/src/corelib/time/qtimezoneprivate_android.cpp index 7cd4117a66..3829ff3bb5 100644 --- a/src/corelib/time/qtimezoneprivate_android.cpp +++ b/src/corelib/time/qtimezoneprivate_android.cpp @@ -85,7 +85,7 @@ QAndroidTimeZonePrivate::~QAndroidTimeZonePrivate() { } -static QJniObject getDisplayName(QJniObject zone, jint style, jboolean dst, +static QString getDisplayName(QJniObject zone, jint style, jboolean dst, const QLocale &locale) { QJniObject jbcpTag = QJniObject::fromString(locale.bcp47Name()); @@ -95,7 +95,7 @@ static QJniObject getDisplayName(QJniObject zone, jint style, jboolean dst, return zone.callObjectMethod("getDisplayName", "(ZILjava/util/Locale;)Ljava/lang/String;", - dst, style, jlocale.object()); + dst, style, jlocale.object()).toString(); } void QAndroidTimeZonePrivate::init(const QByteArray &ianaId) @@ -106,8 +106,7 @@ void QAndroidTimeZonePrivate::init(const QByteArray &ianaId) QJniObject::fromString(iana).object<jstring>()); // The ID or display name of the zone we've got, if it looks like what we asked for: - const auto match = [iana](const QJniObject &jname) -> QByteArray { - const QString name = jname.toString(); + const auto match = [iana](const QString &name) -> QByteArray { if (iana.compare(name, Qt::CaseInsensitive) == 0) return name.toUtf8(); @@ -118,7 +117,7 @@ void QAndroidTimeZonePrivate::init(const QByteArray &ianaId) // recognize the name; so check for whether ianaId is a recognized name of // the zone object we got and ignore the zone if not. // Try checking ianaId against getID(), getDisplayName(): - m_id = match(androidTimeZone.callObjectMethod("getID", "()Ljava/lang/String;")); + m_id = match(androidTimeZone.callObjectMethod("getID", "()Ljava/lang/String;").toString()); for (int style = 1; m_id.isEmpty() && style >= 0; --style) { for (int dst = 1; m_id.isEmpty() && dst >= 0; --dst) { for (int pick = 2; m_id.isEmpty() && pick >= 0; --pick) { @@ -147,7 +146,7 @@ QString QAndroidTimeZonePrivate::displayName(QTimeZone::TimeType timeType, QTime // treat all NameTypes as java TimeZone style LONG (value 1), except of course QTimeZone::ShortName which is style SHORT (value 0); jint style = (nameType == QTimeZone::ShortName ? 0 : 1); - name = getDisplayName(androidTimeZone, style, daylightTime, locale).toString(); + name = getDisplayName(androidTimeZone, style, daylightTime, locale); } return name; |