From dd0f27136aa1d788c40631d9766fa9d1f11da4e6 Mon Sep 17 00:00:00 2001 From: Peter Rustler Date: Wed, 7 Jan 2015 14:10:37 +0100 Subject: Changed private nfc Android API to new QtNfc API The method startTargetDetection in QNearFieldManager has lost the parameter in QtNfc Api. This commit changes the private implementation of nfc for android to work with this change. Change-Id: I963b8317758ae3d5dbaa6b3f9068aab7cf9c6709 Reviewed-by: Alex Blasche --- src/nfc/qnearfieldmanager_android.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/nfc/qnearfieldmanager_android.cpp') 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 &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) -- cgit v1.2.1