diff options
author | Fabian Bumberger <fbumberger@rim.com> | 2013-09-12 11:09:27 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 18:50:01 +0200 |
commit | 4a8fe389db0212eb6f85a49612ceddd56dd1aaf4 (patch) | |
tree | 8c8b453d4e28b41e15c6b480ba057934fd8dc529 /src/nfc/qnearfieldmanagervirtualbase.cpp | |
parent | 25222f75d0ff5da0b39c77250510bc0aab0daf73 (diff) |
Changing the way nfc target detection works
On Android and BB10 the target detection does not distinguish between NFC tag types when it comes to target detection but rather between the protocols the tags use.
This patch removes the parameters used for target detection.
Change-Id: I4609cde61d34159bc66b29a27f8d76df816e2c23
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/nfc/qnearfieldmanagervirtualbase.cpp')
-rw-r--r-- | src/nfc/qnearfieldmanagervirtualbase.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/nfc/qnearfieldmanagervirtualbase.cpp b/src/nfc/qnearfieldmanagervirtualbase.cpp index ec3e778d..115a94d6 100644 --- a/src/nfc/qnearfieldmanagervirtualbase.cpp +++ b/src/nfc/qnearfieldmanagervirtualbase.cpp @@ -45,11 +45,11 @@ QT_BEGIN_NAMESPACE -static inline bool matchesTarget(QNearFieldTarget::Type type, - const QList<QNearFieldTarget::Type> &types) -{ - return types.contains(type) || types.contains(QNearFieldTarget::AnyTarget); -} +//static inline bool matchesTarget(QNearFieldTarget::Type type, +// const QList<QNearFieldTarget::Type> &types) +//{ +// return types.contains(type) || types.contains(QNearFieldTarget::AnyTarget); +//} QNearFieldManagerPrivateVirtualBase::QNearFieldManagerPrivateVirtualBase() { @@ -59,15 +59,13 @@ QNearFieldManagerPrivateVirtualBase::~QNearFieldManagerPrivateVirtualBase() { } -bool QNearFieldManagerPrivateVirtualBase::startTargetDetection(const QList<QNearFieldTarget::Type> &targetTypes) +bool QNearFieldManagerPrivateVirtualBase::startTargetDetection() { - m_detectTargetTypes = targetTypes; return true; } void QNearFieldManagerPrivateVirtualBase::stopTargetDetection() { - m_detectTargetTypes.clear(); } int QNearFieldManagerPrivateVirtualBase::getFreeId() @@ -125,8 +123,8 @@ bool QNearFieldManagerPrivateVirtualBase::unregisterNdefMessageHandler(int id) void QNearFieldManagerPrivateVirtualBase::targetActivated(QNearFieldTarget *target) { - if (matchesTarget(target->type(), m_detectTargetTypes)) - emit targetDetected(target); + //if (matchesTarget(target->type(), m_detectTargetTypes)) + emit targetDetected(target); if (target->hasNdefMessage()) { QTlvReader reader(target); |