summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bluetooth/qbluetoothlocaldevice_qnx.cpp10
-rw-r--r--src/bluetooth/qbluetoothsocket.cpp2
-rw-r--r--src/bluetooth/qnx/ppshelpers.cpp8
-rw-r--r--src/bluetooth/qrfcommserver_qnx.cpp4
-rw-r--r--src/nfc/qnearfieldmanager_qnx.cpp1
-rw-r--r--src/nfc/qnx/qnxnfceventfilter.cpp2
-rw-r--r--src/nfc/qnx/qnxnfcmanager.cpp8
7 files changed, 19 insertions, 16 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
index 02fe647b..4bf00082 100644
--- a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
@@ -128,13 +128,13 @@ void QBluetoothLocalDevice::pairingConfirmation(bool confirmation)
QBluetoothLocalDevicePrivate::QBluetoothLocalDevicePrivate()
{
ppsRegisterControl();
- ppsRegisterForEvent(QString("access_changed"), this);
+ ppsRegisterForEvent(QStringLiteral("access_changed"), this);
}
QBluetoothLocalDevicePrivate::~QBluetoothLocalDevicePrivate()
{
ppsUnregisterControl(this);
- ppsUnreguisterForEvent(QString("access_changed"), this);
+ ppsUnreguisterForEvent(QStringLiteral("access_changed"), this);
}
bool QBluetoothLocalDevicePrivate::isValid() const
@@ -219,7 +219,7 @@ void QBluetoothLocalDevicePrivate::setAccess(int access)
if (!ppsReadSetting("enabled").toBool()) { //We cannot set the host mode until BT is fully powered up
__newHostMode = access;
} else {
- ppsSendControlMessage("set_access", QString("{\"access\":%1}").arg(access), 0);
+ ppsSendControlMessage("set_access", QStringLiteral("{\"access\":%1}").arg(access), 0);
}
}
@@ -235,9 +235,9 @@ void QBluetoothLocalDevicePrivate::controlReply(ppsResult result)
void QBluetoothLocalDevicePrivate::controlEvent(ppsResult result)
{
- if (result.msg == QString("access_changed")) {
+ if (result.msg == QStringLiteral("access_changed")) {
if (__newHostMode == -1 && result.dat.size() > 1 &&
- result.dat.first() == "level") {
+ result.dat.first() == QStringLiteral("level")) {
qBBBluetoothDebug() << "New Host mode" << hostMode();
Q_EMIT q_ptr->hostModeStateChanged(hostMode());
}
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index 8595a26b..fbf6aa2d 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -373,13 +373,13 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const
*/
void QBluetoothSocket::connectToService(const QBluetoothAddress &address, quint16 port, OpenMode openMode)
{
- Q_D(QBluetoothSocket);
#ifdef QTM_QNX_BLUETOOTH
Q_UNUSED(port);
Q_UNUSED(openMode);
Q_UNUSED(address);
qWarning("Connecting to port is not supported on QNX");
#else
+ Q_D(QBluetoothSocket);
setOpenMode(openMode);
d->connectToService(address, port, openMode);
#endif
diff --git a/src/bluetooth/qnx/ppshelpers.cpp b/src/bluetooth/qnx/ppshelpers.cpp
index 474b5bdb..9524fbe3 100644
--- a/src/bluetooth/qnx/ppshelpers.cpp
+++ b/src/bluetooth/qnx/ppshelpers.cpp
@@ -181,7 +181,7 @@ int __newHostMode = -1;
void ppsDecodeControlResponse()
{
ppsResult result;
- ResultType resType;
+ ResultType resType = UNKNOWN;
if (ppsCtrlFD != -1) {
char buf[ppsBufferSize];
@@ -247,11 +247,11 @@ void ppsDecodeControlResponse()
pps_decoder_cleanup(&ppsDecoder);
}
- if (result.msg == "radio_init") {
+ if (result.msg == QStringLiteral("radio_init")) {
qBBBluetoothDebug() << "Radio initialized";
- } else if (result.msg == "access_changed" && __newHostMode != -1) {
+ } else if (result.msg == QStringLiteral("access_changed") && __newHostMode != -1) {
qBBBluetoothDebug() << "Access changed after radio init";
- ppsSendControlMessage("set_access", QString("{\"access\":%1}").arg(__newHostMode), 0);
+ ppsSendControlMessage("set_access", QStringLiteral("{\"access\":%1}").arg(__newHostMode), 0);
__newHostMode = -1;
}
diff --git a/src/bluetooth/qrfcommserver_qnx.cpp b/src/bluetooth/qrfcommserver_qnx.cpp
index d380d808..dc52c30f 100644
--- a/src/bluetooth/qrfcommserver_qnx.cpp
+++ b/src/bluetooth/qrfcommserver_qnx.cpp
@@ -104,7 +104,7 @@ void QRfcommServerPrivate::controlEvent(ppsResult result)
qBBBluetoothDebug() << result.dat.at(i);
}
- if (result.dat.contains("addr") && result.dat.contains(QStringLiteral("uuid"))
+ if (result.dat.contains(QStringLiteral("addr")) && result.dat.contains(QStringLiteral("uuid"))
&& result.dat.contains(QStringLiteral("subtype"))) {
nextClientAddress = result.dat.at(result.dat.indexOf(QStringLiteral("addr")) + 1);
m_uuid = QBluetoothUuid(result.dat.at(result.dat.indexOf(QStringLiteral("uuid")) + 1));
@@ -153,7 +153,7 @@ bool QRfcommServer::listen(const QBluetoothAddress &address, quint16 port)
}
}
- if (port>=0 && __fakeServerPorts.key(port) == 0) {
+ if (__fakeServerPorts.key(port) == 0) {
__fakeServerPorts[d] = port;
qBBBluetoothDebug() << "Port" << port << "registered";
} else {
diff --git a/src/nfc/qnearfieldmanager_qnx.cpp b/src/nfc/qnearfieldmanager_qnx.cpp
index 1cb3cbdb..8e2249c3 100644
--- a/src/nfc/qnearfieldmanager_qnx.cpp
+++ b/src/nfc/qnearfieldmanager_qnx.cpp
@@ -178,6 +178,7 @@ void QNearFieldManagerPrivateImpl::handleMessage(const QNdefMessage &message, QN
void QNearFieldManagerPrivateImpl::newTarget(QNearFieldTarget *target, const QList<QNdefMessage> &messages)
{
+ Q_UNUSED(messages)
qQNXNFCDebug() << "New Target";
emit targetDetected(target);
}
diff --git a/src/nfc/qnx/qnxnfceventfilter.cpp b/src/nfc/qnx/qnxnfceventfilter.cpp
index 52290088..f4b53f64 100644
--- a/src/nfc/qnx/qnxnfceventfilter.cpp
+++ b/src/nfc/qnx/qnxnfceventfilter.cpp
@@ -81,7 +81,7 @@ bool QNXNFCEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes
//message.fromByteArray(data);
- const char* metadata = navigator_invoke_invocation_get_metadata(invoke);
+ //const char* metadata = navigator_invoke_invocation_get_metadata(invoke);
nfc_ndef_message_t *ndefMessage;
nfc_create_ndef_message_from_bytes(reinterpret_cast<const uchar_t *>(data.data()),
diff --git a/src/nfc/qnx/qnxnfcmanager.cpp b/src/nfc/qnx/qnxnfcmanager.cpp
index 2852d95d..dd387bef 100644
--- a/src/nfc/qnx/qnxnfcmanager.cpp
+++ b/src/nfc/qnx/qnxnfcmanager.cpp
@@ -78,7 +78,9 @@ void QNXNFCManager::unregisterForInstance()
void QNXNFCManager::unregisterTargetDetection(QObject *obj)
{
- //TODO another instance of the nearfieldmanager might still want to detect targets
+ Q_UNUSED(obj)
+ //TODO another instance of the nearfieldmanager might still
+ //want to detect targets so we have to do ref counting
nfc_unregister_tag_readerwriter();
}
@@ -386,9 +388,9 @@ void QNXNFCManager::targetLost(unsigned int targetId)
bool QNXNFCManager::startTargetDetection(const QList<QNearFieldTarget::Type> &targetTypes)
{
+ Q_UNUSED(targetTypes)
qQNXNFCDebug() << "Start target detection for all types";
//TODO handle the target types
- qQNXNFCDebug() << "Starting target detection";
if (nfc_register_tag_readerwriter(TAG_TYPE_ALL) == NFC_RESULT_SUCCESS) {
return true;
} else {
@@ -460,7 +462,7 @@ QNdefMessage QNXNFCManager::decodeMessage(nfc_ndef_message_t *nextMessage)
newNdefRecord.setId(QByteArray(recordId));
nfc_get_ndef_record_tnf(newRecord, &typeNameFormat);
- QNdefRecord::TypeNameFormat recordTnf;
+ QNdefRecord::TypeNameFormat recordTnf = QNdefRecord::Unknown;
switch (typeNameFormat) {
case NDEF_TNF_WELL_KNOWN: recordTnf = QNdefRecord::NfcRtd; break;
case NDEF_TNF_EMPTY: recordTnf = QNdefRecord::Empty; break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 03:57:58 +0000