QNX: Fix requestCompleted signal and traget detection

Change-Id: Ifd3992d050a9d17158b8007999ee6ae63f1d8599
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

2 files changed, 5 insertions, 15 deletions

diff --git a/src/nfc/qnearfieldtarget_qnx_p.h b/src/nfc/qnearfieldtarget_qnx_p.h
index 7c504a03..116ffa30 100644
--- a/src/nfc/qnearfieldtarget_qnx_p.h
+++ b/src/nfc/qnearfieldtarget_qnx_p.h
@@ -76,8 +76,6 @@ public:
             m_tagId = QByteArray(buf,bufLength);
 
         m_ndefMessages = messages;
-        connect(this, SIGNAL(requestCompleted(const QNearFieldTarget::RequestId)), this, SIGNAL(requestCompleted(QNearFieldTarget::RequestId)),
-                Qt::QueuedConnection);
     }
 
     ~NearFieldTarget()
@@ -116,7 +114,8 @@ public:
             emit QNearFieldTarget::ndefMessageRead(m_ndefMessages.at(i));
         }
         QNearFieldTarget::RequestId id = QNearFieldTarget::RequestId(new QNearFieldTarget::RequestIdPrivate());
-        //emit requestCompleted_p(id);
+        QMetaObject::metaObject()->invokeMethod(this, "requestCompleted",
+                                          Qt::QueuedConnection, Q_ARG(const QNearFieldTarget::RequestId, id));
         return id;
     }
 
@@ -178,16 +177,11 @@ public:
 
         }
         QNearFieldTarget::RequestId id = QNearFieldTarget::RequestId(new QNearFieldTarget::RequestIdPrivate());
-        //emit requestCompleted_p(id);
+        QMetaObject::invokeMethod(this, "requestCompleted",
+                                          Qt::QueuedConnection, Q_ARG(const QNearFieldTarget::RequestId, id));
         return id;
     }
 
-    //Would only be needed for an LLCP socket. But for now there won't be any "forum device detected" events
-//    nfc_target_t *getTarget()
-//    {
-//        return m_target;
-//    }
-
 protected:
     nfc_target_t *m_target;
 #if 0
@@ -197,11 +191,6 @@ protected:
     QByteArray m_tagName;
     QByteArray m_tagId;
     QList<QNdefMessage> m_ndefMessages;
-
-//Q_SIGNALS:
-    //The purpose of this signal is to be able to emit the requestCompleted signal outside of a function
-    //by using a queued connection
-    //void requestCompleted_p(const QNearFieldTarget::RequestId &id);
 };
 
 QTNFC_END_NAMESPACE
diff --git a/src/nfc/qnx/qnxnfcmanager.cpp b/src/nfc/qnx/qnxnfcmanager.cpp
index a279b590..46171331 100644
--- a/src/nfc/qnx/qnxnfcmanager.cpp
+++ b/src/nfc/qnx/qnxnfcmanager.cpp
@@ -386,6 +386,7 @@ void QNXNFCManager::targetLost(unsigned int targetId)
 
 bool QNXNFCManager::startTargetDetection(const QList<QNearFieldTarget::Type> &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) {