diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2013-09-18 01:33:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 23:45:06 +0200 |
| commit | 1f47ceec478f662ed893cb69563c8f0e91ff1cda (patch) | |
| tree | fd72f187cf04b17bbdd210ec4cb25bdc601f0788 /src/plugins | |
| parent | 3efca77e35c0c336961f5e9640382ef87e83e794 (diff) | |
Android: Use the new QJNI api in our QLocale implementation.
This change makes use of the private QJNI api that now exists in QtCore.
Change-Id: Id03664942d6c6cbfec028a3b52729057153a8466
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/android/src/qandroidsystemlocale.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/plugins/platforms/android/src/qandroidsystemlocale.cpp b/src/plugins/platforms/android/src/qandroidsystemlocale.cpp index 24ae503335..a20f970a44 100644 --- a/src/plugins/platforms/android/src/qandroidsystemlocale.cpp +++ b/src/plugins/platforms/android/src/qandroidsystemlocale.cpp @@ -41,8 +41,7 @@ #include "qandroidsystemlocale.h" #include "androidjnimain.h" -#include "private/qjniobject_p.h" -#include "private/qjnihelpers_p.h" +#include <QtCore/private/qjni_p.h> #include "qdatetime.h" #include "qstringlist.h" #include "qvariant.h" @@ -57,20 +56,19 @@ void QAndroidSystemLocale::getLocaleFromJava() const { QWriteLocker locker(&m_lock); - QJNILocalRef<jobject> javaLocaleRef; - QJNIObject javaActivity(QtAndroid::activity()); + QJNIObjectPrivate javaLocaleObject; + QJNIObjectPrivate javaActivity(QtAndroid::activity()); if (javaActivity.isValid()) { - QJNIObject resources(javaActivity.callObjectMethod<jobject>("getResources", "()Landroid/content/res/Resources;").object()); - QJNIObject configuration(resources.callObjectMethod<jobject>("getConfiguration", "()Landroid/content/res/Configuration;").object()); + QJNIObjectPrivate resources = javaActivity.callObjectMethod("getResources", "()Landroid/content/res/Resources;"); + QJNIObjectPrivate configuration = resources.callObjectMethod("getConfiguration", "()Landroid/content/res/Configuration;"); - javaLocaleRef = configuration.getObjectField<jobject>("locale", "Ljava/util/Locale;"); + javaLocaleObject = configuration.getObjectField("locale", "Ljava/util/Locale;"); } else { - javaLocaleRef = QJNIObject::callStaticObjectMethod<jobject>("java/util/Locale", "getDefault", "()Ljava/util/Locale;"); + javaLocaleObject = QJNIObjectPrivate::callStaticObjectMethod("java/util/Locale", "getDefault", "()Ljava/util/Locale;"); } - QJNIObject javaLocaleObject(javaLocaleRef.object()); - QString languageCode = qt_convertJString(javaLocaleObject.callObjectMethod<jstring>("getLanguage", "()Ljava/lang/String;").object()); - QString countryCode = qt_convertJString(javaLocaleObject.callObjectMethod<jstring>("getCountry", "()Ljava/lang/String;").object()); + QString languageCode = javaLocaleObject.callObjectMethod("getLanguage", "()Ljava/lang/String;").toString(); + QString countryCode = javaLocaleObject.callObjectMethod("getCountry", "()Ljava/lang/String;").toString(); m_locale = QLocale(languageCode + QLatin1Char('_') + countryCode); } |