Merge lp:~unity-api-team/indicator-network/simplify-sniffer into lp:indicator-network/15.04

[Pete Woods]

Simplify sniffer code

Simplify sniffer code

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/111
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/111/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/322/rebuild

review: Approve (continuous-integration)

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-03-24 13:08:26 +0000
+++ CMakeLists.txt	2015-04-08 10:22:41 +0000
@@ -123,8 +123,6 @@
 enable_testing()
 add_subdirectory(tests)
 
-add_subdirectory(sniffer)
-
 ADD_CUSTOM_TARGET(
         check
         ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure

=== modified file 'data/nm-manager.xml'
--- data/nm-manager.xml	2015-03-11 13:25:40 +0000
+++ data/nm-manager.xml	2015-04-08 10:22:41 +0000
@@ -326,6 +326,12 @@
         </tp:docstring>
       </arg>
     </signal>
+    
+    <property name="Connectivity" type="u" access="read" tp:type="NM_CONNECTIVITY">
+      <tp:docstring>
+        The network connectivity state.
+      </tp:docstring>
+    </property>
 
     <signal name="PropertiesChanged">
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>

=== removed file 'sniffer/nmaccesspoint.cpp'
--- sniffer/nmaccesspoint.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/nmaccesspoint.cpp	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmaccesspoint.h -c NetworkManagerAccessPoint nmaccesspoint.xml org.freedesktop.NetworkManager.AccessPoint
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "nmaccesspoint.h"
-
-/*
- * Implementation of interface class NetworkManagerAccessPoint
- */
-
-NetworkManagerAccessPoint::NetworkManagerAccessPoint(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-NetworkManagerAccessPoint::~NetworkManagerAccessPoint()
-{
-}

=== removed file 'sniffer/nmaccesspoint.h'
--- sniffer/nmaccesspoint.h	2014-11-26 11:31:07 +0000
+++ sniffer/nmaccesspoint.h	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmaccesspoint.h -c NetworkManagerAccessPoint nmaccesspoint.xml org.freedesktop.NetworkManager.AccessPoint
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef NMACCESSPOINT_H_1416391263
-#define NMACCESSPOINT_H_1416391263
-
-#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.NetworkManager.AccessPoint
- */
-class NetworkManagerAccessPoint: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.NetworkManager.AccessPoint"; }
-
-public:
-    NetworkManagerAccessPoint(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~NetworkManagerAccessPoint();
-
-    Q_PROPERTY(uint Flags READ flags)
-    inline uint flags() const
-    { return qvariant_cast< uint >(property("Flags")); }
-
-    Q_PROPERTY(uint Frequency READ frequency)
-    inline uint frequency() const
-    { return qvariant_cast< uint >(property("Frequency")); }
-
-    Q_PROPERTY(QString HwAddress READ hwAddress)
-    inline QString hwAddress() const
-    { return qvariant_cast< QString >(property("HwAddress")); }
-
-    Q_PROPERTY(int LastSeen READ lastSeen)
-    inline int lastSeen() const
-    { return qvariant_cast< int >(property("LastSeen")); }
-
-    Q_PROPERTY(uint MaxBitrate READ maxBitrate)
-    inline uint maxBitrate() const
-    { return qvariant_cast< uint >(property("MaxBitrate")); }
-
-    Q_PROPERTY(uint Mode READ mode)
-    inline uint mode() const
-    { return qvariant_cast< uint >(property("Mode")); }
-
-    Q_PROPERTY(uint RsnFlags READ rsnFlags)
-    inline uint rsnFlags() const
-    { return qvariant_cast< uint >(property("RsnFlags")); }
-
-    Q_PROPERTY(QByteArray Ssid READ ssid)
-    inline QByteArray ssid() const
-    { return qvariant_cast< QByteArray >(property("Ssid")); }
-
-    Q_PROPERTY(uchar Strength READ strength)
-    inline uchar strength() const
-    { return qvariant_cast< uchar >(property("Strength")); }
-
-    Q_PROPERTY(uint WpaFlags READ wpaFlags)
-    inline uint wpaFlags() const
-    { return qvariant_cast< uint >(property("WpaFlags")); }
-
-public Q_SLOTS: // METHODS
-Q_SIGNALS: // SIGNALS
-    void PropertiesChanged(const QVariantMap &in0);
-};
-
-#endif

=== removed file 'sniffer/nmactiveconnection.cpp'
--- sniffer/nmactiveconnection.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/nmactiveconnection.cpp	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmactiveconnection.h -c NetworkManagerActiveConnection nmactiveconnection.xml org.freedesktop.NetworkManager.Connection.Active
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "nmactiveconnection.h"
-
-/*
- * Implementation of interface class NetworkManagerActiveConnection
- */
-
-NetworkManagerActiveConnection::NetworkManagerActiveConnection(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-NetworkManagerActiveConnection::~NetworkManagerActiveConnection()
-{
-}

=== removed file 'sniffer/nmactiveconnection.h'
--- sniffer/nmactiveconnection.h	2014-11-26 11:31:07 +0000
+++ sniffer/nmactiveconnection.h	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmactiveconnection.h -c NetworkManagerActiveConnection nmactiveconnection.xml org.freedesktop.NetworkManager.Connection.Active
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef NMACTIVECONNECTION_H_1416389726
-#define NMACTIVECONNECTION_H_1416389726
-
-#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.NetworkManager.Connection.Active
- */
-class NetworkManagerActiveConnection: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.NetworkManager.Connection.Active"; }
-
-public:
-    NetworkManagerActiveConnection(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~NetworkManagerActiveConnection();
-
-    Q_PROPERTY(QDBusObjectPath Connection READ connection)
-    inline QDBusObjectPath connection() const
-    { return qvariant_cast< QDBusObjectPath >(property("Connection")); }
-
-    Q_PROPERTY(bool Default READ Default)
-    inline bool Default() const
-    { return qvariant_cast< bool >(property("Default")); }
-
-    Q_PROPERTY(bool Default6 READ default6)
-    inline bool default6() const
-    { return qvariant_cast< bool >(property("Default6")); }
-
-    Q_PROPERTY(QList<QDBusObjectPath> Devices READ devices)
-    inline QList<QDBusObjectPath> devices() const
-    { return qvariant_cast< QList<QDBusObjectPath> >(property("Devices")); }
-
-    Q_PROPERTY(QDBusObjectPath Master READ master)
-    inline QDBusObjectPath master() const
-    { return qvariant_cast< QDBusObjectPath >(property("Master")); }
-
-    Q_PROPERTY(QDBusObjectPath SpecificObject READ specificObject)
-    inline QDBusObjectPath specificObject() const
-    { return qvariant_cast< QDBusObjectPath >(property("SpecificObject")); }
-
-    Q_PROPERTY(uint State READ state)
-    inline uint state() const
-    { return qvariant_cast< uint >(property("State")); }
-
-    Q_PROPERTY(QString Uuid READ uuid)
-    inline QString uuid() const
-    { return qvariant_cast< QString >(property("Uuid")); }
-
-    Q_PROPERTY(bool Vpn READ vpn)
-    inline bool vpn() const
-    { return qvariant_cast< bool >(property("Vpn")); }
-
-public Q_SLOTS: // METHODS
-Q_SIGNALS: // SIGNALS
-    void PropertiesChanged(const QVariantMap &in0);
-};
-
-#endif
-

=== removed file 'sniffer/nmconnsettings.cpp'
--- sniffer/nmconnsettings.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/nmconnsettings.cpp	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmconnsettings.h -c NetworkManagerConnectionSettings nmconnsettings.xml org.freedesktop.NetworkManager.Settings.Connection
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "nmconnsettings.h"
-
-/*
- * Implementation of interface class NetworkManagerConnectionSettings
- */
-
-NetworkManagerConnectionSettings::NetworkManagerConnectionSettings(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-NetworkManagerConnectionSettings::~NetworkManagerConnectionSettings()
-{
-}

=== removed file 'sniffer/nmconnsettings.h'
--- sniffer/nmconnsettings.h	2014-11-26 11:31:07 +0000
+++ sniffer/nmconnsettings.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmconnsettings.h -c NetworkManagerConnectionSettings nmconnsettings.xml org.freedesktop.NetworkManager.Settings.Connection
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef NMCONNSETTINGS_H_1416388936
-#define NMCONNSETTINGS_H_1416388936
-
-#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 "qdbusdatatypes.h"
-
-/*
- * Proxy class for interface org.freedesktop.NetworkManager.Settings.Connection
- */
-class NetworkManagerConnectionSettings: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.NetworkManager.Settings.Connection"; }
-
-public:
-    NetworkManagerConnectionSettings(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~NetworkManagerConnectionSettings();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> Delete()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Delete"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantDictMap> GetSecrets(const QString &setting_name)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(setting_name);
-        return asyncCallWithArgumentList(QLatin1String("GetSecrets"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantDictMap> GetSettings()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetSettings"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Update(const QVariantDictMap &properties)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(properties);
-        return asyncCallWithArgumentList(QLatin1String("Update"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void Removed();
-    void Updated();
-};
-
-#endif

=== removed file 'sniffer/nmroot.cpp'
--- sniffer/nmroot.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/nmroot.cpp	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmroot.h -c NetworkManagerRoot nmroot.xml org.freedesktop.NetworkManager
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "nmroot.h"
-
-/*
- * Implementation of interface class NetworkManagerRoot
- */
-
-NetworkManagerRoot::NetworkManagerRoot(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-NetworkManagerRoot::~NetworkManagerRoot()
-{
-}
-

=== removed file 'sniffer/nmroot.h'
--- sniffer/nmroot.h	2014-11-26 11:31:07 +0000
+++ sniffer/nmroot.h	1970-01-01 00:00:00 +0000
@@ -1,198 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmroot.h -c NetworkManagerRoot nmroot.xml org.freedesktop.NetworkManager
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef NMROOT_H_1416321839
-#define NMROOT_H_1416321839
-
-#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 "qdbusdatatypes.h"
-
-/*
- * Proxy class for interface org.freedesktop.NetworkManager
- */
-class NetworkManagerRoot: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.NetworkManager"; }
-
-public:
-    NetworkManagerRoot(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~NetworkManagerRoot();
-
-    Q_PROPERTY(QDBusObjectPath ActivatingConnection READ activatingConnection)
-    inline QDBusObjectPath activatingConnection() const
-    { return qvariant_cast< QDBusObjectPath >(property("ActivatingConnection")); }
-
-    Q_PROPERTY(QList<QDBusObjectPath> ActiveConnections READ activeConnections)
-    inline QList<QDBusObjectPath> activeConnections() const
-    { return qvariant_cast< QList<QDBusObjectPath> >(property("ActiveConnections")); }
-
-    Q_PROPERTY(uint Connectivity READ connectivity)
-    inline uint connectivity() const
-    { return qvariant_cast< uint >(property("Connectivity")); }
-
-    Q_PROPERTY(bool NetworkingEnabled READ networkingEnabled)
-    inline bool networkingEnabled() const
-    { return qvariant_cast< bool >(property("NetworkingEnabled")); }
-
-    Q_PROPERTY(QDBusObjectPath PrimaryConnection READ primaryConnection)
-    inline QDBusObjectPath primaryConnection() const
-    { return qvariant_cast< QDBusObjectPath >(property("PrimaryConnection")); }
-
-    Q_PROPERTY(uint State READ state)
-    inline uint state() const
-    { return qvariant_cast< uint >(property("State")); }
-
-    Q_PROPERTY(QString Version READ version)
-    inline QString version() const
-    { return qvariant_cast< QString >(property("Version")); }
-
-    Q_PROPERTY(bool WimaxEnabled READ wimaxEnabled WRITE setWimaxEnabled)
-    inline bool wimaxEnabled() const
-    { return qvariant_cast< bool >(property("WimaxEnabled")); }
-    inline void setWimaxEnabled(bool value)
-    { setProperty("WimaxEnabled", QVariant::fromValue(value)); }
-
-    Q_PROPERTY(bool WimaxHardwareEnabled READ wimaxHardwareEnabled)
-    inline bool wimaxHardwareEnabled() const
-    { return qvariant_cast< bool >(property("WimaxHardwareEnabled")); }
-
-    Q_PROPERTY(bool WirelessEnabled READ wirelessEnabled WRITE setWirelessEnabled)
-    inline bool wirelessEnabled() const
-    { return qvariant_cast< bool >(property("WirelessEnabled")); }
-    inline void setWirelessEnabled(bool value)
-    { setProperty("WirelessEnabled", QVariant::fromValue(value)); }
-
-    Q_PROPERTY(bool WirelessHardwareEnabled READ wirelessHardwareEnabled)
-    inline bool wirelessHardwareEnabled() const
-    { return qvariant_cast< bool >(property("WirelessHardwareEnabled")); }
-
-    Q_PROPERTY(bool WwanEnabled READ wwanEnabled WRITE setWwanEnabled)
-    inline bool wwanEnabled() const
-    { return qvariant_cast< bool >(property("WwanEnabled")); }
-    inline void setWwanEnabled(bool value)
-    { setProperty("WwanEnabled", QVariant::fromValue(value)); }
-
-    Q_PROPERTY(bool WwanHardwareEnabled READ wwanHardwareEnabled)
-    inline bool wwanHardwareEnabled() const
-    { return qvariant_cast< bool >(property("WwanHardwareEnabled")); }
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<QDBusObjectPath> ActivateConnection(const QDBusObjectPath &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(connection) << QVariant::fromValue(device) << QVariant::fromValue(specific_object);
-        return asyncCallWithArgumentList(QLatin1String("ActivateConnection"), argumentList);
-    }
-
-    inline QDBusPendingReply<QDBusObjectPath, QDBusObjectPath> AddAndActivateConnection(const QVariantDictMap &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(connection) << QVariant::fromValue(device) << QVariant::fromValue(specific_object);
-        return asyncCallWithArgumentList(QLatin1String("AddAndActivateConnection"), argumentList);
-    }
-    inline QDBusReply<QDBusObjectPath> AddAndActivateConnection(const QVariantDictMap &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object, QDBusObjectPath &active_connection)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(connection) << QVariant::fromValue(device) << QVariant::fromValue(specific_object);
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("AddAndActivateConnection"), argumentList);
-        if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) {
-            active_connection = qdbus_cast<QDBusObjectPath>(reply.arguments().at(1));
-        }
-        return reply;
-    }
-
-    inline QDBusPendingReply<uint> CheckConnectivity()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("CheckConnectivity"), argumentList);
-    }
-
-    inline QDBusPendingReply<> DeactivateConnection(const QDBusObjectPath &active_connection)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(active_connection);
-        return asyncCallWithArgumentList(QLatin1String("DeactivateConnection"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Enable(bool enable)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(enable);
-        return asyncCallWithArgumentList(QLatin1String("Enable"), argumentList);
-    }
-
-    inline QDBusPendingReply<QDBusObjectPath> GetDeviceByIpIface(const QString &iface)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(iface);
-        return asyncCallWithArgumentList(QLatin1String("GetDeviceByIpIface"), argumentList);
-    }
-
-    inline QDBusPendingReply<QList<QDBusObjectPath> > GetDevices()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetDevices"), argumentList);
-    }
-
-    inline QDBusPendingReply<QString, QString> GetLogging()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetLogging"), argumentList);
-    }
-    inline QDBusReply<QString> GetLogging(QString &domains)
-    {
-        QList<QVariant> argumentList;
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("GetLogging"), argumentList);
-        if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) {
-            domains = qdbus_cast<QString>(reply.arguments().at(1));
-        }
-        return reply;
-    }
-
-    inline QDBusPendingReply<> SetLogging(const QString &level, const QString &domains)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(level) << QVariant::fromValue(domains);
-        return asyncCallWithArgumentList(QLatin1String("SetLogging"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Sleep(bool sleep)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(sleep);
-        return asyncCallWithArgumentList(QLatin1String("Sleep"), argumentList);
-    }
-
-    inline QDBusPendingReply<uint> state()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("state"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void CheckPermissions();
-    void DeviceAdded(const QDBusObjectPath &in0);
-    void DeviceRemoved(const QDBusObjectPath &in0);
-    void PropertiesChanged(const QVariantMap &in0);
-    void StateChanged(uint in0);
-};
-
-#endif

=== removed file 'sniffer/nmsettings.cpp'
--- sniffer/nmsettings.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/nmsettings.cpp	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmsettings.h -c NetworkManagerSettings nmsettings.xml org.freedesktop.NetworkManager.Settings
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "nmsettings.h"
-
-/*
- * Implementation of interface class NetworkManagerSettings
- */
-
-NetworkManagerSettings::NetworkManagerSettings(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-NetworkManagerSettings::~NetworkManagerSettings()
-{
-}
-

=== removed file 'sniffer/nmsettings.h'
--- sniffer/nmsettings.h	2014-11-26 11:31:07 +0000
+++ sniffer/nmsettings.h	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmsettings.h -c NetworkManagerSettings nmsettings.xml org.freedesktop.NetworkManager.Settings
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef NMSETTINGS_H_1416387935
-#define NMSETTINGS_H_1416387935
-
-#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 "qdbusdatatypes.h"
-
-/*
- * Proxy class for interface org.freedesktop.NetworkManager.Settings
- */
-class NetworkManagerSettings: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.NetworkManager.Settings"; }
-
-public:
-    NetworkManagerSettings(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~NetworkManagerSettings();
-
-    Q_PROPERTY(bool CanModify READ canModify)
-    inline bool canModify() const
-    { return qvariant_cast< bool >(property("CanModify")); }
-
-    Q_PROPERTY(QString Hostname READ hostname)
-    inline QString hostname() const
-    { return qvariant_cast< QString >(property("Hostname")); }
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<QDBusObjectPath> AddConnection(const QVariantDictMap &connection)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(connection);
-        return asyncCallWithArgumentList(QLatin1String("AddConnection"), argumentList);
-    }
-
-    inline QDBusPendingReply<QDBusObjectPath> GetConnectionByUuid(const QString &uuid)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(uuid);
-        return asyncCallWithArgumentList(QLatin1String("GetConnectionByUuid"), argumentList);
-    }
-
-    inline QDBusPendingReply<QList<QDBusObjectPath> > ListConnections()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("ListConnections"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SaveHostname(const QString &hostname)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(hostname);
-        return asyncCallWithArgumentList(QLatin1String("SaveHostname"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void NewConnection(const QDBusObjectPath &in0);
-    void PropertiesChanged(const QVariantMap &in0);
-};
-
-#endif

=== removed file 'sniffer/nmwirelessdevice.cpp'
--- sniffer/nmwirelessdevice.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/nmwirelessdevice.cpp	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmwirelessdevice.h -c NetworkManagerWirelessDevice nmwirelessdevice.xml org.freedesktop.NetworkManager.Device.Wireless
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "nmwirelessdevice.h"
-
-/*
- * Implementation of interface class NetworkManagerWirelessDevice
- */
-
-NetworkManagerWirelessDevice::NetworkManagerWirelessDevice(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-NetworkManagerWirelessDevice::~NetworkManagerWirelessDevice()
-{
-}

=== removed file 'sniffer/nmwirelessdevice.h'
--- sniffer/nmwirelessdevice.h	2014-11-26 11:31:07 +0000
+++ sniffer/nmwirelessdevice.h	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p nmwirelessdevice.h -c NetworkManagerWirelessDevice nmwirelessdevice.xml org.freedesktop.NetworkManager.Device.Wireless
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef NMWIRELESSDEVICE_H_1416390426
-#define NMWIRELESSDEVICE_H_1416390426
-
-#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.NetworkManager.Device.Wireless
- */
-class NetworkManagerWirelessDevice: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.NetworkManager.Device.Wireless"; }
-
-public:
-    NetworkManagerWirelessDevice(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~NetworkManagerWirelessDevice();
-
-    Q_PROPERTY(QDBusObjectPath ActiveAccessPoint READ activeAccessPoint)
-    inline QDBusObjectPath activeAccessPoint() const
-    { return qvariant_cast< QDBusObjectPath >(property("ActiveAccessPoint")); }
-
-    Q_PROPERTY(uint Bitrate READ bitrate)
-    inline uint bitrate() const
-    { return qvariant_cast< uint >(property("Bitrate")); }
-
-    Q_PROPERTY(QString HwAddress READ hwAddress)
-    inline QString hwAddress() const
-    { return qvariant_cast< QString >(property("HwAddress")); }
-
-    Q_PROPERTY(uint Mode READ mode)
-    inline uint mode() const
-    { return qvariant_cast< uint >(property("Mode")); }
-
-    Q_PROPERTY(QString PermHwAddress READ permHwAddress)
-    inline QString permHwAddress() const
-    { return qvariant_cast< QString >(property("PermHwAddress")); }
-
-    Q_PROPERTY(uint WirelessCapabilities READ wirelessCapabilities)
-    inline uint wirelessCapabilities() const
-    { return qvariant_cast< uint >(property("WirelessCapabilities")); }
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<QList<QDBusObjectPath> > GetAccessPoints()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetAccessPoints"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RequestScan(const QVariantMap &options)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(options);
-        return asyncCallWithArgumentList(QLatin1String("RequestScan"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void AccessPointAdded(const QDBusObjectPath &in0);
-    void AccessPointRemoved(const QDBusObjectPath &in0);
-    void PropertiesChanged(const QVariantMap &in0);
-    void ScanDone();
-};
-
-#endif
-

=== removed file 'sniffer/ofonomodemmodem.cpp'
--- sniffer/ofonomodemmodem.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/ofonomodemmodem.cpp	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p ofonomodemmodem.h -c OfonoModemModem ofonomodem.xml org.ofono.Modem
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "ofonomodemmodem.h"
-
-/*
- * Implementation of interface class OfonoModemModem
- */
-
-OfonoModemModem::OfonoModemModem(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OfonoModemModem::~OfonoModemModem()
-{
-}
-

=== removed file 'sniffer/ofonomodemmodem.h'
--- sniffer/ofonomodemmodem.h	2014-11-26 11:31:07 +0000
+++ sniffer/ofonomodemmodem.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p ofonomodemmodem.h -c OfonoModemModem ofonomodem.xml org.ofono.Modem
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef OFONOMODEMMODEM_H_1416473283
-#define OFONOMODEMMODEM_H_1416473283
-
-#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.ofono.Modem
- */
-class OfonoModemModem: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.ofono.Modem"; }
-
-public:
-    OfonoModemModem(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OfonoModemModem();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<QVariantMap> GetProperties()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SetProperty(const QString &property, const QDBusVariant &value)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(property) << QVariant::fromValue(value);
-        return asyncCallWithArgumentList(QLatin1String("SetProperty"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void PropertyChanged(const QString &name, const QDBusVariant &value);
-};
-
-#endif

=== removed file 'sniffer/ofonomodemnetworkregistration.cpp'
--- sniffer/ofonomodemnetworkregistration.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/ofonomodemnetworkregistration.cpp	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p ofonomodemnetworkregistration.h -c OfonoModemNetworkRegistration ofonomodem.xml org.ofono.NetworkRegistration
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "ofonomodemnetworkregistration.h"
-
-/*
- * Implementation of interface class OfonoModemNetworkRegistration
- */
-
-OfonoModemNetworkRegistration::OfonoModemNetworkRegistration(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OfonoModemNetworkRegistration::~OfonoModemNetworkRegistration()
-{
-}

=== removed file 'sniffer/ofonomodemnetworkregistration.h'
--- sniffer/ofonomodemnetworkregistration.h	2014-11-26 11:31:07 +0000
+++ sniffer/ofonomodemnetworkregistration.h	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p ofonomodemnetworkregistration.h -c OfonoModemNetworkRegistration ofonomodem.xml org.ofono.NetworkRegistration
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef OFONOMODEMNETWORKREGISTRATION_H_1416489111
-#define OFONOMODEMNETWORKREGISTRATION_H_1416489111
-
-#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 "qdbusdatatypes.h"
-
-/*
- * Proxy class for interface org.ofono.NetworkRegistration
- */
-class OfonoModemNetworkRegistration: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.ofono.NetworkRegistration"; }
-
-public:
-    OfonoModemNetworkRegistration(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OfonoModemNetworkRegistration();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<OfonoObjectPropertyList> GetOperators()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetOperators"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantMap> GetProperties()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Register()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Register"), argumentList);
-    }
-
-    inline QDBusPendingReply<OfonoObjectPropertyList> Scan()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Scan"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void PropertyChanged(const QString &name, const QDBusVariant &value);
-};
-
-#endif

=== removed file 'sniffer/ofonomodemsimmanager.cpp'
--- sniffer/ofonomodemsimmanager.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/ofonomodemsimmanager.cpp	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p ofonomodemsimmanager.h -c OfonoModemSimManager ofonomodem.xml org.ofono.SimManager
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "ofonomodemsimmanager.h"
-
-/*
- * Implementation of interface class OfonoModemSimManager
- */
-
-OfonoModemSimManager::OfonoModemSimManager(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OfonoModemSimManager::~OfonoModemSimManager()
-{
-}
-

=== removed file 'sniffer/ofonomodemsimmanager.h'
--- sniffer/ofonomodemsimmanager.h	2014-11-26 11:31:07 +0000
+++ sniffer/ofonomodemsimmanager.h	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p ofonomodemsimmanager.h -c OfonoModemSimManager ofonomodem.xml org.ofono.SimManager
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef OFONOMODEMSIMMANAGER_H_1416485549
-#define OFONOMODEMSIMMANAGER_H_1416485549
-
-#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.ofono.SimManager
- */
-class OfonoModemSimManager: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.ofono.SimManager"; }
-
-public:
-    OfonoModemSimManager(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OfonoModemSimManager();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> ChangePin(const QString &type, const QString &oldpin, const QString &newpin)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(type) << QVariant::fromValue(oldpin) << QVariant::fromValue(newpin);
-        return asyncCallWithArgumentList(QLatin1String("ChangePin"), argumentList);
-    }
-
-    inline QDBusPendingReply<> EnterPin(const QString &type, const QString &pin)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(type) << QVariant::fromValue(pin);
-        return asyncCallWithArgumentList(QLatin1String("EnterPin"), argumentList);
-    }
-
-    inline QDBusPendingReply<QByteArray> GetIcon(uchar id)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(id);
-        return asyncCallWithArgumentList(QLatin1String("GetIcon"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantMap> GetProperties()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
-    }
-
-    inline QDBusPendingReply<> LockPin(const QString &type, const QString &pin)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(type) << QVariant::fromValue(pin);
-        return asyncCallWithArgumentList(QLatin1String("LockPin"), argumentList);
-    }
-
-    inline QDBusPendingReply<> ResetPin(const QString &type, const QString &puk, const QString &newpin)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(type) << QVariant::fromValue(puk) << QVariant::fromValue(newpin);
-        return asyncCallWithArgumentList(QLatin1String("ResetPin"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SetProperty(const QString &property, const QDBusVariant &value)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(property) << QVariant::fromValue(value);
-        return asyncCallWithArgumentList(QLatin1String("SetProperty"), argumentList);
-    }
-
-    inline QDBusPendingReply<> UnlockPin(const QString &type, const QString &pin)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(type) << QVariant::fromValue(pin);
-        return asyncCallWithArgumentList(QLatin1String("UnlockPin"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void PropertyChanged(const QString &name, const QDBusVariant &value);
-};
-
-#endif

=== removed file 'sniffer/ofonoroot.cpp'
--- sniffer/ofonoroot.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/ofonoroot.cpp	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p ofonoroot.h -c OfonoRoot ofonoroot.xml org.ofono.Manager
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "ofonoroot.h"
-
-/*
- * Implementation of interface class OfonoRoot
- */
-
-OfonoRoot::OfonoRoot(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OfonoRoot::~OfonoRoot()
-{
-}
-

=== removed file 'sniffer/ofonoroot.h'
--- sniffer/ofonoroot.h	2014-11-26 11:31:07 +0000
+++ sniffer/ofonoroot.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -N -p ofonoroot.h -c OfonoRoot ofonoroot.xml org.ofono.Manager
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef OFONOROOT_H_1416325045
-#define OFONOROOT_H_1416325045
-
-#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 <QDBusMetaType>
-#include "qdbusdatatypes.h"
-
-/*
- * Proxy class for interface org.ofono.Manager
- */
-class OfonoRoot: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.ofono.Manager"; }
-
-public:
-    OfonoRoot(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~OfonoRoot();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<ModemPropertyList> GetModems()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetModems"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void ModemAdded(const QDBusObjectPath &path, const QVariantMap &properties);
-    void ModemRemoved(const QDBusObjectPath &path);
-};
-
-#endif
-

=== removed file 'sniffer/qdbusdatatypes.h'
--- sniffer/qdbusdatatypes.h	2014-11-26 11:31:07 +0000
+++ sniffer/qdbusdatatypes.h	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jussi Pakkanen <[e-mail]>
- */
-
-#pragma once
-
-#include <QDBusMetaType>
-#include <QMap>
-
-typedef QMap<QString, QVariantMap> QVariantDictMap;
-Q_DECLARE_METATYPE(QVariantDictMap)
-
-typedef QVector<QPair<QDBusObjectPath, QVariantMap>> ModemPropertyList;
-Q_DECLARE_METATYPE(ModemPropertyList)
-
-typedef ModemPropertyList OfonoObjectPropertyList;

=== removed file 'sniffer/urfkillroot.cpp'
--- sniffer/urfkillroot.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/urfkillroot.cpp	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p urfkillroot.h -c UrfkillRoot urfkill.xml org.freedesktop.URfkill
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "urfkillroot.h"
-
-/*
- * Implementation of interface class UrfkillRoot
- */
-
-UrfkillRoot::UrfkillRoot(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-UrfkillRoot::~UrfkillRoot()
-{
-}

=== removed file 'sniffer/urfkillroot.h'
--- sniffer/urfkillroot.h	2014-11-26 11:31:07 +0000
+++ sniffer/urfkillroot.h	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p urfkillroot.h -c UrfkillRoot urfkill.xml org.freedesktop.URfkill
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef URFKILLROOT_H_1416318290
-#define URFKILLROOT_H_1416318290
-
-#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.URfkill
- */
-class UrfkillRoot: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.URfkill"; }
-
-public:
-    UrfkillRoot(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~UrfkillRoot();
-
-    Q_PROPERTY(QString DaemonVersion READ daemonVersion)
-    inline QString daemonVersion() const
-    { return qvariant_cast< QString >(property("DaemonVersion")); }
-
-    Q_PROPERTY(bool KeyControl READ keyControl)
-    inline bool keyControl() const
-    { return qvariant_cast< bool >(property("KeyControl")); }
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<bool> Block(uint type, bool block)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(type) << QVariant::fromValue(block);
-        return asyncCallWithArgumentList(QLatin1String("Block"), argumentList);
-    }
-
-    inline QDBusPendingReply<bool> BlockIdx(uint index, bool block)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(index) << QVariant::fromValue(block);
-        return asyncCallWithArgumentList(QLatin1String("BlockIdx"), argumentList);
-    }
-
-    inline QDBusPendingReply<QList<QDBusObjectPath> > EnumerateDevices()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("EnumerateDevices"), argumentList);
-    }
-
-    inline QDBusPendingReply<bool> FlightMode(bool block)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(block);
-        return asyncCallWithArgumentList(QLatin1String("FlightMode"), argumentList);
-    }
-
-    inline QDBusPendingReply<uint> Inhibit(const QString &reason)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(reason);
-        return asyncCallWithArgumentList(QLatin1String("Inhibit"), argumentList);
-    }
-
-    inline QDBusPendingReply<bool> IsFlightMode()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("IsFlightMode"), argumentList);
-    }
-
-    inline QDBusPendingReply<bool> IsInhibited()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("IsInhibited"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Uninhibit(uint inhibit_cookie)
-    {
-        QList<QVariant> argumentList;
-        argumentList << QVariant::fromValue(inhibit_cookie);
-        return asyncCallWithArgumentList(QLatin1String("Uninhibit"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void DeviceAdded(const QDBusObjectPath &device);
-    void DeviceChanged(const QDBusObjectPath &device);
-    void DeviceRemoved(const QDBusObjectPath &device);
-    void FlightModeChanged(bool flight_mode);
-    void UrfkeyPressed(int keycode);
-};
-
-#endif
-

=== removed file 'sniffer/urfkillswitch.cpp'
--- sniffer/urfkillswitch.cpp	2014-11-26 11:31:07 +0000
+++ sniffer/urfkillswitch.cpp	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p urfkillwlan.h -c UrfkillWlan urfkillwlan.xml org.freedesktop.URfkill.Killswitch
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "urfkillswitch.h"
-
-/*
- * Implementation of interface class UrfkillWlan
- */
-
-UrfkillSwitch::UrfkillSwitch(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-UrfkillSwitch::~UrfkillSwitch()
-{
-}
-

=== removed file 'sniffer/urfkillswitch.h'
--- sniffer/urfkillswitch.h	2014-11-26 11:31:07 +0000
+++ sniffer/urfkillswitch.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p urfkillwlan.h -c UrfkillWlan urfkillwlan.xml org.freedesktop.URfkill.Killswitch
- *
- * qdbusxml2cpp is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef URFKILLWLAN_H_1416319828
-#define URFKILLWLAN_H_1416319828
-
-#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.URfkill.Killswitch
- */
-class UrfkillSwitch: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.URfkill.Killswitch"; }
-
-public:
-    UrfkillSwitch(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~UrfkillSwitch();
-
-    Q_PROPERTY(int state READ state)
-    inline int state() const
-    { return qvariant_cast< int >(property("state")); }
-
-public Q_SLOTS: // METHODS
-Q_SIGNALS: // SIGNALS
-    void StateChanged();
-};
-
-#endif

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-03-20 15:24:02 +0000
+++ src/CMakeLists.txt	2015-04-08 10:22:41 +0000
@@ -3,11 +3,10 @@
     set(COMMON_FLAGS "${COMMON_FLAGS} -Werror")
 endif()
 
-#add_subdirectory(dbus-cpp)
-#add_subdirectory(connectivity-cpp)
 add_subdirectory(indicator)
 add_subdirectory(menumodel-cpp)
 add_subdirectory(qdbus-stubs)
 add_subdirectory(notify-cpp)
 add_subdirectory(secret-agent)
+add_subdirectory(sniffer)
 add_subdirectory(url-dispatcher-cpp)

=== renamed directory 'sniffer' => 'src/sniffer'
=== modified file 'src/sniffer/CMakeLists.txt'
--- sniffer/CMakeLists.txt	2015-03-12 14:59:57 +0000
+++ src/sniffer/CMakeLists.txt	2015-04-08 10:22:41 +0000
@@ -1,35 +1,21 @@
+
+include_directories("${CMAKE_BINARY_DIR}/src/qdbus-stubs")
+include_directories("${CMAKE_SOURCE_DIR}/src/qdbus-stubs")
+
 add_executable(i-n-sniffer
 eventprinter.cpp
 eventprinter.h
 i-n-extractor.cpp
-nmaccesspoint.cpp
-nmaccesspoint.h
-nmactiveconnection.cpp
-nmactiveconnection.h
-nmconnsettings.cpp
-nmconnsettings.h
-nmroot.cpp
-nmroot.h
-nmsettings.cpp
-nmsettings.h
-nmwirelessdevice.cpp
-nmwirelessdevice.h
-ofonomodemmodem.cpp
-ofonomodemmodem.h
-ofonomodemnetworkregistration.cpp
-ofonomodemnetworkregistration.h
-ofonomodemsimmanager.cpp
-ofonomodemsimmanager.h
-ofonoroot.cpp
-ofonoroot.h
-urfkillroot.cpp
-urfkillroot.h
-urfkillswitch.cpp
-urfkillswitch.h
 )
 
 qt5_use_modules(i-n-sniffer Core DBus)
 
+target_link_libraries(
+  i-n-sniffer
+  qdbus-stubs
+  ${QOFONO_LIBRARIES}
+)
+
 install(
   TARGETS i-n-sniffer
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

=== modified file 'src/sniffer/dbusdata.h'
--- sniffer/dbusdata.h	2014-11-26 11:31:07 +0000
+++ src/sniffer/dbusdata.h	2015-04-08 10:22:41 +0000
@@ -19,10 +19,6 @@
 
 #pragma once
 
-#define NM_SERVICE "org.freedesktop.NetworkManager"
-#define NM_OBJECT "/org/freedesktop/NetworkManager"
-#define NM_SETTINGS_OBJECT "/org/freedesktop/NetworkManager/Settings"
-
 #define URFKILL_SERVICE "org.freedesktop.URfkill"
 #define URFKILL_OBJECT "/org/freedesktop/URfkill"
 #define URFKILL_WLAN_OBJECT "/org/freedesktop/URfkill/WLAN"

=== modified file 'src/sniffer/eventprinter.cpp'
--- sniffer/eventprinter.cpp	2014-11-26 11:31:07 +0000
+++ src/sniffer/eventprinter.cpp	2015-04-08 10:22:41 +0000
@@ -20,19 +20,34 @@
 #include "eventprinter.h"
 
 #include "dbusdata.h"
-#include "nmroot.h"
-#include "ofonomodemmodem.h"
-#include "ofonomodemnetworkregistration.h"
-#include "ofonomodemsimmanager.h"
-#include "ofonoroot.h"
-#include "urfkillroot.h"
-#include "urfkillswitch.h"
+#include <NetworkManager.h>
+#include <NetworkManagerInterface.h>
+#include <URfkillInterface.h>
+#include <URfkillKillswitchInterface.h>
+
+#define slots
+#include <qofono-qt5/qofonomanager.h>
+#include <qofono-qt5/qofonomodem.h>
+#include <qofono-qt5/qofononetworkregistration.h>
+#include <qofono-qt5/qofonosimmanager.h>
+#undef slots
+
+// Lo-fi way of waiting for properties to populate
+static void wait_for_a_bit()
+{
+    QEventLoop q;
+    QTimer tT;
+    tT.setSingleShot(true);
+    QObject::connect(&tT, &QTimer::timeout, &q, &QEventLoop::quit);
+    tT.start(50);
+    q.exec();
+}
 
 EventPrinter::EventPrinter(QObject *parent) : QObject(parent) {
-    urfkill = new UrfkillRoot(URFKILL_SERVICE, URFKILL_OBJECT, QDBusConnection::systemBus(), this);
-    btkill = new UrfkillSwitch(URFKILL_SERVICE, URFKILL_BLUETOOTH_OBJECT, QDBusConnection::systemBus(), this);
-    wlankill = new UrfkillSwitch(URFKILL_SERVICE, URFKILL_WLAN_OBJECT, QDBusConnection::systemBus(), this);
-    nmroot = new NetworkManagerRoot(NM_SERVICE, NM_OBJECT, QDBusConnection::systemBus(), this);
+    urfkill = new OrgFreedesktopURfkillInterface(URFKILL_SERVICE, URFKILL_OBJECT, QDBusConnection::systemBus(), this);
+    btkill = new OrgFreedesktopURfkillKillswitchInterface(URFKILL_SERVICE, URFKILL_BLUETOOTH_OBJECT, QDBusConnection::systemBus(), this);
+    wlankill = new OrgFreedesktopURfkillKillswitchInterface(URFKILL_SERVICE, URFKILL_WLAN_OBJECT, QDBusConnection::systemBus(), this);
+    nmroot = new OrgFreedesktopNetworkManagerInterface(NM_DBUS_SERVICE, NM_DBUS_PATH, QDBusConnection::systemBus(), this);
 
     connect(urfkill, SIGNAL(FlightModeChanged(bool)), this, SLOT(flightModeChanged(bool)));
     connect(btkill, SIGNAL(StateChanged()), this, SLOT(btKillswitchChanged()));
@@ -40,33 +55,40 @@
     connect(nmroot, SIGNAL(StateChanged(uint)), this, SLOT(nmStateChanged(uint)));
     connect(nmroot, SIGNAL(PropertiesChanged(const QVariantMap&)), this, SLOT(nmPropertiesChanged(const QVariantMap&)));
 
-    OfonoRoot ofono(OFONO_SERVICE, OFONO_OBJECT, QDBusConnection::systemBus(), nullptr);
-    auto modems = ofono.GetModems().value();
+    QOfonoManager ofono;
+    wait_for_a_bit();
+    auto modems = ofono.modems();
     if(modems.length() > 0) {
-        modem1 = new OfonoModemModem(OFONO_SERVICE, modems[0].first.path(), QDBusConnection::systemBus(), this);
-        connect(modem1, SIGNAL(PropertyChanged(const QString, const QDBusVariant)), this,
-                SLOT(modem1PropertyChanged(const QString, const QDBusVariant)));
-        simman1 = new OfonoModemSimManager(OFONO_SERVICE, modems[0].first.path(), QDBusConnection::systemBus(), this);
-        connect(simman1, SIGNAL(PropertyChanged(const QString, const QDBusVariant)), this,
-                SLOT(simman1PropertyChanged(const QString, const QDBusVariant)));
-        netreg1 = new OfonoModemNetworkRegistration(OFONO_SERVICE, modems[0].first.path(), QDBusConnection::systemBus(), this);
-        connect(netreg1, SIGNAL(PropertyChanged(const QString, const QDBusVariant)), this,
-                SLOT(netreg1PropertyChanged(const QString, const QDBusVariant)));
+        modem1 = new QOfonoModem(this);
+        modem1->setModemPath(modems[0]);
+        connect(modem1, SIGNAL(propertyChanged(const QString&, const QVariant&)), this,
+                SLOT(modem1PropertyChanged(const QString&, const QVariant&)));
+        simman1 = new QOfonoSimManager(this);
+        simman1->setModemPath(modems[0]);
+        connect(simman1, SIGNAL(propertyChanged(const QString&, const QVariant&)), this,
+                SLOT(simman1PropertyChanged(const QString&, const QVariant&)));
+        netreg1 = new QOfonoNetworkRegistration(this);
+        netreg1->setModemPath(modems[0]);
+        connect(netreg1, SIGNAL(propertyChanged(const QString&, const QVariant&)), this,
+                SLOT(netreg1PropertyChanged(const QString&, const QVariant&)));
     } else {
         modem1 = nullptr;
         simman1 = nullptr;
         netreg1 = nullptr;
     }
     if(modems.length() > 1) {
-        modem2 = new OfonoModemModem(OFONO_SERVICE, modems[1].first.path(), QDBusConnection::systemBus(), this);
-        connect(modem2, SIGNAL(PropertyChanged(const QString, const QDBusVariant)), this,
-                SLOT(modem2PropertyChanged(const QString, const QDBusVariant)));
-        simman2 = new OfonoModemSimManager(OFONO_SERVICE, modems[1].first.path(), QDBusConnection::systemBus(), this);
-        connect(simman2, SIGNAL(PropertyChanged(const QString, const QDBusVariant)), this,
-                SLOT(simman2PropertyChanged(const QString, const QDBusVariant)));
-        netreg2 = new OfonoModemNetworkRegistration(OFONO_SERVICE, modems[1].first.path(), QDBusConnection::systemBus(), this);
-        connect(netreg2, SIGNAL(PropertyChanged(const QString, const QDBusVariant)), this,
-                SLOT(netreg2PropertyChanged(const QString, const QDBusVariant)));
+        modem2 = new QOfonoModem(this);
+        modem2->setModemPath(modems[1]);
+        connect(modem2, SIGNAL(propertyChanged(const QString&, const QVariant&)), this,
+                SLOT(modem2PropertyChanged(const QString&, const QVariant&)));
+        simman2 = new QOfonoSimManager(this);
+        simman2->setModemPath(modems[1]);
+        connect(simman2, SIGNAL(propertyChanged(const QString&, const QVariant&)), this,
+                SLOT(simman2PropertyChanged(const QString&, const QVariant&)));
+        netreg2 = new QOfonoNetworkRegistration(this);
+        netreg2->setModemPath(modems[1]);
+        connect(netreg2, SIGNAL(propertyChanged(const QString&, const QVariant&)), this,
+                SLOT(netreg2PropertyChanged(const QString&, const QVariant&)));
     } else {
         modem2 = nullptr;
         simman2 = nullptr;
@@ -122,50 +144,50 @@
     printf("  ActiveConnections (now have %d)\n", nmroot->activeConnections().size());
 }
 
-void EventPrinter::modem1PropertyChanged(const QString name, const QDBusVariant value) {
+void EventPrinter::modem1PropertyChanged(const QString &name, const QVariant &value) {
     modemPropertyChanged(1, name, value);
 }
 
-void EventPrinter::modem2PropertyChanged(const QString name, const QDBusVariant value) {
+void EventPrinter::modem2PropertyChanged(const QString &name, const QVariant &value) {
     modemPropertyChanged(2, name, value);
 }
 
-void EventPrinter::modemPropertyChanged(const int modem, const QString &name, const QDBusVariant &value) {
-    auto str = value.variant().toString();
+void EventPrinter::modemPropertyChanged(const int modem, const QString &name, const QVariant &value) {
+    auto str = value.toString();
     if(str.length() > 0) {
         str = " to " + str;
     }
     printf("Ofono modem %d property %s changed%s.\n", modem, name.toUtf8().data(), str.toUtf8().data());
 }
 
-void EventPrinter::simman1PropertyChanged(const QString name, const QDBusVariant value) {
+void EventPrinter::simman1PropertyChanged(const QString &name, const QVariant &value) {
     simmanPropertyChanged(1, name, value);
 }
 
-void EventPrinter::simman2PropertyChanged(const QString name, const QDBusVariant value) {
+void EventPrinter::simman2PropertyChanged(const QString &name, const QVariant &value) {
     simmanPropertyChanged(2, name, value);
 }
 
-void EventPrinter::simmanPropertyChanged(const int simman, const QString &name, const QDBusVariant &value) {
+void EventPrinter::simmanPropertyChanged(const int simman, const QString &name, const QVariant &value) {
     if(name == "PinRequired") {
-        printf("Ofono modem %d pin required changed to %s.\n", simman, value.variant().toString().toUtf8().data());
+        printf("Ofono modem %d pin required changed to %s.\n", simman, value.toString().toUtf8().data());
     }
 }
 
-void EventPrinter::netreg1PropertyChanged(const QString name, const QDBusVariant value) {
+void EventPrinter::netreg1PropertyChanged(const QString &name, const QVariant &value) {
     netregPropertyChanged(1, name, value);
 }
 
-void EventPrinter::netreg2PropertyChanged(const QString name, const QDBusVariant value) {
+void EventPrinter::netreg2PropertyChanged(const QString &name, const QVariant &value) {
     netregPropertyChanged(2, name, value);
 }
 
-void EventPrinter::netregPropertyChanged(const int netreg, const QString &name, const QDBusVariant &value) {
+void EventPrinter::netregPropertyChanged(const int netreg, const QString &name, const QVariant &value) {
     QString valuetext;
     if(name == "Strength") {
-        valuetext = QString::number(value.variant().toInt());
+        valuetext = QString::number(value.toInt());
     } else {
-        valuetext = value.variant().toString();
+        valuetext = value.toString();
     }
 
     printf("Ofono network registration %d property %s changed to %s.\n", netreg, name.toUtf8().data(), valuetext.toUtf8().data());

=== modified file 'src/sniffer/eventprinter.h'
--- sniffer/eventprinter.h	2015-03-13 06:46:08 +0000
+++ src/sniffer/eventprinter.h	2015-04-08 10:22:41 +0000
@@ -22,12 +22,12 @@
 #include <QObject>
 #include <QDBusVariant>
 
-class UrfkillRoot;
-class UrfkillSwitch;
-class NetworkManagerRoot;
-class OfonoModemModem;
-class OfonoModemSimManager;
-class OfonoModemNetworkRegistration;
+class OrgFreedesktopURfkillInterface;
+class OrgFreedesktopURfkillKillswitchInterface;
+class OrgFreedesktopNetworkManagerInterface;
+class QOfonoModem;
+class QOfonoSimManager;
+class QOfonoNetworkRegistration;
 
 class EventPrinter : QObject {
     Q_OBJECT
@@ -42,29 +42,29 @@
     void wlanKillswitchChanged();
     void nmStateChanged(uint new_state);
     void nmPropertiesChanged(const QVariantMap &props);
-    void modem1PropertyChanged(const QString name, const QDBusVariant value);
-    void modem2PropertyChanged(const QString name, const QDBusVariant value);
-    void simman1PropertyChanged(const QString name, const QDBusVariant value);
-    void simman2PropertyChanged(const QString name, const QDBusVariant value);
-    void netreg1PropertyChanged(const QString name, const QDBusVariant value);
-    void netreg2PropertyChanged(const QString name, const QDBusVariant value);
+    void modem1PropertyChanged(const QString &name, const QVariant &value);
+    void modem2PropertyChanged(const QString &name, const QVariant &value);
+    void simman1PropertyChanged(const QString &name, const QVariant &value);
+    void simman2PropertyChanged(const QString &name, const QVariant &value);
+    void netreg1PropertyChanged(const QString &name, const QVariant &value);
+    void netreg2PropertyChanged(const QString &name, const QVariant &value);
 
 private:
 
-    void modemPropertyChanged(const int modem, const QString &name, const QDBusVariant &value);
-    void simmanPropertyChanged(const int simman, const QString &name, const QDBusVariant &value);
-    void netregPropertyChanged(const int modem, const QString &name, const QDBusVariant &value);
+    void modemPropertyChanged(const int modem, const QString &name, const QVariant &value);
+    void simmanPropertyChanged(const int simman, const QString &name, const QVariant &value);
+    void netregPropertyChanged(const int modem, const QString &name, const QVariant &value);
     void activeConnectionsChanged(const QVariant &list);
     void primaryConnectionTypeChanged(const QString &type);
 
-    UrfkillRoot *urfkill;
-    UrfkillSwitch *btkill;
-    UrfkillSwitch *wlankill;
-    NetworkManagerRoot *nmroot;
-    OfonoModemModem *modem1;
-    OfonoModemModem *modem2;
-    OfonoModemSimManager *simman1;
-    OfonoModemSimManager *simman2;
-    OfonoModemNetworkRegistration *netreg1;
-    OfonoModemNetworkRegistration *netreg2;
+    OrgFreedesktopURfkillInterface *urfkill;
+    OrgFreedesktopURfkillKillswitchInterface *btkill;
+    OrgFreedesktopURfkillKillswitchInterface *wlankill;
+    OrgFreedesktopNetworkManagerInterface *nmroot;
+    QOfonoModem *modem1;
+    QOfonoModem *modem2;
+    QOfonoSimManager *simman1;
+    QOfonoSimManager *simman2;
+    QOfonoNetworkRegistration *netreg1;
+    QOfonoNetworkRegistration *netreg2;
 };

=== modified file 'src/sniffer/i-n-extractor.cpp'
--- sniffer/i-n-extractor.cpp	2015-03-13 06:46:08 +0000
+++ src/sniffer/i-n-extractor.cpp	2015-04-08 10:22:41 +0000
@@ -22,17 +22,21 @@
 
 #include "dbusdata.h"
 #include "eventprinter.h"
-#include "nmaccesspoint.h"
-#include "nmactiveconnection.h"
-#include "nmconnsettings.h"
-#include "nmroot.h"
-#include "nmsettings.h"
-#include "nmwirelessdevice.h"
-#include "ofonomodemnetworkregistration.h"
-#include "ofonomodemsimmanager.h"
-#include "ofonoroot.h"
-#include "urfkillroot.h"
-#include "urfkillswitch.h"
+#include <NetworkManager.h>
+#include <NetworkManagerAccessPointInterface.h>
+#include <NetworkManagerActiveConnectionInterface.h>
+#include <NetworkManagerSettingsConnectionInterface.h>
+#include <NetworkManagerInterface.h>
+#include <NetworkManagerDeviceWirelessInterface.h>
+#include <URfkillInterface.h>
+#include <URfkillKillswitchInterface.h>
+
+#define slots
+#include <qofono-qt5/qofonomanager.h>
+#include <qofono-qt5/qofonomodem.h>
+#include <qofono-qt5/qofonosimmanager.h>
+#include <qofono-qt5/qofononetworkregistration.h>
+#undef slots
 
 static std::map<const int, const char*> nm_active_connection_strings = {{0, "Unknown"}, {1, "Activating"},
         {2, "Activated"}, {3, "Deactivating"}, {4, "Deactivated"}};
@@ -42,19 +46,30 @@
     {30, "Disconnecting"}, {40, "Connecting"}, {50, "Connected local"}, {60, "Connected site"}, {70, "Connected global"}};
 static std::map<const int, const char*> nm_ap_mode_strings = {{0, "Unknown"}, {1, "Adhoc"}, {2, "Infra"}, {3, "Access point"}};
 
-void print_nm_wlans(NetworkManagerRoot *nmroot) {
+// Lo-fi way of waiting for properties to populate
+static void wait_for_a_bit()
+{
+    QEventLoop q;
+    QTimer tT;
+    tT.setSingleShot(true);
+    QObject::connect(&tT, &QTimer::timeout, &q, &QEventLoop::quit);
+    tT.start(50);
+    q.exec();
+}
+
+static void print_nm_wlans(OrgFreedesktopNetworkManagerInterface *nmroot) {
     auto paths = nmroot->activeConnections();
     for(const auto &path : paths) {
-        NetworkManagerActiveConnection ac(NM_SERVICE, path.path(), QDBusConnection::systemBus(), nullptr);
+        OrgFreedesktopNetworkManagerConnectionActiveInterface ac(NM_DBUS_SERVICE, path.path(), QDBusConnection::systemBus(), nullptr);
         auto devices = ac.devices();
         // FIXME, should check all but most connections only have one.
-        NetworkManagerWirelessDevice dev(NM_SERVICE, devices[0].path(), QDBusConnection::systemBus(), nullptr);
+        OrgFreedesktopNetworkManagerDeviceWirelessInterface dev(NM_DBUS_SERVICE, devices[0].path(), QDBusConnection::systemBus(), nullptr);
         auto reply = dev.GetAccessPoints();
         reply.waitForFinished();
         if(reply.isValid()) {
             // FIXME and the same here.
             // FIXME also that active access point might not exist
-            NetworkManagerAccessPoint ap(NM_SERVICE, dev.activeAccessPoint().path(), QDBusConnection::systemBus(), nullptr);
+            OrgFreedesktopNetworkManagerAccessPointInterface ap(NM_DBUS_SERVICE, dev.activeAccessPoint().path(), QDBusConnection::systemBus(), nullptr);
             printf("Connection %s:\n", path.path().toUtf8().data());
             auto raw_ssid = ap.ssid();
             std::string ssid(raw_ssid.cbegin(), raw_ssid.cend());
@@ -62,7 +77,7 @@
             printf("  mode: %d (%s)\n", ap.mode(), nm_ap_mode_strings[ap.mode()]);
             printf("  visible networks:\n");
             for(const auto &c : reply.value()) {
-                NetworkManagerAccessPoint i(NM_SERVICE, c.path(), QDBusConnection::systemBus(), nullptr);
+                OrgFreedesktopNetworkManagerAccessPointInterface i(NM_DBUS_SERVICE, c.path(), QDBusConnection::systemBus(), nullptr);
                 auto i_raw_ssid = i.ssid();
                 std::string i_ssid(i_raw_ssid.cbegin(), i_raw_ssid.cend());
                 printf("    %s %d\n", i_ssid.c_str(), (int)i.strength());
@@ -73,19 +88,19 @@
     }
 }
 
-void print_info(QCoreApplication &app) {
-    UrfkillRoot *urfkill = new UrfkillRoot(URFKILL_SERVICE, URFKILL_OBJECT,
-            QDBusConnection::systemBus(), &app);
-    UrfkillSwitch *urfkillwlan = new UrfkillSwitch(URFKILL_SERVICE, URFKILL_WLAN_OBJECT,
-            QDBusConnection::systemBus(), &app);
-    UrfkillSwitch *urfkillbt = new UrfkillSwitch(URFKILL_SERVICE, URFKILL_BLUETOOTH_OBJECT,
-            QDBusConnection::systemBus(), &app);
-    UrfkillSwitch *urfkillgps = new UrfkillSwitch(URFKILL_SERVICE, URFKILL_GPS_OBJECT,
-            QDBusConnection::systemBus(), &app);
-    NetworkManagerRoot *nmroot = new NetworkManagerRoot(NM_SERVICE, NM_OBJECT,
-            QDBusConnection::systemBus(), &app);
-    OfonoRoot *ofonoroot = new OfonoRoot(OFONO_SERVICE, OFONO_OBJECT,
-            QDBusConnection::systemBus(), &app);
+static void print_info(QCoreApplication &app) {
+    OrgFreedesktopURfkillInterface *urfkill = new OrgFreedesktopURfkillInterface(URFKILL_SERVICE, URFKILL_OBJECT,
+            QDBusConnection::systemBus(), &app);
+    OrgFreedesktopURfkillKillswitchInterface *urfkillwlan = new OrgFreedesktopURfkillKillswitchInterface(URFKILL_SERVICE, URFKILL_WLAN_OBJECT,
+            QDBusConnection::systemBus(), &app);
+    OrgFreedesktopURfkillKillswitchInterface *urfkillbt = new OrgFreedesktopURfkillKillswitchInterface(URFKILL_SERVICE, URFKILL_BLUETOOTH_OBJECT,
+            QDBusConnection::systemBus(), &app);
+    OrgFreedesktopURfkillKillswitchInterface *urfkillgps = new OrgFreedesktopURfkillKillswitchInterface(URFKILL_SERVICE, URFKILL_GPS_OBJECT,
+            QDBusConnection::systemBus(), &app);
+    OrgFreedesktopNetworkManagerInterface *nmroot = new OrgFreedesktopNetworkManagerInterface(NM_DBUS_SERVICE, NM_DBUS_PATH,
+            QDBusConnection::systemBus(), &app);
+    QOfonoManager *ofonoroot = new QOfonoManager(&app);
+    wait_for_a_bit();
 
     printf("Urfkill flightmode: %d\n", urfkill->IsFlightMode().value());
     printf("Urfkill WLAN killswitch: %d\n", urfkillwlan->state());
@@ -101,40 +116,41 @@
     printf("NetworkManager wireless hardware enabled: %d\n", nmroot->wirelessHardwareEnabled());
     print_nm_wlans(nmroot);
     printf("\n");
-    auto modems = ofonoroot->GetModems().value();
+    auto modems = ofonoroot->modems();
     printf("Ofono modem count: %d\n", modems.size());
     for(const auto &m : modems) {
-        OfonoModemSimManager man(OFONO_SERVICE, m.first.path(), QDBusConnection::systemBus(), nullptr);
-        OfonoModemNetworkRegistration netreg(OFONO_SERVICE, m.first.path(), QDBusConnection::systemBus(), nullptr);
-        auto mprops = man.GetProperties().value();
-        auto regprops = netreg.GetProperties().value();
-
-        const auto &props = m.second;
-        printf("Modem %s:\n", m.first.path().toUtf8().data());
+        QOfonoModem modem;
+        modem.setModemPath(m);
+
+        QOfonoSimManager man;
+        man.setModemPath(m);
+
+        QOfonoNetworkRegistration netreg;
+        netreg.setModemPath(m);
+
+        wait_for_a_bit();
+
+        printf("Modem %s:\n", m.toUtf8().constData());
         // For proper usage should check for existance before indexing.
-        printf(" Powered: %d\n", props["Powered"].toBool());
-        printf(" Online: %d\n", props["Online"].toBool());
-        printf(" Model: %s\n", props["Model"].toString().toUtf8().data());
-        printf(" Manufacturer: %s\n", props["Manufacturer"].toString().toUtf8().data());
-        printf(" Pin required: %s\n", mprops["PinRequired"].toString().toUtf8().data());
-        printf(" Status: %s\n", regprops["Status"].toString().toUtf8().data());
-        printf(" Strength: %d\n", regprops["Strength"].toInt());
-        printf(" Operator: %s\n", regprops["Name"].toString().toUtf8().data());
+        printf(" Powered: %d\n", modem.powered());
+        printf(" Online: %d\n", modem.online());
+        printf(" Model: %s\n", modem.model().toUtf8().constData());
+        printf(" Manufacturer: %s\n", modem.manufacturer().toUtf8().constData());
+        printf(" Pin required: %d\n", man.pinRequired());
+        printf(" Status: %s\n", netreg.status().toUtf8().constData());
+        printf(" Strength: %d\n", netreg.strength());
+        printf(" Operator: %s\n", netreg.name().toUtf8().constData());
     }
 }
 
-int run_daemon(QCoreApplication &app) {
+static int run_daemon(QCoreApplication &app) {
     new EventPrinter(&app);
     return app.exec();
 }
 
 int main(int argc, char **argv) {
     QCoreApplication app(argc, argv);
-    qRegisterMetaType<QVariantDictMap>("QVariantDictMap");
-    qDBusRegisterMetaType<QVariantDictMap>();
-    qRegisterMetaType<ModemPropertyList>("ModemPropertyList");
-    qDBusRegisterMetaType<ModemPropertyList>();
-    qDBusRegisterMetaType<QPair<QDBusObjectPath, QVariantMap>>();
+    DBusTypes::registerMetaTypes();
 
     if(argc == 1) {
         print_info(app);