From 41ac7f7da4367d4923b19c693f469425b8e6e0f0 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 8 Jan 2019 10:48:27 +0100 Subject: Fix a few clazy warnings Covers static accessor, auto, nullptr and casting related warnings. Change-Id: I307438b662df908a2cfa37341722b78b5777e737 Reviewed-by: Timur Pocheptsov --- tests/bttestui/btlocaldevice.cpp | 30 +++++++++++++++--------------- tests/bttestui/main.cpp | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp index 07edbe0c..583a8c6b 100644 --- a/tests/bttestui/btlocaldevice.cpp +++ b/tests/bttestui/btlocaldevice.cpp @@ -93,17 +93,17 @@ BtLocalDevice::BtLocalDevice(QObject *parent) : connect(socket, SIGNAL(connected()), this, SLOT(socketConnected())); connect(socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected())); connect(socket, SIGNAL(readyRead()), this, SLOT(readData())); - setSecFlags(socket->preferredSecurityFlags()); + setSecFlags(static_cast(socket->preferredSecurityFlags())); server = new QBluetoothServer(SOCKET_PROTOCOL, this); connect(server, SIGNAL(newConnection()), this, SLOT(serverNewConnection())); connect(server, SIGNAL(error(QBluetoothServer::Error)), this, SLOT(serverError(QBluetoothServer::Error))); } else { - deviceAgent = 0; - serviceAgent = 0; - socket = 0; - server = 0; + deviceAgent = nullptr; + serviceAgent = nullptr; + socket = nullptr; + server = nullptr; } } @@ -119,7 +119,7 @@ BtLocalDevice::~BtLocalDevice() int BtLocalDevice::secFlags() const { - return (int)securityFlags; + return static_cast(securityFlags); } void BtLocalDevice::setSecFlags(int newFlags) @@ -150,7 +150,7 @@ QString BtLocalDevice::hostMode() const void BtLocalDevice::setHostMode(int newMode) { - localDevice->setHostMode((QBluetoothLocalDevice::HostMode)newMode); + localDevice->setHostMode(static_cast(newMode)); } void BtLocalDevice::requestPairingUpdate(bool isPairing) @@ -272,7 +272,7 @@ void BtLocalDevice::discoveryCanceled() void BtLocalDevice::discoveryError(QBluetoothDeviceDiscoveryAgent::Error error) { - QBluetoothDeviceDiscoveryAgent *client = qobject_cast(sender()); + auto *client = qobject_cast(sender()); if (!client) return; qDebug() << "###### Device Discovery Error:" << error << (client ? client->errorString() : QString()); @@ -380,7 +380,7 @@ void BtLocalDevice::serviceDiscoveryCanceled() void BtLocalDevice::serviceDiscoveryError(QBluetoothServiceDiscoveryAgent::Error error) { - QBluetoothServiceDiscoveryAgent *client = qobject_cast(sender()); + auto *client = qobject_cast(sender()); if (!client) return; qDebug() << "###### Service Discovery Error:" << error << (client ? client->errorString() : QString()); @@ -487,7 +487,7 @@ void BtLocalDevice::socketDisconnected() void BtLocalDevice::socketError(QBluetoothSocket::SocketError error) { - QBluetoothSocket *client = qobject_cast(sender()); + auto *client = qobject_cast(sender()); qDebug() << "###### Socket error" << error << (client ? client->errorString() : QString()); } @@ -495,7 +495,7 @@ void BtLocalDevice::socketError(QBluetoothSocket::SocketError error) void BtLocalDevice::socketStateChanged(QBluetoothSocket::SocketState state) { qDebug() << "###### Socket state" << state; - emit socketStateUpdate((int) state); + emit socketStateUpdate(static_cast(state)); } void BtLocalDevice::dumpSocketInformation() @@ -687,7 +687,7 @@ void BtLocalDevice::serverNewConnection() void BtLocalDevice::clientSocketDisconnected() { - QBluetoothSocket *client = qobject_cast(sender()); + auto *client = qobject_cast(sender()); if (!client) return; @@ -700,7 +700,7 @@ void BtLocalDevice::clientSocketDisconnected() void BtLocalDevice::clientSocketReadyRead() { - QBluetoothSocket *socket = qobject_cast(sender()); + auto *socket = qobject_cast(sender()); if (!socket) return; @@ -757,7 +757,7 @@ void BtLocalDevice::dumpServerInformation() case QBluetoothSocket::NetworkError: tmp += "NetworkError"; break; case QBluetoothSocket::UnsupportedProtocolError: tmp += "UnsupportedProtocolError"; break; //case QBluetoothSocket::OperationError: tmp+= "OperationError"; break; - default: tmp += QString::number((int)client->error()); break; + default: tmp += QString::number(static_cast(client->error())); break; } qDebug() << "socket error:" << tmp << client->errorString(); @@ -830,7 +830,7 @@ void BtLocalDevice::powerOn() void BtLocalDevice::reset() { - emit error((QBluetoothLocalDevice::Error)1000); + emit error(static_cast(1000)); if (serviceAgent) { serviceAgent->clear(); } diff --git a/tests/bttestui/main.cpp b/tests/bttestui/main.cpp index 857efa90..35f95b6e 100644 --- a/tests/bttestui/main.cpp +++ b/tests/bttestui/main.cpp @@ -50,5 +50,5 @@ int main(int argc, char *argv[]) QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit())); view.show(); - return app.exec(); + return QGuiApplication::exec(); } -- cgit v1.2.3 From 0b4aadadf19adff87fd6a847458be742220fc8fd Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 14 Jan 2019 09:13:24 +0200 Subject: Bump version Change-Id: I347b943e3f99c54f8af678a5a2127624ae22669c --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 1c14aab6..c954a094 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.12.1 +MODULE_VERSION = 5.12.2 -- cgit v1.2.3 From 1bba2694302b7200d62d715827f20e8f830d9e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= Date: Fri, 11 Jan 2019 13:38:37 +0100 Subject: Check for system feature PackageManager.FEATURE_NFC Method enableForegroundDispatch and disableForegroundDispatch is not implemented on some WearOS devices and will throw an exception. Let's check if the NFC feature exists. java.lang.reflect.InvocationTargetException at java.lang.reflect.Method.invoke(Native Method) at org.qtproject.qt5.android.bindings.QtApplication.invokeDelegateMethod(QtApplication.java:157) at org.qtproject.qt5.android.bindings.QtApplication.invokeDelegate(QtApplication.java:146) at org.qtproject.qt5.android.bindings.QtActivity.onResume(QtActivity.java:626) at com.governikus.ausweisapp2.MainActivity.onResume(MainActivity.java:139) at android.app.Instrumentation.callActivityOnResume(Instrumentation.java:1355) at android.app.Activity.performResume(Activity.java:7117) at android.app.ActivityThread.performResumeActivity(ActivityThread.java:3556) at android.app.ActivityThread.handleResumeActivity(ActivityThread.java:3621) at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1638) at android.os.Handler.dispatchMessage(Handler.java:106) at android.os.Looper.loop(Looper.java:164) at android.app.ActivityThread.main(ActivityThread.java:6494) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:438) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:807) Caused by: java.lang.UnsupportedOperationException at android.nfc.NfcAdapter.enableForegroundDispatch(NfcAdapter.java:1315) at org.qtproject.qt5.android.nfc.QtNfc$1.run(QtNfc.java:135) at android.app.Activity.runOnUiThread(Activity.java:6184) at org.qtproject.qt5.android.nfc.QtNfc.start(QtNfc.java:111) at org.qtproject.qt5.android.QtNative.updateApplicationState(Native Method) at org.qtproject.qt5.android.QtNative.setApplicationState(QtNative.java:260) at org.qtproject.qt5.android.QtActivityDelegate.onResume(QtActivityDelegate.java:1098) ... 16 more See: https://stackoverflow.com/questions/48437854/huawei-watch-2-nfc-feature-not-available-android-wear-2-0 Change-Id: I0e2cad3dce1c3c0a2ea2545fcc6731e2621cdc38 Reviewed-by: Alex Blasche --- src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java b/src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java index 6b0fbcbd..19e645f5 100644 --- a/src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java +++ b/src/android/nfc/src/org/qtproject/qt5/android/nfc/QtNfc.java @@ -54,6 +54,7 @@ import android.content.IntentFilter.MalformedMimeTypeException; import android.os.Bundle; import android.util.Log; import android.content.BroadcastReceiver; +import android.content.pm.PackageManager; public class QtNfc { @@ -106,7 +107,9 @@ public class QtNfc static public boolean start() { - if (m_adapter == null || m_activity == null) return false; + if (m_adapter == null || m_activity == null + || !m_activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC)) + return false; m_activity.runOnUiThread(new Runnable() { public void run() { @@ -143,7 +146,9 @@ public class QtNfc static public boolean stop() { - if (m_adapter == null || m_activity == null) return false; + if (m_adapter == null || m_activity == null + || !m_activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC)) + return false; m_activity.runOnUiThread(new Runnable() { public void run() { -- cgit v1.2.3