diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/nfc/qnearfieldmanager_android.cpp | 7 | ||||
-rw-r--r-- | src/nfc/qnearfieldmanager_android_p.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/nfc/qnearfieldmanager_android.cpp b/src/nfc/qnearfieldmanager_android.cpp index 157966e5..3d941eab 100644 --- a/src/nfc/qnearfieldmanager_android.cpp +++ b/src/nfc/qnearfieldmanager_android.cpp @@ -71,12 +71,11 @@ bool QNearFieldManagerPrivateImpl::isAvailable() const return AndroidNfc::isAvailable(); } -bool QNearFieldManagerPrivateImpl::startTargetDetection(const QList<QNearFieldTarget::Type> &targetTypes) +bool QNearFieldManagerPrivateImpl::startTargetDetection() { if (m_detecting) return false; // Already detecting targets - m_detectTargetTypes = targetTypes; AndroidNfc::registerListener(this); AndroidNfc::startDiscovery(); m_detecting = true; @@ -218,9 +217,7 @@ void QNearFieldManagerPrivateImpl::onTargetDiscovered(jobject intent) connect(target, SIGNAL(targetDestroyed(QByteArray)), this, SLOT(onTargetDestroyed(QByteArray))); connect(target, SIGNAL(targetLost(QNearFieldTarget*)), this, SIGNAL(targetLost(QNearFieldTarget*))); } - if (m_detectTargetTypes.isEmpty() || - m_detectTargetTypes.contains(target->type())) - emit targetDetected(target); + emit targetDetected(target); } void QNearFieldManagerPrivateImpl::onTargetDestroyed(const QByteArray &uid) diff --git a/src/nfc/qnearfieldmanager_android_p.h b/src/nfc/qnearfieldmanager_android_p.h index b534f564..68501ddc 100644 --- a/src/nfc/qnearfieldmanager_android_p.h +++ b/src/nfc/qnearfieldmanager_android_p.h @@ -64,7 +64,7 @@ public: ~QNearFieldManagerPrivateImpl(); virtual bool isAvailable() const; - virtual bool startTargetDetection(const QList<QNearFieldTarget::Type> &targetTypes); + virtual bool startTargetDetection(); virtual void stopTargetDetection(); virtual int registerNdefMessageHandler(QObject *object, const QMetaMethod &method); virtual int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object, const QMetaMethod &method); @@ -83,7 +83,6 @@ protected: private: bool m_detecting; - QList<QNearFieldTarget::Type> m_detectTargetTypes; QHash<QByteArray, NearFieldTarget*> m_detectedTargets; /* |