From 8cdd3ed68bacfccfdbe719ef03f9f57ff3aa48eb Mon Sep 17 00:00:00 2001 From: Andrew O'Doherty Date: Wed, 7 Mar 2018 11:14:24 +0100 Subject: Add NFC API method isSupported Add API method isSupported to allow to check if the device supports NFC Task-number: QTBUG-62169 Change-Id: I4ff7f06348ecc902e66ee79bdd8abde672578904 Reviewed-by: Alex Blasche --- src/nfc/qnearfieldmanager_neard.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/nfc/qnearfieldmanager_neard.cpp') diff --git a/src/nfc/qnearfieldmanager_neard.cpp b/src/nfc/qnearfieldmanager_neard.cpp index f1758ae9..450b9b42 100644 --- a/src/nfc/qnearfieldmanager_neard.cpp +++ b/src/nfc/qnearfieldmanager_neard.cpp @@ -114,6 +114,21 @@ bool QNearFieldManagerPrivateImpl::isAvailable() const return false; } +bool QNearFieldManagerPrivateImpl::isSupported() const +{ + if (m_adapterPath.isEmpty()) { + qCWarning(QT_NFC_NEARD) << "no adapter found, neard daemon running?"; + return false; + } + + if (!m_neardHelper->dbusObjectManager()->isValid() || m_adapterPath.isNull()) { + qCWarning(QT_NFC_NEARD) << "dbus object manager invalid or adapter path invalid"; + return false; + } + + return true; +} + bool QNearFieldManagerPrivateImpl::startTargetDetection() { qCDebug(QT_NFC_NEARD) << "starting target detection"; -- cgit v1.2.3 From 3e1c520f039484a9ecc5d6aacea5d761a183dc47 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Mon, 18 Jun 2018 11:24:01 +0200 Subject: Use functor-based connections in the nfc implementation Change-Id: I90b6f044a902dabd08f0eccfc55438aab571c331 Reviewed-by: Alex Blasche --- src/nfc/qnearfieldmanager_neard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/nfc/qnearfieldmanager_neard.cpp') diff --git a/src/nfc/qnearfieldmanager_neard.cpp b/src/nfc/qnearfieldmanager_neard.cpp index 450b9b42..7c1c6e05 100644 --- a/src/nfc/qnearfieldmanager_neard.cpp +++ b/src/nfc/qnearfieldmanager_neard.cpp @@ -80,10 +80,10 @@ QNearFieldManagerPrivateImpl::QNearFieldManagerPrivateImpl() if (!found) { qCWarning(QT_NFC_NEARD) << "no adapter found, neard daemon running?"; } else { - connect(m_neardHelper, SIGNAL(tagFound(QDBusObjectPath)), - this, SLOT(handleTagFound(QDBusObjectPath))); - connect(m_neardHelper, SIGNAL(tagRemoved(QDBusObjectPath)), - this, SLOT(handleTagRemoved(QDBusObjectPath))); + connect(m_neardHelper, &NeardHelper::tagFound, + this, &QNearFieldManagerPrivateImpl::handleTagFound); + connect(m_neardHelper, &NeardHelper::tagRemoved, + this, &QNearFieldManagerPrivateImpl::handleTagRemoved); } } -- cgit v1.2.3