Generate key string for field cache at compile time

By providing a template that returns the right field name for each enum
value as a QtJniTypes::String we can create the cache key entirely at
compile time.

The key string will still be copied once, as the QHash operates on a
QByteArray as the key.

Change-Id: I611b94e0ff65d71e5cb5a63d487324b9cf485b6b
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
(cherry picked from commit 4f9ad7da4c4e9a0d45e501edf1db3db67cec2638)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/bluetooth/android/servicediscoverybroadcastreceiver.cpp b/src/bluetooth/android/servicediscoverybroadcastreceiver.cpp
index 825e4abc..082e7247 100644
--- a/src/bluetooth/android/servicediscoverybroadcastreceiver.cpp
+++ b/src/bluetooth/android/servicediscoverybroadcastreceiver.cpp
@@ -15,7 +15,7 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT_ANDROID)
 
 ServiceDiscoveryBroadcastReceiver::ServiceDiscoveryBroadcastReceiver(QObject* parent): AndroidBroadcastReceiver(parent)
 {
-    addAction(valueForStaticField(JavaNames::BluetoothDevice, JavaNames::ActionUuid));
+    addAction(valueForStaticField<QtJniTypes::BluetoothDevice, JavaNames::ActionUuid>());
 }
 
 void ServiceDiscoveryBroadcastReceiver::onReceive(JNIEnv *env, jobject context, jobject intent)
@@ -28,11 +28,11 @@ void ServiceDiscoveryBroadcastReceiver::onReceive(JNIEnv *env, jobject context,
 
     qCDebug(QT_BT_ANDROID) << "ServiceDiscoveryBroadcastReceiver::onReceive() - event:" << action;
 
-    if (action == valueForStaticField(JavaNames::BluetoothDevice,
-                                      JavaNames::ActionUuid).toString()) {
+    if (action == valueForStaticField<QtJniTypes::BluetoothDevice,
+                                      JavaNames::ActionUuid>().toString()) {
 
-        QJniObject keyExtra = valueForStaticField(JavaNames::BluetoothDevice,
-                                                         JavaNames::ExtraUuid);
+        QJniObject keyExtra = valueForStaticField<QtJniTypes::BluetoothDevice,
+                                                         JavaNames::ExtraUuid>();
         QJniObject parcelableUuids = intentObject.callMethod<QtJniTypes::ParcelableArray>(
                                                 "getParcelableArrayExtra",
                                                 keyExtra.object<jstring>());
@@ -42,7 +42,7 @@ void ServiceDiscoveryBroadcastReceiver::onReceive(JNIEnv *env, jobject context,
         }
         const QList<QBluetoothUuid> result = ServiceDiscoveryBroadcastReceiver::convertParcelableArray(parcelableUuids);
 
-        keyExtra = valueForStaticField(JavaNames::BluetoothDevice, JavaNames::ExtraDevice);
+        keyExtra = valueForStaticField<QtJniTypes::BluetoothDevice, JavaNames::ExtraDevice>();
         QJniObject bluetoothDevice =
         intentObject.callMethod<QtJniTypes::Parcelable>("getParcelableExtra",
                                   keyExtra.object<jstring>());