Refactor networkmanager QtBearer backend to use QDBusAbstractInterface.

Using QDBusInterface causes introspection, which may not be permitted
by some platforms.

Change-Id: I953d27b9c0fc7c21d52fefeb8c7760a7235aed9d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp

@@ -125,7 +125,6 @@ void QNetworkManagerEngine::setupConfigurations()
         activeConnectionsList.insert(acPath.path(), activeConnection);
         connect(activeConnection, SIGNAL(propertiesChanged(QMap<QString,QVariant>)),
                 this, SLOT(activeConnectionPropertiesChanged(QMap<QString,QVariant>)));
-        activeConnection->setConnections();
 
         QStringList devices = activeConnection->devices();
         if (!devices.isEmpty()) {
@@ -180,7 +179,7 @@ void QNetworkManagerEngine::connectToId(const QString &id)
     NMDeviceType connectionType = connection->getType();
 
     QString dbusDevicePath;
-    const QString settingsPath = connection->connectionInterface()->path();
+    const QString settingsPath = connection->path();
     QString specificPath = configuredAccessPoints.key(settingsPath);
 
     if (isConnectionActive(settingsPath))
@@ -277,7 +276,6 @@ void QNetworkManagerEngine::interfacePropertiesChanged(const QMap<QString, QVari
 
                     connect(activeConnection, SIGNAL(propertiesChanged(QMap<QString,QVariant>)),
                             this, SLOT(activeConnectionPropertiesChanged(QMap<QString,QVariant>)));
-                    activeConnection->setConnections();
                 }
 
                 const QString id = activeConnection->connection().path();
@@ -373,10 +371,10 @@ void QNetworkManagerEngine::deviceConnectionsChanged(const QStringList &connecti
 {
     QMutexLocker locker(&mutex);
     for (int i = 0; i < connections.count(); ++i) {
-        if (connectionsList.contains(connections.at(i)->connectionInterface()->path()))
+        if (connectionsList.contains(connections.at(i)->path()))
             continue;
 
-        const QString settingsPath = connections.at(i)->connectionInterface()->path();
+        const QString settingsPath = connections.at(i)->path();
 
         QNetworkConfigurationPrivatePointer ptr =
             accessPointConfigurations.value(settingsPath);
@@ -399,11 +397,10 @@ void QNetworkManagerEngine::deviceAdded(const QDBusObjectPath &path)
     connect(iDevice,SIGNAL(connectionsChanged(QStringList)),
             this,SLOT(deviceConnectionsChanged(QStringList)));
 
-    iDevice->setConnections();
     interfaceDevices.insert(path.path(),iDevice);
     if (iDevice->deviceType() == DEVICE_TYPE_WIFI) {
         QNetworkManagerInterfaceDeviceWireless *wirelessDevice =
-            new QNetworkManagerInterfaceDeviceWireless(iDevice->connectionInterface()->path(),this);
+            new QNetworkManagerInterfaceDeviceWireless(iDevice->path(),this);
 
         connect(wirelessDevice, SIGNAL(accessPointAdded(QString)),
                 this, SLOT(newAccessPoint(QString)));
@@ -417,9 +414,9 @@ void QNetworkManagerEngine::deviceAdded(const QDBusObjectPath &path)
 
     if (iDevice->deviceType() == DEVICE_TYPE_ETHERNET) {
         QNetworkManagerInterfaceDeviceWired *wiredDevice =
-                new QNetworkManagerInterfaceDeviceWired(iDevice->connectionInterface()->path(),this);
+                new QNetworkManagerInterfaceDeviceWired(iDevice->path(),this);
         connect(wiredDevice,SIGNAL(carrierChanged(bool)),this,SLOT(wiredCarrierChanged(bool)));
-        wiredDevices.insert(iDevice->connectionInterface()->path(), wiredDevice);
+        wiredDevices.insert(iDevice->path(), wiredDevice);
     }
 }
 
@@ -454,7 +451,7 @@ void QNetworkManagerEngine::wiredCarrierChanged(bool carrier)
         for (int i = 0; i < connections.count(); ++i) {
             QNetworkManagerSettingsConnection *connection = connections.at(i);
             if (connection->getType() == DEVICE_TYPE_ETHERNET
-                    && settingsPath.path() == connection->connectionInterface()->path()) {
+                    && settingsPath.path() == connection->path()) {
                 QNetworkConfigurationPrivatePointer ptr =
                         accessPointConfigurations.value(settingsPath.path());
 
@@ -486,9 +483,9 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path,
     }
 
     QNetworkManagerSettingsConnection *connection =
-        new QNetworkManagerSettingsConnection(settings->connectionInterface()->service(),
+        new QNetworkManagerSettingsConnection(settings->service(),
                                               path.path(),this);
-    const QString settingsPath = connection->connectionInterface()->path();
+    const QString settingsPath = connection->path();
     if (accessPointConfigurations.contains(settingsPath)) {
         return;
     }
@@ -506,7 +503,7 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path,
         for (int i = 0; i < accessPoints.count(); ++i) {
             if (connection->getSsid() == accessPoints.at(i)->ssid()) {
                 // remove the corresponding accesspoint from configurations
-                apPath = accessPoints.at(i)->connectionInterface()->path();
+                apPath = accessPoints.at(i)->path();
                 QNetworkConfigurationPrivatePointer ptr
                         = accessPointConfigurations.take(apPath);
                 if (ptr) {
@@ -533,7 +530,7 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path,
              i.next();
              if (i.value()->deviceType() == deviceType) {
                 QNetworkManagerInterfaceDeviceWired *wiredDevice
-                        = wiredDevices.value(i.value()->connectionInterface()->path());
+                        = wiredDevices.value(i.value()->path());
                  if (wiredDevice->carrier()) {
                      cpPriv->state |= QNetworkConfiguration::Discovered;
                  }
@@ -564,7 +561,7 @@ bool QNetworkManagerEngine::isConnectionActive(const QString &settingsPath)
 
     QNetworkManagerSettingsConnection *settingsConnection = connectionFromId(settingsPath);
     if (settingsConnection->getType() == DEVICE_TYPE_MODEM) {
-        return isActiveContext(settingsConnection->connectionInterface()->path());
+        return isActiveContext(settingsConnection->path());
     }
 
     return false;
@@ -611,7 +608,7 @@ void QNetworkManagerEngine::updateConnection()
         qobject_cast<QNetworkManagerSettingsConnection *>(sender());
     if (!connection)
         return;
-    const QString settingsPath = connection->connectionInterface()->path();
+    const QString settingsPath = connection->path();
 
     QNetworkConfigurationPrivate *cpPriv = parseConnection(settingsPath, connection->getSettings());
 
@@ -682,20 +679,19 @@ void QNetworkManagerEngine::newAccessPoint(const QString &path)
 
     bool okToAdd = true;
     for (int i = 0; i < accessPoints.count(); ++i) {
-        if (accessPoints.at(i)->connectionInterface()->path() == path) {
+        if (accessPoints.at(i)->path() == path) {
             okToAdd = false;
         }
     }
     if (okToAdd) {
         accessPoints.append(accessPoint);
-        accessPoint->setConnections();
     }
     // Check if configuration exists for connection.
     if (!accessPoint->ssid().isEmpty()) {
 
         for (int i = 0; i < connections.count(); ++i) {
             QNetworkManagerSettingsConnection *connection = connections.at(i);
-            const QString settingsPath = connection->connectionInterface()->path();
+            const QString settingsPath = connection->path();
 
             if (accessPoint->ssid() == connection->getSsid()) {
                 if (!configuredAccessPoints.contains(path)) {
@@ -741,18 +737,18 @@ void QNetworkManagerEngine::removeAccessPoint(const QString &path)
     QMutexLocker locker(&mutex);
     for (int i = 0; i < accessPoints.count(); ++i) {
         QNetworkManagerInterfaceAccessPoint *accessPoint = accessPoints.at(i);
-        if (accessPoint->connectionInterface()->path() == path) {
+        if (accessPoint->path() == path) {
             accessPoints.removeOne(accessPoint);
 
-            if (configuredAccessPoints.contains(accessPoint->connectionInterface()->path())) {
+            if (configuredAccessPoints.contains(accessPoint->path())) {
                 // find connection and change state to Defined
-                configuredAccessPoints.remove(accessPoint->connectionInterface()->path());
+                configuredAccessPoints.remove(accessPoint->path());
 
                 for (int i = 0; i < connections.count(); ++i) {
                     QNetworkManagerSettingsConnection *connection = connections.at(i);
 
                     if (accessPoint->ssid() == connection->getSsid()) {//might not have bssid yet
-                        const QString settingsPath = connection->connectionInterface()->path();
+                        const QString settingsPath = connection->path();
                         const QString connectionId = settingsPath;
 
                         QNetworkConfigurationPrivatePointer ptr =
@@ -804,7 +800,7 @@ QNetworkConfigurationPrivate *QNetworkManagerEngine::parseConnection(const QStri
         foreach (const QDBusObjectPath &devicePath, managerInterface->getDevices()) {
             QNetworkManagerInterfaceDevice device(devicePath.path(),this);
             if (device.deviceType() == DEVICE_TYPE_ETHERNET) {
-                QNetworkManagerInterfaceDeviceWired *wiredDevice = wiredDevices.value(device.connectionInterface()->path());
+                QNetworkManagerInterfaceDeviceWired *wiredDevice = wiredDevices.value(device.path());
                 if (wiredDevice->carrier()) {
                     cpPriv->state |= QNetworkConfiguration::Discovered;
                     break;
@@ -819,10 +815,10 @@ QNetworkConfigurationPrivate *QNetworkManagerEngine::parseConnection(const QStri
             if (connectionSsid == accessPoints.at(i)->ssid()
                     && map.value("802-11-wireless").value("seen-bssids").toStringList().contains(accessPoints.at(i)->hwAddress())) {
                 cpPriv->state |= QNetworkConfiguration::Discovered;
-                if (!configuredAccessPoints.contains(accessPoints.at(i)->connectionInterface()->path())) {
+                if (!configuredAccessPoints.contains(accessPoints.at(i)->path())) {
-                    configuredAccessPoints.insert(accessPoints.at(i)->connectionInterface()->path(),settingsPath);
+                    configuredAccessPoints.insert(accessPoints.at(i)->path(),settingsPath);
 
-                    const QString accessPointId = accessPoints.at(i)->connectionInterface()->path();
+                    const QString accessPointId = accessPoints.at(i)->path();
                     QNetworkConfigurationPrivatePointer ptr =
                         accessPointConfigurations.take(accessPointId);
 
@@ -881,7 +877,7 @@ QNetworkManagerSettingsConnection *QNetworkManagerEngine::connectionFromId(const
 {
     for (int i = 0; i < connections.count(); ++i) {
         QNetworkManagerSettingsConnection *connection = connections.at(i);
-        if (id == connection->connectionInterface()->path())
+        if (id == connection->path())
             return connection;
     }
 

src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp

@@ -47,32 +47,24 @@
 
 #ifndef QT_NO_DBUS
 
+#define DBUS_PROPERTIES_INTERFACE  "org.freedesktop.DBus.Properties"
+
 QT_BEGIN_NAMESPACE
 
-class QNetworkManagerInterfacePrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    bool valid;
-};
 
 QNetworkManagerInterface::QNetworkManagerInterface(QObject *parent)
-        : QObject(parent)
+        : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE),
+                                 QLatin1String(NM_DBUS_PATH),
+                                 NM_DBUS_INTERFACE,
+                                 QDBusConnection::systemBus(),parent)
 {
-    d = new QNetworkManagerInterfacePrivate();
+    if (!isValid()) {
-    d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                QLatin1String(NM_DBUS_PATH),
-                                                QLatin1String(NM_DBUS_INTERFACE),
-                                                QDBusConnection::systemBus(),parent);
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
-    d->valid = true;
 
-    QDBusInterface managerPropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
+    PropertiesDBusInterface managerPropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
                                                   QLatin1String(NM_DBUS_PATH),
-                                                  QLatin1String("org.freedesktop.DBus.Properties"),
+                                                  DBUS_PROPERTIES_INTERFACE,
                                                   QDBusConnection::systemBus());
     QList<QVariant> argumentList;
     argumentList << QLatin1String(NM_DBUS_INTERFACE);
@@ -81,13 +73,17 @@ QNetworkManagerInterface::QNetworkManagerInterface(QObject *parent)
                                                                        argumentList);
     if (!propsReply.isError()) {
         propertyMap = propsReply.value();
+    } else {
+        qWarning() << Q_FUNC_INFO << "propsReply"<<propsReply.error().message();
     }
 
     QDBusPendingReply<QList <QDBusObjectPath> > nmReply
-            = d->connectionInterface->call(QLatin1String("GetDevices"));
+            = call(QLatin1String("GetDevices"));
     nmReply.waitForFinished();
     if (!nmReply.isError()) {
         devicesPathList = nmReply.value();
+    } else {
+        qWarning() << Q_FUNC_INFO <<"nmReply"<<nmReply.error().message();
     }
 
     QDBusConnection::systemBus().connect(QLatin1String(NM_DBUS_SERVICE),
@@ -99,13 +95,6 @@ QNetworkManagerInterface::QNetworkManagerInterface(QObject *parent)
 
 QNetworkManagerInterface::~QNetworkManagerInterface()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerInterface::isValid()
-{
-    return d->valid;
 }
 
 bool QNetworkManagerInterface::setConnections()
@@ -138,16 +127,11 @@ bool QNetworkManagerInterface::setConnections()
     return allOk;
 }
 
-QDBusInterface *QNetworkManagerInterface::connectionInterface()  const
-{
-    return d->connectionInterface;
-}
-
 QList <QDBusObjectPath> QNetworkManagerInterface::getDevices()
 {
     if (devicesPathList.isEmpty()) {
         //qWarning() << "using blocking call!";
-        QDBusReply<QList<QDBusObjectPath> > reply = d->connectionInterface->call(QLatin1String("GetDevices"));
+        QDBusReply<QList<QDBusObjectPath> > reply = call(QLatin1String("GetDevices"));
         devicesPathList = reply.value();
     }
     return devicesPathList;
@@ -157,7 +141,7 @@ void QNetworkManagerInterface::activateConnection(QDBusObjectPath connectionPath
                                                   QDBusObjectPath devicePath,
                                                   QDBusObjectPath specificObject)
 {
-    QDBusPendingCall pendingCall = d->connectionInterface->asyncCall(QLatin1String("ActivateConnection"),
+    QDBusPendingCall pendingCall = asyncCall(QLatin1String("ActivateConnection"),
                                                                     QVariant::fromValue(connectionPath),
                                                                     QVariant::fromValue(devicePath),
                                                                     QVariant::fromValue(specificObject));
@@ -167,9 +151,9 @@ void QNetworkManagerInterface::activateConnection(QDBusObjectPath connectionPath
                     this, SIGNAL(activationFinished(QDBusPendingCallWatcher*)));
 }
 
-void QNetworkManagerInterface::deactivateConnection(QDBusObjectPath connectionPath)  const
+void QNetworkManagerInterface::deactivateConnection(QDBusObjectPath connectionPath)
 {
-    d->connectionInterface->asyncCall(QLatin1String("DeactivateConnection"), QVariant::fromValue(connectionPath));
+    asyncCall(QLatin1String("DeactivateConnection"), QVariant::fromValue(connectionPath));
 }
 
 bool QNetworkManagerInterface::wirelessEnabled()  const
@@ -245,73 +229,38 @@ void QNetworkManagerInterface::propertiesSwap(QMap<QString,QVariant> map)
     }
 }
 
-class QNetworkManagerInterfaceAccessPointPrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    QString path;
-    bool valid;
-};
-
 QNetworkManagerInterfaceAccessPoint::QNetworkManagerInterfaceAccessPoint(const QString &dbusPathName, QObject *parent)
-        : QObject(parent)
+        : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE),
+                  dbusPathName,
+                  NM_DBUS_INTERFACE_ACCESS_POINT,
+                  QDBusConnection::systemBus(),parent)
 {
-    d = new QNetworkManagerInterfaceAccessPointPrivate();
+    if (!isValid()) {
-    d->path = dbusPathName;
-    d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                d->path,
-                                                QLatin1String(NM_DBUS_INTERFACE_ACCESS_POINT),
-                                                QDBusConnection::systemBus(),parent);
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
-    QDBusInterface accessPointPropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
+    PropertiesDBusInterface *accessPointPropertiesInterface = new PropertiesDBusInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                  d->path,
+                                                  dbusPathName,
-                                                  QLatin1String("org.freedesktop.DBus.Properties"),
+                                                  DBUS_PROPERTIES_INTERFACE,
                                                   QDBusConnection::systemBus());
 
     QList<QVariant> argumentList;
     argumentList << QLatin1String(NM_DBUS_INTERFACE_ACCESS_POINT);
     QDBusPendingReply<QVariantMap> propsReply
-            = accessPointPropertiesInterface.callWithArgumentList(QDBus::Block,QLatin1String("GetAll"),
+            = accessPointPropertiesInterface->callWithArgumentList(QDBus::Block,QLatin1String("GetAll"),
                                                                        argumentList);
     if (!propsReply.isError()) {
         propertyMap = propsReply.value();
     }
 
     QDBusConnection::systemBus().connect(QLatin1String(NM_DBUS_SERVICE),
-                                  d->path,
+                                  dbusPathName,
                                   QLatin1String(NM_DBUS_INTERFACE_ACCESS_POINT),
                                   QLatin1String("PropertiesChanged"),
                                   this,SLOT(propertiesSwap(QMap<QString,QVariant>)));
-
-    d->valid = true;
-
 }
 
 QNetworkManagerInterfaceAccessPoint::~QNetworkManagerInterfaceAccessPoint()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerInterfaceAccessPoint::isValid()
-{
-    return d->valid;
-}
-
-bool QNetworkManagerInterfaceAccessPoint::setConnections()
-{
-    if (!isValid())
-        return false;
-
-    return true;
-}
-
-QDBusInterface *QNetworkManagerInterfaceAccessPoint::connectionInterface() const
-{
-    return d->connectionInterface;
 }
 
 quint32 QNetworkManagerInterfaceAccessPoint::flags() const
@@ -386,31 +335,19 @@ void QNetworkManagerInterfaceAccessPoint::propertiesSwap(QMap<QString,QVariant>
     }
 }
 
-class QNetworkManagerInterfaceDevicePrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    QString path;
-    bool valid;
-};
-
 QNetworkManagerInterfaceDevice::QNetworkManagerInterfaceDevice(const QString &deviceObjectPath, QObject *parent)
-        : QObject(parent)
+        : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE),
+                                 deviceObjectPath,
+                                 NM_DBUS_INTERFACE_DEVICE,
+                                 QDBusConnection::systemBus(),parent)
 {
 
-    d = new QNetworkManagerInterfaceDevicePrivate();
+    if (!isValid()) {
-    d->path = deviceObjectPath;
-    d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                d->path,
-                                                QLatin1String(NM_DBUS_INTERFACE_DEVICE),
-                                                QDBusConnection::systemBus(),parent);
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
-    QDBusInterface devicePropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
+    PropertiesDBusInterface devicePropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                  d->path,
+                                                  deviceObjectPath,
-                                                  QLatin1String("org.freedesktop.DBus.Properties"),
+                                                  DBUS_PROPERTIES_INTERFACE,
                                                   QDBusConnection::systemBus(),parent);
 
     QList<QVariant> argumentList;
@@ -424,35 +361,14 @@ QNetworkManagerInterfaceDevice::QNetworkManagerInterfaceDevice(const QString &de
     }
 
     QDBusConnection::systemBus().connect(QLatin1String(NM_DBUS_SERVICE),
-                                  d->path,
+                                  deviceObjectPath,
                                   QLatin1String(NM_DBUS_INTERFACE_DEVICE),
                                   QLatin1String("PropertiesChanged"),
                                   this,SLOT(propertiesSwap(QMap<QString,QVariant>)));
-    d->valid = true;
 }
 
 QNetworkManagerInterfaceDevice::~QNetworkManagerInterfaceDevice()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerInterfaceDevice::isValid()
-{
-    return d->valid;
-}
-
-bool QNetworkManagerInterfaceDevice::setConnections()
-{
-    if (!isValid())
-        return false;
-
-    return true;
-}
-
-QDBusInterface *QNetworkManagerInterfaceDevice::connectionInterface() const
-{
-    return d->connectionInterface;
 }
 
 QString QNetworkManagerInterfaceDevice::udi() const
@@ -519,31 +435,19 @@ void QNetworkManagerInterfaceDevice::propertiesSwap(QMap<QString,QVariant> map)
     Q_EMIT propertiesChanged(map);
 }
 
-class QNetworkManagerInterfaceDeviceWiredPrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    QString path;
-    bool valid;
-};
-
 QNetworkManagerInterfaceDeviceWired::QNetworkManagerInterfaceDeviceWired(const QString &ifaceDevicePath, QObject *parent)
-    : QObject(parent)
+    : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE),
+                             ifaceDevicePath,
+                             NM_DBUS_INTERFACE_DEVICE_WIRED,
+                             QDBusConnection::systemBus(), parent)
 {
-    d = new QNetworkManagerInterfaceDeviceWiredPrivate();
+    if (!isValid()) {
-    d->path = ifaceDevicePath;
-    d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                d->path,
-                                                QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRED),
-                                                QDBusConnection::systemBus(), parent);
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
-    QDBusInterface deviceWiredPropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
+    PropertiesDBusInterface deviceWiredPropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                  d->path,
+                                                           ifaceDevicePath,
-                                                  QLatin1String("org.freedesktop.DBus.Properties"),
+                                                           DBUS_PROPERTIES_INTERFACE,
-                                                  QDBusConnection::systemBus(),parent);
+                                                           QDBusConnection::systemBus(),parent);
 
     QList<QVariant> argumentList;
     argumentList << QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRED);
@@ -556,36 +460,14 @@ QNetworkManagerInterfaceDeviceWired::QNetworkManagerInterfaceDeviceWired(const Q
     }
 
     QDBusConnection::systemBus().connect(QLatin1String(NM_DBUS_SERVICE),
-                                  d->path,
+                                  ifaceDevicePath,
                                   QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRED),
                                   QLatin1String("PropertiesChanged"),
                                   this,SLOT(propertiesSwap(QMap<QString,QVariant>)));
-
-    d->valid = true;
 }
 
 QNetworkManagerInterfaceDeviceWired::~QNetworkManagerInterfaceDeviceWired()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerInterfaceDeviceWired::isValid()
-{
-
-    return d->valid;
-}
-
-bool QNetworkManagerInterfaceDeviceWired::setConnections()
-{
-    if (!isValid())
-        return false;
-    return true;
-}
-
-QDBusInterface *QNetworkManagerInterfaceDeviceWired::connectionInterface() const
-{
-    return d->connectionInterface;
 }
 
 QString QNetworkManagerInterfaceDeviceWired::hwAddress() const
@@ -639,39 +521,27 @@ void QNetworkManagerInterfaceDeviceWired::propertiesSwap(QMap<QString,QVariant>
     Q_EMIT propertiesChanged(map);
 }
 
-class QNetworkManagerInterfaceDeviceWirelessPrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    QString path;
-    bool valid;
-};
-
 QNetworkManagerInterfaceDeviceWireless::QNetworkManagerInterfaceDeviceWireless(const QString &ifaceDevicePath, QObject *parent)
-    : QObject(parent)
+    : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE),
+                             ifaceDevicePath,
+                             NM_DBUS_INTERFACE_DEVICE_WIRELESS,
+                             QDBusConnection::systemBus(), parent)
 {
-    d = new QNetworkManagerInterfaceDeviceWirelessPrivate();
+    if (!isValid()) {
-    d->path = ifaceDevicePath;
-    d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                d->path,
-                                                QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
-                                                QDBusConnection::systemBus(), parent);
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
 
-
+    interfacePath = ifaceDevicePath;
     QDBusPendingReply<QList <QDBusObjectPath> > nmReply
-            = d->connectionInterface->call(QLatin1String("GetAccessPoints"));
+            = call(QLatin1String("GetAccessPoints"));
 
     if (!nmReply.isError()) {
         accessPointsList = nmReply.value();
     }
 
-    QDBusInterface deviceWirelessPropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
+    PropertiesDBusInterface deviceWirelessPropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                  d->path,
+                                                  interfacePath,
-                                                  QLatin1String("org.freedesktop.DBus.Properties"),
+                                                  DBUS_PROPERTIES_INTERFACE,
                                                   QDBusConnection::systemBus(),parent);
 
     QList<QVariant> argumentList;
@@ -684,31 +554,21 @@ QNetworkManagerInterfaceDeviceWireless::QNetworkManagerInterfaceDeviceWireless(c
     }
 
     QDBusConnection::systemBus().connect(QLatin1String(NM_DBUS_SERVICE),
-                                  d->path,
+                                 interfacePath,
                                   QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
                                   QLatin1String("PropertiesChanged"),
                                   this,SLOT(propertiesSwap(QMap<QString,QVariant>)));
 
     QDBusPendingReply<QList<QDBusObjectPath> > reply
-            = d->connectionInterface->asyncCall(QLatin1String("GetAccessPoints"));
+            = asyncCall(QLatin1String("GetAccessPoints"));
 
     QDBusPendingCallWatcher *callWatcher = new QDBusPendingCallWatcher(reply);
     connect(callWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
                      this, SLOT(accessPointsFinished(QDBusPendingCallWatcher*)));
-
-
-    d->valid = true;
 }
 
 QNetworkManagerInterfaceDeviceWireless::~QNetworkManagerInterfaceDeviceWireless()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerInterfaceDeviceWireless::isValid()
-{
-    return d->valid;
 }
 
 void QNetworkManagerInterfaceDeviceWireless::slotAccessPointAdded(QDBusObjectPath path)
@@ -732,16 +592,16 @@ bool QNetworkManagerInterfaceDeviceWireless::setConnections()
     bool allOk = true;
 
     if (!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
-                                d->path,
+                               interfacePath,
-                              QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
+                                QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
-                              QLatin1String("AccessPointAdded"),
+                                QLatin1String("AccessPointAdded"),
-                              this, SLOT(slotAccessPointAdded(QDBusObjectPath)))) {
+                                this, SLOT(slotAccessPointAdded(QDBusObjectPath)))) {
         allOk = false;
     }
 
 
     if (!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
-                              d->path,
+                              interfacePath,
                               QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
                               QLatin1String("AccessPointRemoved"),
                               this, SLOT(slotAccessPointRemoved(QDBusObjectPath)))) {
@@ -749,7 +609,7 @@ bool QNetworkManagerInterfaceDeviceWireless::setConnections()
     }
 
     if (!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
-                               d->path,
+                               interfacePath,
                                QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
                                QLatin1String("ScanDone"),
                                this, SLOT(scanIsDone()))) {
@@ -771,17 +631,12 @@ void QNetworkManagerInterfaceDeviceWireless::accessPointsFinished(QDBusPendingCa
     }
 }
 
-QDBusInterface *QNetworkManagerInterfaceDeviceWireless::connectionInterface() const
-{
-    return d->connectionInterface;
-}
-
 QList <QDBusObjectPath> QNetworkManagerInterfaceDeviceWireless::getAccessPoints()
 {
     if (accessPointsList.isEmpty()) {
         //qWarning() << "Using blocking call!";
         QDBusReply<QList<QDBusObjectPath> > reply
-                = d->connectionInterface->call(QLatin1String("GetAccessPoints"));
+                = call(QLatin1String("GetAccessPoints"));
         accessPointsList = reply.value();
     }
     return accessPointsList;
@@ -829,7 +684,7 @@ void QNetworkManagerInterfaceDeviceWireless::scanIsDone()
 
 void QNetworkManagerInterfaceDeviceWireless::requestScan()
 {
-    d->connectionInterface->asyncCall(QLatin1String("RequestScan"));
+    asyncCall(QLatin1String("RequestScan"));
 }
 
 void QNetworkManagerInterfaceDeviceWireless::propertiesSwap(QMap<QString,QVariant> map)
@@ -844,29 +699,17 @@ void QNetworkManagerInterfaceDeviceWireless::propertiesSwap(QMap<QString,QVarian
     }
 }
 
-class QNetworkManagerInterfaceDeviceModemPrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    QString path;
-    bool valid;
-};
-
 QNetworkManagerInterfaceDeviceModem::QNetworkManagerInterfaceDeviceModem(const QString &ifaceDevicePath, QObject *parent)
-    : QObject(parent)
+    : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE),
+                             ifaceDevicePath,
+                             NM_DBUS_INTERFACE_DEVICE_MODEM,
+                             QDBusConnection::systemBus(), parent)
 {
-    d = new QNetworkManagerInterfaceDeviceModemPrivate();
+    if (!isValid()) {
-    d->path = ifaceDevicePath;
-    d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                d->path,
-                                                QLatin1String(NM_DBUS_INTERFACE_DEVICE_MODEM),
-                                                QDBusConnection::systemBus(), parent);
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
-    QDBusInterface deviceModemPropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
+    PropertiesDBusInterface deviceModemPropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                  d->path,
+                                                  ifaceDevicePath,
                                                   QLatin1String("org.freedesktop.DBus.Properties"),
                                                   QDBusConnection::systemBus(),parent);
 
@@ -880,36 +723,14 @@ QNetworkManagerInterfaceDeviceModem::QNetworkManagerInterfaceDeviceModem(const Q
     }
 
     QDBusConnection::systemBus().connect(QLatin1String(NM_DBUS_SERVICE),
-                                  d->path,
+                                  ifaceDevicePath,
                                   QLatin1String(NM_DBUS_INTERFACE_DEVICE_MODEM),
                                   QLatin1String("PropertiesChanged"),
                                   this,SLOT(propertiesSwap(QMap<QString,QVariant>)));
-    d->valid = true;
 }
 
 QNetworkManagerInterfaceDeviceModem::~QNetworkManagerInterfaceDeviceModem()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerInterfaceDeviceModem::isValid()
-{
-
-    return d->valid;
-}
-
-bool QNetworkManagerInterfaceDeviceModem::setConnections()
-{
-    if (!isValid() )
-        return false;
-
-    return true;
-}
-
-QDBusInterface *QNetworkManagerInterfaceDeviceModem::connectionInterface() const
-{
-    return d->connectionInterface;
 }
 
 QNetworkManagerInterfaceDeviceModem::ModemCapabilities QNetworkManagerInterfaceDeviceModem::modemCapabilities() const
@@ -936,59 +757,39 @@ void QNetworkManagerInterfaceDeviceModem::propertiesSwap(QMap<QString,QVariant>
     Q_EMIT propertiesChanged(map);
 }
 
-class QNetworkManagerSettingsPrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    QString path;
-    bool valid;
-};
 
 QNetworkManagerSettings::QNetworkManagerSettings(const QString &settingsService, QObject *parent)
-        : QObject(parent)
+        : QDBusAbstractInterface(settingsService,
+                                 NM_DBUS_PATH_SETTINGS,
+                                 NM_DBUS_IFACE_SETTINGS,
+                                 QDBusConnection::systemBus(), parent)
 {
-    d = new QNetworkManagerSettingsPrivate();
+    if (!isValid()) {
-    d->path = settingsService;
-    d->connectionInterface = new QDBusInterface(settingsService,
-                                                QLatin1String(NM_DBUS_PATH_SETTINGS),
-                                                QLatin1String(NM_DBUS_IFACE_SETTINGS),
-                                                QDBusConnection::systemBus());
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
-
+    interfacePath = settingsService;
     QDBusPendingReply<QList <QDBusObjectPath> > nmReply
-            = d->connectionInterface->call(QLatin1String("ListConnections"));
+            = call(QLatin1String("ListConnections"));
 
     if (!nmReply.isError()) {
         connectionsList = nmReply.value();
     }
-
-    d->valid = true;
 }
 
 QNetworkManagerSettings::~QNetworkManagerSettings()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerSettings::isValid()
-{
-    return d->valid;
 }
 
 bool QNetworkManagerSettings::setConnections()
 {
     bool allOk = true;
-
+    if (!QDBusConnection::systemBus().connect(interfacePath,
-    if (!QDBusConnection::systemBus().connect(d->path,
                                              QLatin1String(NM_DBUS_PATH_SETTINGS),
                                              QLatin1String(NM_DBUS_IFACE_SETTINGS),
                                              QLatin1String("NewConnection"),
                                              this, SIGNAL(newConnection(QDBusObjectPath)))) {
         allOk = false;
+        qWarning() << Q_FUNC_INFO << "NewConnection could not be connected";
     }
 
     return allOk;
@@ -999,7 +800,7 @@ QList <QDBusObjectPath> QNetworkManagerSettings::listConnections()
     if (connectionsList.isEmpty()) {
         //qWarning() << "Using blocking call!";
         QDBusReply<QList<QDBusObjectPath> > reply
-                = d->connectionInterface->call(QLatin1String("ListConnections"));
+                = call(QLatin1String("ListConnections"));
         connectionsList = reply.value();
     }
     return connectionsList;
@@ -1010,59 +811,30 @@ QString QNetworkManagerSettings::getConnectionByUuid(const QString &uuid)
 {
     QList<QVariant> argumentList;
     argumentList << QVariant::fromValue(uuid);
-    QDBusReply<QDBusObjectPath > reply = d->connectionInterface->callWithArgumentList(QDBus::Block,QLatin1String("GetConnectionByUuid"), argumentList);
+    QDBusReply<QDBusObjectPath > reply = callWithArgumentList(QDBus::Block,QLatin1String("GetConnectionByUuid"), argumentList);
     return reply.value().path();
 }
 
-QDBusInterface *QNetworkManagerSettings::connectionInterface() const
-{
-    return d->connectionInterface;
-}
-
-
-class QNetworkManagerSettingsConnectionPrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    QString path;
-    QString service;
-    QNmSettingsMap settingsMap;
-    bool valid;
-};
-
 QNetworkManagerSettingsConnection::QNetworkManagerSettingsConnection(const QString &settingsService, const QString &connectionObjectPath, QObject *parent)
-    : QObject(parent)
+    : QDBusAbstractInterface(settingsService,
+                             connectionObjectPath,
+                             NM_DBUS_IFACE_SETTINGS_CONNECTION,
+                             QDBusConnection::systemBus(), parent)
 {
     qDBusRegisterMetaType<QNmSettingsMap>();
-    d = new QNetworkManagerSettingsConnectionPrivate();
+    if (!isValid()) {
-    d->path = connectionObjectPath;
-    d->service = settingsService;
-    d->connectionInterface = new QDBusInterface(settingsService,
-                                                d->path,
-                                                QLatin1String(NM_DBUS_IFACE_SETTINGS_CONNECTION),
-                                                QDBusConnection::systemBus(), parent);
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
-    d->valid = true;
+    interfacepath = connectionObjectPath;
-
     QDBusPendingReply<QNmSettingsMap> nmReply
-            = d->connectionInterface->call(QLatin1String("GetSettings"));
+            = call(QLatin1String("GetSettings"));
     if (!nmReply.isError()) {
-        d->settingsMap = nmReply.value();
+        settingsMap = nmReply.value();
     }
 }
 
 QNetworkManagerSettingsConnection::~QNetworkManagerSettingsConnection()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerSettingsConnection::isValid()
-{
-    return d->valid;
 }
 
 bool QNetworkManagerSettingsConnection::setConnections()
@@ -1072,16 +844,16 @@ bool QNetworkManagerSettingsConnection::setConnections()
 
     QDBusConnection dbusConnection = QDBusConnection::systemBus();
     bool allOk = true;
-    if (!dbusConnection.connect(d->service,
+    if (!dbusConnection.connect(service(),
-                               d->path,
+                               interfacepath,
                                QLatin1String(NM_DBUS_IFACE_SETTINGS_CONNECTION),
                                QLatin1String("Updated"),
                                this, SIGNAL(updated()))) {
         allOk = false;
     }
 
-    if (!dbusConnection.connect(d->service,
+    if (!dbusConnection.connect(service(),
-                               d->path,
+                               interfacepath,
                                QLatin1String(NM_DBUS_IFACE_SETTINGS_CONNECTION),
                                QLatin1String("Removed"),
                                this, SIGNAL(slotSettingsRemoved()))) {
@@ -1092,28 +864,23 @@ bool QNetworkManagerSettingsConnection::setConnections()
 
 void QNetworkManagerSettingsConnection::slotSettingsRemoved()
 {
-    Q_EMIT removed(d->path);
+    Q_EMIT removed(interfacepath);
-}
-
-QDBusInterface *QNetworkManagerSettingsConnection::connectionInterface() const
-{
-    return d->connectionInterface;
 }
 
 QNmSettingsMap QNetworkManagerSettingsConnection::getSettings()
 {
-    if (d->settingsMap.isEmpty()) {
+    if (settingsMap.isEmpty()) {
         //qWarning() << "Using blocking call!";
-        QDBusReply<QNmSettingsMap> reply = d->connectionInterface->call(QLatin1String("GetSettings"));
+        QDBusReply<QNmSettingsMap> reply = call(QLatin1String("GetSettings"));
-        d->settingsMap = reply.value();
+        settingsMap = reply.value();
     }
-    return d->settingsMap;
+    return settingsMap;
 }
 
 NMDeviceType QNetworkManagerSettingsConnection::getType()
 {
     const QString devType =
-        d->settingsMap.value(QLatin1String("connection")).value(QLatin1String("type")).toString();
+        settingsMap.value(QLatin1String("connection")).value(QLatin1String("type")).toString();
 
     if (devType == QLatin1String("802-3-ethernet"))
         return DEVICE_TYPE_ETHERNET;
@@ -1128,7 +895,7 @@ NMDeviceType QNetworkManagerSettingsConnection::getType()
 bool QNetworkManagerSettingsConnection::isAutoConnect()
 {
     const QVariant autoConnect =
-        d->settingsMap.value(QLatin1String("connection")).value(QLatin1String("autoconnect"));
+        settingsMap.value(QLatin1String("connection")).value(QLatin1String("autoconnect"));
 
     // NetworkManager default is to auto connect
     if (!autoConnect.isValid())
@@ -1139,27 +906,27 @@ bool QNetworkManagerSettingsConnection::isAutoConnect()
 
 quint64 QNetworkManagerSettingsConnection::getTimestamp()
 {
-    return d->settingsMap.value(QLatin1String("connection"))
+    return settingsMap.value(QLatin1String("connection"))
                          .value(QLatin1String("timestamp")).toUInt();
 }
 
 QString QNetworkManagerSettingsConnection::getId()
 {
-    return d->settingsMap.value(QLatin1String("connection")).value(QLatin1String("id")).toString();
+    return settingsMap.value(QLatin1String("connection")).value(QLatin1String("id")).toString();
 }
 
 QString QNetworkManagerSettingsConnection::getUuid()
 {
-    const QString id = d->settingsMap.value(QLatin1String("connection"))
+    const QString id = settingsMap.value(QLatin1String("connection"))
                                      .value(QLatin1String("uuid")).toString();
 
     // is no uuid, return the connection path
-    return id.isEmpty() ? d->connectionInterface->path() : id;
+    return id.isEmpty() ? path() : id;
 }
 
 QString QNetworkManagerSettingsConnection::getSsid()
 {
-    return d->settingsMap.value(QLatin1String("802-11-wireless"))
+    return settingsMap.value(QLatin1String("802-11-wireless"))
                          .value(QLatin1String("ssid")).toString();
 }
 
@@ -1168,10 +935,10 @@ QString QNetworkManagerSettingsConnection::getMacAddress()
     NMDeviceType type = getType();
 
     if (type == DEVICE_TYPE_ETHERNET) {
-        return d->settingsMap.value(QLatin1String("802-3-ethernet"))
+        return settingsMap.value(QLatin1String("802-3-ethernet"))
                              .value(QLatin1String("mac-address")).toString();
     } else if (type == DEVICE_TYPE_WIFI) {
-        return d->settingsMap.value(QLatin1String("802-11-wireless"))
+        return settingsMap.value(QLatin1String("802-11-wireless"))
                              .value(QLatin1String("mac-address")).toString();
     } else {
         return QString();
@@ -1181,36 +948,24 @@ QString QNetworkManagerSettingsConnection::getMacAddress()
 QStringList QNetworkManagerSettingsConnection::getSeenBssids()
 {
     if (getType() == DEVICE_TYPE_WIFI) {
-        return d->settingsMap.value(QLatin1String("802-11-wireless"))
+        return settingsMap.value(QLatin1String("802-11-wireless"))
                              .value(QLatin1String("seen-bssids")).toStringList();
     } else {
         return QStringList();
     }
 }
 
-class QNetworkManagerConnectionActivePrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    QString path;
-    bool valid;
-};
-
 QNetworkManagerConnectionActive::QNetworkManagerConnectionActive(const QString &activeConnectionObjectPath, QObject *parent)
-    : QObject(parent)
+    : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE),
+                             activeConnectionObjectPath,
+                             NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
+                             QDBusConnection::systemBus(), parent)
 {
-    d = new QNetworkManagerConnectionActivePrivate();
+    if (!isValid()) {
-    d->path = activeConnectionObjectPath;
-    d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                d->path,
-                                                QLatin1String(NM_DBUS_INTERFACE_ACTIVE_CONNECTION),
-                                                QDBusConnection::systemBus(), parent);
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
-    QDBusInterface connectionActivePropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
+    PropertiesDBusInterface connectionActivePropertiesInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                  d->path,
+                                                  activeConnectionObjectPath,
                                                   QLatin1String("org.freedesktop.DBus.Properties"),
                                                   QDBusConnection::systemBus());
 
@@ -1228,35 +983,14 @@ QNetworkManagerConnectionActive::QNetworkManagerConnectionActive(const QString &
     }
 
     QDBusConnection::systemBus().connect(QLatin1String(NM_DBUS_SERVICE),
-                                  d->path,
+                                  activeConnectionObjectPath,
                                   QLatin1String(NM_DBUS_INTERFACE_ACTIVE_CONNECTION),
                                   QLatin1String("PropertiesChanged"),
                                   this,SLOT(propertiesSwap(QMap<QString,QVariant>)));
-    d->valid = true;
 }
 
 QNetworkManagerConnectionActive::~QNetworkManagerConnectionActive()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerConnectionActive::isValid()
-{
-    return d->valid;
-}
-
-bool QNetworkManagerConnectionActive::setConnections()
-{
-    if (!isValid())
-        return false;
-
-    return true;
-}
-
-QDBusInterface *QNetworkManagerConnectionActive::connectionInterface() const
-{
-    return d->connectionInterface;
 }
 
 QDBusObjectPath QNetworkManagerConnectionActive::connection() const
@@ -1327,44 +1061,24 @@ void QNetworkManagerConnectionActive::propertiesSwap(QMap<QString,QVariant> map)
     }
 }
 
-class QNetworkManagerIp4ConfigPrivate
-{
-public:
-    QDBusInterface *connectionInterface;
-    QString path;
-    bool valid;
-};
-
 QNetworkManagerIp4Config::QNetworkManagerIp4Config( const QString &deviceObjectPath, QObject *parent)
-    : QObject(parent)
+    : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE),
+                             deviceObjectPath,
+                             NM_DBUS_INTERFACE_IP4_CONFIG,
+                             QDBusConnection::systemBus(), parent)
 {
-    d = new QNetworkManagerIp4ConfigPrivate();
+    if (!isValid()) {
-    d->path = deviceObjectPath;
-    d->connectionInterface = new QDBusInterface(QLatin1String(NM_DBUS_SERVICE),
-                                                d->path,
-                                                QLatin1String(NM_DBUS_INTERFACE_IP4_CONFIG),
-                                                QDBusConnection::systemBus(), parent);
-    if (!d->connectionInterface->isValid()) {
-        d->valid = false;
         return;
     }
-    d->valid = true;
 }
 
 QNetworkManagerIp4Config::~QNetworkManagerIp4Config()
 {
-    delete d->connectionInterface;
-    delete d;
-}
-
-bool QNetworkManagerIp4Config::isValid()
-{
-    return d->valid;
 }
 
 QStringList QNetworkManagerIp4Config::domains() const
 {
-    return d->connectionInterface->property("Domains").toStringList();
+    return property("Domains").toStringList();
 }
 
 QT_END_NAMESPACE

src/plugins/bearer/networkmanager/qnetworkmanagerservice.h

@@ -55,6 +55,7 @@
 #include <QtDBus/QDBusPendingCallWatcher>
 #include <QtDBus/QDBusObjectPath>
 #include <QtDBus/QDBusContext>
+#include <QtDBus/QDBusAbstractInterface>
 #include <QMap>
 
 #ifndef QT_NO_DBUS
@@ -128,8 +129,7 @@ Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(ServerThing))
 
 QT_BEGIN_NAMESPACE
 
-class QNetworkManagerInterfacePrivate;
+class QNetworkManagerInterface : public QDBusAbstractInterface
-class QNetworkManagerInterface : public QObject
 {
     Q_OBJECT
 
@@ -151,10 +151,9 @@ public:
 
     QList <QDBusObjectPath> getDevices();
     void activateConnection(QDBusObjectPath connection,QDBusObjectPath device, QDBusObjectPath specificObject);
-    void deactivateConnection(QDBusObjectPath connectionPath) const;
+    void deactivateConnection(QDBusObjectPath connectionPath);
 
     QDBusObjectPath path() const;
-    QDBusInterface *connectionInterface() const;
 
     bool wirelessEnabled() const;
     bool wirelessHardwareEnabled() const;
@@ -162,7 +161,6 @@ public:
     NMState state();
     QString version() const;
     bool setConnections();
-    bool isValid();
 
 Q_SIGNALS:
     void deviceAdded(QDBusObjectPath);
@@ -177,14 +175,12 @@ private Q_SLOTS:
     void propertiesSwap(QMap<QString,QVariant>);
 
 private:
-    QNetworkManagerInterfacePrivate *d;
     QVariantMap propertyMap;
     QList<QDBusObjectPath> devicesPathList;
 
 };
 
-class QNetworkManagerInterfaceAccessPointPrivate;
+class QNetworkManagerInterfaceAccessPoint : public QDBusAbstractInterface
-class QNetworkManagerInterfaceAccessPoint : public QObject
 {
     Q_OBJECT
 
@@ -229,8 +225,6 @@ public:
     explicit QNetworkManagerInterfaceAccessPoint(const QString &dbusPathName, QObject *parent = 0);
     ~QNetworkManagerInterfaceAccessPoint();
 
-    QDBusInterface *connectionInterface() const;
-
     quint32 flags() const;
     quint32 wpaFlags() const;
     quint32 rsnFlags() const;
@@ -240,8 +234,7 @@ public:
     quint32 mode() const;
     quint32 maxBitrate() const;
     quint32 strength() const;
-    bool setConnections();
+  //  bool setConnections();
-    bool isValid();
 
 Q_SIGNALS:
     void propertiesChanged(QMap <QString,QVariant>);
@@ -251,12 +244,10 @@ private Q_SLOTS:
     void propertiesSwap(QMap<QString,QVariant>);
 
 private:
-    QNetworkManagerInterfaceAccessPointPrivate *d;
     QVariantMap propertyMap;
 };
 
-class QNetworkManagerInterfaceDevicePrivate;
+class QNetworkManagerInterfaceDevice : public QDBusAbstractInterface
-class QNetworkManagerInterfaceDevice : public QObject
 {
     Q_OBJECT
 
@@ -267,14 +258,11 @@ public:
 
     QString udi() const;
     QString networkInterface() const;
-    QDBusInterface *connectionInterface() const;
     quint32 ip4Address() const;
     quint32 state() const;
     quint32 deviceType() const;
 
     QDBusObjectPath ip4config() const;
-    bool setConnections();
-    bool isValid();
 
 Q_SIGNALS:
     void stateChanged(const QString &, quint32);
@@ -284,12 +272,10 @@ Q_SIGNALS:
 private Q_SLOTS:
     void propertiesSwap(QMap<QString,QVariant>);
 private:
-    QNetworkManagerInterfaceDevicePrivate *d;
     QVariantMap propertyMap;
 };
 
-class QNetworkManagerInterfaceDeviceWiredPrivate;
+class QNetworkManagerInterfaceDeviceWired : public QDBusAbstractInterface
-class QNetworkManagerInterfaceDeviceWired : public QObject
 {
     Q_OBJECT
 
@@ -299,12 +285,9 @@ public:
                                                  QObject *parent = 0);
     ~QNetworkManagerInterfaceDeviceWired();
 
-    QDBusInterface  *connectionInterface() const;
     QString hwAddress() const;
     quint32 speed() const;
     bool carrier() const;
-    bool setConnections();
-    bool isValid();
     QStringList availableConnections();
 
 Q_SIGNALS:
@@ -316,12 +299,10 @@ private Q_SLOTS:
     void propertiesSwap(QMap<QString,QVariant>);
 
 private:
-    QNetworkManagerInterfaceDeviceWiredPrivate *d;
     QVariantMap propertyMap;
 };
 
-class QNetworkManagerInterfaceDeviceWirelessPrivate;
+class QNetworkManagerInterfaceDeviceWireless : public QDBusAbstractInterface
-class QNetworkManagerInterfaceDeviceWireless : public QObject
 {
     Q_OBJECT
 
@@ -343,7 +324,6 @@ public:
 
     QDBusObjectPath path() const;
     QList <QDBusObjectPath> getAccessPoints();
-    QDBusInterface *connectionInterface() const;
 
     QString hwAddress() const;
     quint32 mode() const;
@@ -351,7 +331,6 @@ public:
     QDBusObjectPath activeAccessPoint() const;
     quint32 wirelessCapabilities() const;
     bool setConnections();
-    bool isValid();
 
     void requestScan();
 Q_SIGNALS:
@@ -372,13 +351,12 @@ private Q_SLOTS:
     void accessPointsFinished(QDBusPendingCallWatcher *watcher);
 
 private:
-    QNetworkManagerInterfaceDeviceWirelessPrivate *d;
     QVariantMap propertyMap;
     QList <QDBusObjectPath> accessPointsList;
+    QString interfacePath;
 };
 
-class QNetworkManagerInterfaceDeviceModemPrivate;
+class QNetworkManagerInterfaceDeviceModem : public QDBusAbstractInterface
-class QNetworkManagerInterfaceDeviceModem : public QObject
 {
     Q_OBJECT
 
@@ -397,12 +375,6 @@ public:
                                                     QObject *parent = 0);
     ~QNetworkManagerInterfaceDeviceModem();
 
-    QDBusObjectPath path() const;
-    QDBusInterface *connectionInterface() const;
-
-    bool setConnections();
-    bool isValid();
-
     ModemCapabilities modemCapabilities() const;
     ModemCapabilities currentCapabilities() const;
 
@@ -414,14 +386,12 @@ private Q_SLOTS:
     void propertiesSwap(QMap<QString,QVariant>);
 
 private:
-    QNetworkManagerInterfaceDeviceModemPrivate *d;
     QVariantMap propertyMap;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkManagerInterfaceDeviceModem::ModemCapabilities)
 
-class QNetworkManagerSettingsPrivate;
+class QNetworkManagerSettings : public QDBusAbstractInterface
-class QNetworkManagerSettings : public QObject
 {
     Q_OBJECT
 
@@ -430,22 +400,19 @@ public:
     explicit QNetworkManagerSettings(const QString &settingsService, QObject *parent = 0);
     ~QNetworkManagerSettings();
 
-    QDBusInterface  *connectionInterface() const;
     QList <QDBusObjectPath> listConnections();
     QString getConnectionByUuid(const QString &uuid);
     bool setConnections();
-    bool isValid();
 
 Q_SIGNALS:
     void newConnection(QDBusObjectPath);
     void connectionsListReady();
 private:
-    QNetworkManagerSettingsPrivate *d;
     QList <QDBusObjectPath> connectionsList;
+    QString interfacePath;
 };
 
-class QNetworkManagerSettingsConnectionPrivate;
+class QNetworkManagerSettingsConnection : public QDBusAbstractInterface
-class QNetworkManagerSettingsConnection : public QObject
 {
     Q_OBJECT
 
@@ -454,7 +421,6 @@ public:
     QNetworkManagerSettingsConnection(const QString &settingsService, const QString &connectionObjectPath, QObject *parent = 0);
     ~QNetworkManagerSettingsConnection();
 
-    QDBusInterface  *connectionInterface() const;
     QNmSettingsMap getSettings();
     bool setConnections();
     NMDeviceType getType();
@@ -465,7 +431,6 @@ public:
     QString getSsid();
     QString getMacAddress();
     QStringList getSeenBssids();
-    bool isValid();
 
 Q_SIGNALS:
     void updated();
@@ -474,13 +439,12 @@ Q_SIGNALS:
 
 private Q_SLOTS:
     void slotSettingsRemoved();
-
 private:
-    QNetworkManagerSettingsConnectionPrivate *d;
+    QNmSettingsMap settingsMap;
+    QString interfacepath;
 };
 
-class QNetworkManagerConnectionActivePrivate;
+class QNetworkManagerConnectionActive : public QDBusAbstractInterface
-class QNetworkManagerConnectionActive : public QObject
 {
     Q_OBJECT
 
@@ -495,15 +459,12 @@ public:
     explicit QNetworkManagerConnectionActive(const QString &dbusPathName, QObject *parent = 0);
     ~ QNetworkManagerConnectionActive();
 
-    QDBusInterface  *connectionInterface() const;
     QDBusObjectPath connection() const;
     QDBusObjectPath specificObject() const;
     QStringList devices() const;
     quint32 state() const;
     bool defaultRoute() const;
     bool default6Route() const;
-    bool setConnections();
-    bool isValid();
 
 
 Q_SIGNALS:
@@ -514,12 +475,10 @@ private Q_SLOTS:
     void propertiesSwap(QMap<QString,QVariant>);
 
 private:
-    QNetworkManagerConnectionActivePrivate *d;
     QVariantMap propertyMap;
 };
 
-class QNetworkManagerIp4ConfigPrivate;
+class QNetworkManagerIp4Config : public QDBusAbstractInterface
-class QNetworkManagerIp4Config : public QObject
 {
     Q_OBJECT
 
@@ -528,10 +487,17 @@ public:
     ~QNetworkManagerIp4Config();
 
     QStringList domains() const;
-    bool isValid();
+};
 
- private:
+class PropertiesDBusInterface : public QDBusAbstractInterface
-    QNetworkManagerIp4ConfigPrivate *d;
+{
+public:
+    PropertiesDBusInterface(const QString &service, const QString &path,
+                            const QString &interface, const QDBusConnection &connection,
+                            QObject *parent = 0)
+        : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)
+    {}
+    ~PropertiesDBusInterface() = default;
 };
 
 QT_END_NAMESPACE