diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-06-15 11:35:00 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-03 11:23:43 +0000 |
| commit | 85913b4afcee5ff0b0fa7d375ae735615b03b53d (patch) | |
| tree | f7c1814ebf218f507d3c3db67d5044f3da02fec5 | |
| parent | 4ab33394b259e5bc8d8ffccf35cf183fc4d4bf9c (diff) | |
Tidy-up after recent change: combine declaration with initializer
Change-Id: I94420a3dfa30e4a2a4d8786621bea1dd9309bed8
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_android.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_android.cpp b/src/corelib/tools/qtimezoneprivate_android.cpp index b60093617f..be4f374fdd 100644 --- a/src/corelib/tools/qtimezoneprivate_android.cpp +++ b/src/corelib/tools/qtimezoneprivate_android.cpp @@ -85,10 +85,9 @@ void QAndroidTimeZonePrivate::init(const QByteArray &ianaId) // Painfully, JNI gives us back a default zone object if it doesn't // recognize the name; so check for whether ianaId is a recognized name of // the zone object we got and ignore the zone if not. - bool found = false; // Try checking ianaId against getID(), getDisplayName(): QJNIObjectPrivate jname = androidTimeZone.callObjectMethod("getID", "()Ljava/lang/String;"); - found = (jname.toString().toUtf8() == ianaId); + bool found = (jname.toString().toUtf8() == ianaId); for (int style = 1; !found && style-- > 0;) { for (int dst = 1; !found && dst-- > 0;) { jname = androidTimeZone.callObjectMethod("getDisplayName", "(ZI;)Ljava/lang/String;", |