diff options
| author | Martin Leutelt <martin.leutelt@basyskom.com> | 2014-09-11 15:25:48 +0200 |
|---|---|---|
| committer | Martin Leutelt <martin.leutelt@basyskom.com> | 2014-09-30 16:50:12 +0200 |
| commit | 6a069e14f50fb0e553405547d6b5123ea72854d1 (patch) | |
| tree | 3200707ce33a2acf226032240e58f99492cb5e75 /src/nfc/qnearfieldmanager_neard_p.h | |
| parent | 249741c0ec267bbb21cca9a2873cb068bdae6db7 (diff) | |
Neard: porting to neard v0.14
The dbus interfaces have been adapted to the state of neard v0.14.
Reading from the supported tags works, writing to them works to
a limited extent.
Change-Id: Ib0704c6d951baa31ad58484e0c11534aaad359be
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/nfc/qnearfieldmanager_neard_p.h')
| -rw-r--r-- | src/nfc/qnearfieldmanager_neard_p.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/nfc/qnearfieldmanager_neard_p.h b/src/nfc/qnearfieldmanager_neard_p.h index a7433c8f..ee72595c 100644 --- a/src/nfc/qnearfieldmanager_neard_p.h +++ b/src/nfc/qnearfieldmanager_neard_p.h @@ -1,6 +1,7 @@ /*************************************************************************** ** ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. +** Copyright (C) 2014 BasysKom GmbH. ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNfc module of the Qt Toolkit. @@ -45,6 +46,7 @@ #include "qnearfieldmanager_p.h" #include "qnearfieldmanager.h" #include "qnearfieldtarget.h" +#include "neard/neard_helper_p.h" #include <QDBusObjectPath> #include <QDBusVariant> @@ -52,6 +54,7 @@ class OrgNeardAdapterInterface; class OrgNeardManagerInterface; +class OrgFreedesktopDBusPropertiesInterface; QT_BEGIN_NAMESPACE @@ -69,6 +72,7 @@ public: void stopTargetDetection(); + // not implemented int registerNdefMessageHandler(QObject *object, const QMetaMethod &method); int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object, const QMetaMethod &method); @@ -80,15 +84,15 @@ public: void releaseAccess(QNearFieldManager::TargetAccessModes accessModes); private Q_SLOTS: - void tagFound(const QDBusObjectPath&); - void propertyChanged(QString,QDBusVariant); - void tagDeleted(QObject*); + void handleTagFound(const QDBusObjectPath&); + void handleTagRemoved(const QDBusObjectPath&); private: QString m_adapterPath; OrgNeardAdapterInterface *m_adapter; - OrgNeardManagerInterface *m_manager; + OrgFreedesktopDBusPropertiesInterface *m_dbusProperties; QMap<QString, QNearFieldTarget*> m_activeTags; + NeardHelper *m_neardHelper; }; QT_END_NAMESPACE |