20 files changed, 38 insertions, 780 deletions
diff --git a/src/nfc/neard/adapter.cpp b/src/nfc/neard/adapter.cpp
deleted file mode 100644
index d626678a..00000000
--- a/src/nfc/neard/adapter.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v org.neard.Adapter.xml -p adapter_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "adapter_p.h"
-
-/*
- * Implementation of interface class OrgNeardAdapterInterface
- */
-
-OrgNeardAdapterInterface::OrgNeardAdapterInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgNeardAdapterInterface::~OrgNeardAdapterInterface()
-{
-}
diff --git a/src/nfc/neard/adapter_p.h b/src/nfc/neard/adapter_p.h
deleted file mode 100644
index 76817705..00000000
--- a/src/nfc/neard/adapter_p.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v org.neard.Adapter.xml -p adapter_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef ADAPTER_P_H_1410940487
-#define ADAPTER_P_H_1410940487
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.neard.Adapter
- */
-class OrgNeardAdapterInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.neard.Adapter"; }
-
-public:
-    OrgNeardAdapterInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OrgNeardAdapterInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> StartPollLoop(const QString &name)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(name);
-        return asyncCallWithArgumentList(QStringLiteral("StartPollLoop"), argumentList);
-    }
-
-    inline QDBusPendingReply<> StopPollLoop()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("StopPollLoop"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-};
-
-namespace org {
-  namespace neard {
-    typedef ::OrgNeardAdapterInterface Adapter;
-  }
-}
-#endif
diff --git a/src/nfc/neard/agent.cpp b/src/nfc/neard/agent.cpp
deleted file mode 100644
index faa48043..00000000
--- a/src/nfc/neard/agent.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v org.neard.Agent.xml -p agent_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "agent_p.h"
-
-/*
- * Implementation of interface class OrgNeardHandoverAgentInterface
- */
-
-OrgNeardHandoverAgentInterface::OrgNeardHandoverAgentInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgNeardHandoverAgentInterface::~OrgNeardHandoverAgentInterface()
-{
-}
-
-/*
- * Implementation of interface class OrgNeardNDEFAgentInterface
- */
-
-OrgNeardNDEFAgentInterface::OrgNeardNDEFAgentInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgNeardNDEFAgentInterface::~OrgNeardNDEFAgentInterface()
-{
-}
diff --git a/src/nfc/neard/agent_p.h b/src/nfc/neard/agent_p.h
deleted file mode 100644
index 7e40ffaf..00000000
--- a/src/nfc/neard/agent_p.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v org.neard.Agent.xml -p agent_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef AGENT_P_H_1410442485
-#define AGENT_P_H_1410442485
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.neard.HandoverAgent
- */
-class OrgNeardHandoverAgentInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.neard.HandoverAgent"; }
-
-public:
-    OrgNeardHandoverAgentInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OrgNeardHandoverAgentInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> PushOOB(const QVariantMap &values)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(values);
-        return asyncCallWithArgumentList(QStringLiteral("PushOOB"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Release()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("Release"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantMap> RequestOOB(const QVariantMap &values)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(values);
-        return asyncCallWithArgumentList(QStringLiteral("RequestOOB"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-};
-
-/*
- * Proxy class for interface org.neard.NDEFAgent
- */
-class OrgNeardNDEFAgentInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.neard.NDEFAgent"; }
-
-public:
-    OrgNeardNDEFAgentInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OrgNeardNDEFAgentInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> GetNDEF(const QVariantMap &values)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(values);
-        return asyncCallWithArgumentList(QStringLiteral("GetNDEF"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Release()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("Release"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-};
-
-namespace org {
-  namespace neard {
-    typedef ::OrgNeardHandoverAgentInterface HandoverAgent;
-    typedef ::OrgNeardNDEFAgentInterface NDEFAgent;
-  }
-}
-#endif
diff --git a/src/nfc/neard/dbusobjectmanager.cpp b/src/nfc/neard/dbusobjectmanager.cpp
deleted file mode 100644
index 7b3f8356..00000000
--- a/src/nfc/neard/dbusobjectmanager.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v dbus-object-manager.xml -p dbusobjectmanager -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "dbusobjectmanager_p.h"
-
-/*
- * Implementation of interface class OrgFreedesktopDBusObjectManagerInterface
- */
-
-OrgFreedesktopDBusObjectManagerInterface::OrgFreedesktopDBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgFreedesktopDBusObjectManagerInterface::~OrgFreedesktopDBusObjectManagerInterface()
-{
-}
-
diff --git a/src/nfc/neard/dbusobjectmanager_p.h b/src/nfc/neard/dbusobjectmanager_p.h
deleted file mode 100644
index 64d11449..00000000
--- a/src/nfc/neard/dbusobjectmanager_p.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v -i neard_helper_p.h org.freedesktop.dbus.objectmanager.xml -p dbusobjectmanager_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef DBUSOBJECTMANAGER_H_1409928664
-#define DBUSOBJECTMANAGER_H_1409928664
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-#include "neard_helper_p.h"
-
-/*
- * Proxy class for interface org.freedesktop.DBus.ObjectManager
- */
-class OrgFreedesktopDBusObjectManagerInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.DBus.ObjectManager"; }
-
-public:
-    OrgFreedesktopDBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OrgFreedesktopDBusObjectManagerInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<ManagedObjectList> GetManagedObjects()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("GetManagedObjects"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void InterfacesAdded(const QDBusObjectPath &object, InterfaceList interfaces);
-    void InterfacesRemoved(const QDBusObjectPath &object, const QStringList &interfaces);
-};
-
-namespace org {
-  namespace freedesktop {
-    namespace DBus {
-      typedef ::OrgFreedesktopDBusObjectManagerInterface ObjectManager;
-    }
-  }
-}
-#endif
diff --git a/src/nfc/neard/dbusproperties.cpp b/src/nfc/neard/dbusproperties.cpp
deleted file mode 100644
index 554b83d6..00000000
--- a/src/nfc/neard/dbusproperties.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v dbus-properties.xml -p dbusproperties -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "dbusproperties_p.h" // HAND_EDIT
-
-/*
- * Implementation of interface class OrgFreedesktopDBusPropertiesInterface
- */
-
-OrgFreedesktopDBusPropertiesInterface::OrgFreedesktopDBusPropertiesInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgFreedesktopDBusPropertiesInterface::~OrgFreedesktopDBusPropertiesInterface()
-{
-}
-
diff --git a/src/nfc/neard/dbusproperties_p.h b/src/nfc/neard/dbusproperties_p.h
deleted file mode 100644
index ebca6278..00000000
--- a/src/nfc/neard/dbusproperties_p.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v org.freedesktop.dbus.properties.xml -p dbusproperties_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef DBUSPROPERTIES_H_1409915780
-#define DBUSPROPERTIES_H_1409915780
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.freedesktop.DBus.Properties
- */
-class OrgFreedesktopDBusPropertiesInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.DBus.Properties"; }
-
-public:
-    OrgFreedesktopDBusPropertiesInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OrgFreedesktopDBusPropertiesInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<QDBusVariant> Get(const QString &interface, const QString &name)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(interface) << QVariant::fromValue(name);
-        return asyncCallWithArgumentList(QStringLiteral("Get"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantMap> GetAll(const QString &interface)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(interface);
-        return asyncCallWithArgumentList(QStringLiteral("GetAll"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Set(const QString &interface, const QString &name, const QDBusVariant &value)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(interface) << QVariant::fromValue(name) << QVariant::fromValue(value);
-        return asyncCallWithArgumentList(QStringLiteral("Set"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void PropertiesChanged(const QString &interface, const QVariantMap &changed_properties, const QStringList &invalidated_properties);
-};
-
-namespace org {
-  namespace freedesktop {
-    namespace DBus {
-      typedef ::OrgFreedesktopDBusPropertiesInterface Properties;
-    }
-  }
-}
-#endif
diff --git a/src/nfc/neard/manager.cpp b/src/nfc/neard/manager.cpp
deleted file mode 100644
index e1d72c6e..00000000
--- a/src/nfc/neard/manager.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v org.neard.Manager.xml -p manager_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "manager_p.h"
-
-/*
- * Implementation of interface class OrgNeardManagerInterface
- */
-
-OrgNeardManagerInterface::OrgNeardManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgNeardManagerInterface::~OrgNeardManagerInterface()
-{
-}
diff --git a/src/nfc/neard/manager_p.h b/src/nfc/neard/manager_p.h
deleted file mode 100644
index 921c177b..00000000
--- a/src/nfc/neard/manager_p.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v org.neard.Manager.xml -p manager_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef MANAGER_P_H_1410442485
-#define MANAGER_P_H_1410442485
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.neard.Manager
- */
-class OrgNeardManagerInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.neard.Manager"; }
-
-public:
-    OrgNeardManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OrgNeardManagerInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<QVariantMap> GetProperties()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("GetProperties"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RegisterHandoverAgent(const QDBusObjectPath &path)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(path);
-        return asyncCallWithArgumentList(QStringLiteral("RegisterHandoverAgent"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RegisterNDEFAgent(const QDBusObjectPath &path, const QString &type)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(path) << QVariant::fromValue(type);
-        return asyncCallWithArgumentList(QStringLiteral("RegisterNDEFAgent"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SetProperty(const QString &name, const QDBusVariant &value)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(name) << QVariant::fromValue(value);
-        return asyncCallWithArgumentList(QStringLiteral("SetProperty"), argumentList);
-    }
-
-    inline QDBusPendingReply<> UnregisterHandoverAgent(const QDBusObjectPath &path)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(path);
-        return asyncCallWithArgumentList(QStringLiteral("UnregisterHandoverAgent"), argumentList);
-    }
-
-    inline QDBusPendingReply<> UnregisterNDEFAgent(const QDBusObjectPath &path, const QString &type)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(path) << QVariant::fromValue(type);
-        return asyncCallWithArgumentList(QStringLiteral("UnregisterNDEFAgent"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void AdapterAdded(const QDBusObjectPath &adapter);
-    void AdapterRemoved(const QDBusObjectPath &adapter);
-    void PropertyChanged(const QString &name, const QDBusVariant &value);
-};
-
-namespace org {
-  namespace neard {
-    typedef ::OrgNeardManagerInterface Manager;
-  }
-}
-#endif
diff --git a/src/nfc/neard/neard.pri b/src/nfc/neard/neard.pri
deleted file mode 100644
index 8120a784..00000000
--- a/src/nfc/neard/neard.pri
+++ /dev/null
@@ -1,22 +0,0 @@
-HEADERS += neard/adapter_p.h \
-    neard/manager_p.h \
-    neard/tag_p.h \
-    neard/agent_p.h \
-    neard/dbusproperties_p.h \
-    neard/dbusobjectmanager_p.h \
-    neard/neard_helper_p.h
-
-SOURCES += neard/adapter.cpp \
-    neard/manager.cpp \
-    neard/tag.cpp \
-    neard/agent.cpp \
-    neard/dbusproperties.cpp \
-    neard/dbusobjectmanager.cpp \
-    neard/neard_helper.cpp
-
-OTHER_FILES += neard/org.freedesktop.dbus.objectmanager.xml \
-    neard/org.freedesktop.dbus.properties.xml \
-    neard/org.neard.Adapter.xml \
-    neard/org.neard.Agent.xml \
-    neard/org.neard.Manager.xml \
-    neard/org.neard.Tag.xml
diff --git a/src/nfc/neard/neard_dbus_types_p.h b/src/nfc/neard/neard_dbus_types_p.h
new file mode 100644
index 00000000..b85b3252
--- /dev/null
+++ b/src/nfc/neard/neard_dbus_types_p.h
@@ -0,0 +1,28 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// Copyright (C) 2016 BasysKom GmbH.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#ifndef NEARD_DBUS_TYPES_P_H
+#define NEARD_DBUS_TYPES_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QMetaType>
+#include <QDBusObjectPath>
+
+typedef QMap<QString, QVariantMap> InterfaceList;
+typedef QMap<QDBusObjectPath, InterfaceList> ManagedObjectList;
+
+Q_DECLARE_METATYPE(InterfaceList)
+Q_DECLARE_METATYPE(ManagedObjectList)
+
+#endif // NEARD_DBUS_TYPES_P_H
diff --git a/src/nfc/neard/neard_helper.cpp b/src/nfc/neard/neard_helper.cpp
index 90781a5b..3cd65bab 100644
--- a/src/nfc/neard/neard_helper.cpp
+++ b/src/nfc/neard/neard_helper.cpp
@@ -1,46 +1,10 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2016 BasysKom GmbH.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNfc module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// Copyright (C) 2016 BasysKom GmbH.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include <QDBusMetaType>
 #include "neard_helper_p.h"
-#include "dbusobjectmanager_p.h"
+#include "objectmanager_interface.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/nfc/neard/neard_helper_p.h b/src/nfc/neard/neard_helper_p.h
index e3258d5d..9964e547 100644
--- a/src/nfc/neard/neard_helper_p.h
+++ b/src/nfc/neard/neard_helper_p.h
@@ -1,42 +1,6 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2016 BasysKom GmbH.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNfc module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// Copyright (C) 2016 BasysKom GmbH.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef NEARD_HELPER_P_H
 #define NEARD_HELPER_P_H
@@ -52,14 +16,7 @@
 // We mean it.
 //
 
-#include <QMetaType>
-#include <QDBusObjectPath>
-
-typedef QMap<QString, QVariantMap> InterfaceList;
-typedef QMap<QDBusObjectPath, InterfaceList> ManagedObjectList;
-
-Q_DECLARE_METATYPE(InterfaceList)
-Q_DECLARE_METATYPE(ManagedObjectList)
+#include "neard_dbus_types_p.h"
 
 class OrgFreedesktopDBusObjectManagerInterface;
 
diff --git a/src/nfc/neard/org.freedesktop.dbus.objectmanager.xml b/src/nfc/neard/org.freedesktop.dbus.objectmanager.xml
index ae16f410..43427725 100644
--- a/src/nfc/neard/org.freedesktop.dbus.objectmanager.xml
+++ b/src/nfc/neard/org.freedesktop.dbus.objectmanager.xml
@@ -9,7 +9,7 @@
                 <signal name="InterfacesAdded">
                         <arg name="object" type="o"/>
                         <arg name="interfaces" type="a{sa{sv}}"/>
-                        <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="InterfaceList"/>
+                        <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="InterfaceList"/>
                 </signal>
                 <signal name="InterfacesRemoved">
                         <arg name="object" type="o"/>
diff --git a/src/nfc/neard/org.freedesktop.dbus.properties.xml b/src/nfc/neard/org.freedesktop.dbus.properties.xml
index 1449d567..6e22c586 100644
--- a/src/nfc/neard/org.freedesktop.dbus.properties.xml
+++ b/src/nfc/neard/org.freedesktop.dbus.properties.xml
@@ -20,7 +20,7 @@
                 <signal name="PropertiesChanged">
                         <arg name="interface" type="s"/>
                         <arg name="changed_properties" type="a{sv}"/>
-                        <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+                        <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
                         <arg name="invalidated_properties" type="as"/>
                 </signal>
         </interface>
diff --git a/src/nfc/neard/org.neard.Agent.xml b/src/nfc/neard/org.neard.Agent.xml
deleted file mode 100644
index 5ec0e487..00000000
--- a/src/nfc/neard/org.neard.Agent.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-        <interface name="org.neard.NDEFAgent">
-                <method name="GetNDEF">
-                        <arg name="values" type="a{sv}" direction="in"/>
-                        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-                </method>
-                <method name="Release">
-                </method>
-        </interface>
-        <interface name="org.neard.HandoverAgent">
-                <method name="RequestOOB">
-                        <arg name="values" type="a{sv}" direction="in"/>
-                        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-                        <arg name="result" type="a{sv}" direction="out"/>
-                        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-                </method>
-                <method name="PushOOB">
-                        <arg name="values" type="a{sv}" direction="in"/>
-                        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-                </method>
-                <method name="Release">
-                </method>
-        </interface>
-</node>
diff --git a/src/nfc/neard/org.neard.Manager.xml b/src/nfc/neard/org.neard.Manager.xml
deleted file mode 100644
index 1ed92378..00000000
--- a/src/nfc/neard/org.neard.Manager.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-        <interface name="org.neard.Manager">
-                <method name="GetProperties">
-                        <arg name="properties" type="a{sv}" direction="out"/>
-                        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-                </method>
-                <method name="SetProperty">
-                        <arg name="name" type="s" direction="in"/>
-                        <arg name="value" type="v" direction="in"/>
-                </method>
-                <method name="RegisterHandoverAgent">
-                        <arg name="path" type="o" direction="in"/>
-                </method>
-                <method name="UnregisterHandoverAgent">
-                        <arg name="path" type="o" direction="in"/>
-                </method>
-                <method name="RegisterNDEFAgent">
-                        <arg name="path" type="o" direction="in"/>
-                        <arg name="type" type="s" direction="in"/>
-                </method>
-                <method name="UnregisterNDEFAgent">
-                        <arg name="path" type="o" direction="in"/>
-                        <arg name="type" type="s" direction="in"/>
-                </method>
-                <signal name="PropertyChanged">
-                        <arg name="name" type="s"/>
-                        <arg name="value" type="v"/>
-                </signal>
-                <signal name="AdapterAdded">
-                        <arg name="adapter" type="o"/>
-                </signal>
-                <signal name="AdapterRemoved">
-                        <arg name="adapter" type="o"/>
-                </signal>
-        </interface>
-</node>
diff --git a/src/nfc/neard/tag.cpp b/src/nfc/neard/tag.cpp
deleted file mode 100644
index 918f7f2d..00000000
--- a/src/nfc/neard/tag.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v org.neard.Tag.xml -p tag_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "tag_p.h"
-
-/*
- * Implementation of interface class OrgNeardTagInterface
- */
-
-OrgNeardTagInterface::OrgNeardTagInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgNeardTagInterface::~OrgNeardTagInterface()
-{
-}
diff --git a/src/nfc/neard/tag_p.h b/src/nfc/neard/tag_p.h
deleted file mode 100644
index c9a3aad3..00000000
--- a/src/nfc/neard/tag_p.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v org.neard.Tag.xml -p tag_p -v
- *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef TAG_P_H_1410941369
-#define TAG_P_H_1410941369
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.neard.Tag
- */
-class OrgNeardTagInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.neard.Tag"; }
-
-public:
-    OrgNeardTagInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OrgNeardTagInterface();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<QByteArray> GetRawNDEF()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QStringLiteral("GetRawNDEF"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Write(const QVariantMap &attributes)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(attributes);
-        return asyncCallWithArgumentList(QStringLiteral("Write"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-};
-
-namespace org {
-  namespace neard {
-    typedef ::OrgNeardTagInterface Tag;
-  }
-}
-#endif