Merge lp:~mandel/ubuntu-download-manager/remove-network-info-pimpl into lp:ubuntu-download-manager

[Manuel de la Peña]

Remove the pimpl patter from the system network info. Because pimpl is out we can use the new signal connection.

Remove the pimpl patter from the system network info. Because pimpl is out we can use the new signal connection.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:172
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/216/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/105

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/216/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-autolanding/79/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-autolanding/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-autolanding/24/console

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/remove-network-info-pimpl]

173. By Manuel de la Peña on 2013-11-17

Fixed merge issues.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:173
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/230/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/119

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/230/rebuild

review: Approve (continuous-integration)

=== modified file 'libubuntudownloadmanager/system/system_network_info.cpp'
--- libubuntudownloadmanager/system/system_network_info.cpp	2013-11-12 11:27:26 +0000
+++ libubuntudownloadmanager/system/system_network_info.cpp	2013-11-17 14:28:30 +0000
@@ -28,196 +28,154 @@
 
 namespace System {
 
-/*
- * PRIVATE IMPLEMENTATION
- */
-
-class SystemNetworkInfoPrivate {
-    Q_DECLARE_PUBLIC(SystemNetworkInfo)
-
- public:
-    explicit SystemNetworkInfoPrivate(SystemNetworkInfo* parent)
-        : q_ptr(parent) {
-        Q_Q(SystemNetworkInfo);
-        _info = new QNetworkInfo();
-        _configMan = new QNetworkConfigurationManager();
+SystemNetworkInfo::SystemNetworkInfo(QObject* parent)
+    : QObject(parent) {
+    _info = new QNetworkInfo(this);
+    _configMan = new QNetworkConfigurationManager(this);
 
 #ifdef DEBUG
-        // in debug do log the changes else just fwd them
-        q->connect(_info, SIGNAL(cellIdChanged(int, const QString&)), q,
-            SLOT(onCellIdChanged(int, const QString&)));
-        q->connect(_info, SIGNAL(currentCellDataTechnologyChanged(int, QNetworkInfo::CellDataTechnology)), q,
-            SLOT(onCurrentCellDataTechnologyChanged(int, QNetworkInfo::CellDataTechnology)));
-        q->connect(_info, SIGNAL(currentMobileCountryCodeChanged(int, const QString&)), q,
-            SLOT(onCurrentMobileCountryCodeChanged(int, const QString&)));
-        q->connect(_info, SIGNAL(currentMobileNetworkCodeChanged(int, const QString&)), q,
-            SLOT(onCurrentMobileNetworkCodeChanged(int, const QString&)));
-        q->connect(_info, SIGNAL(currentNetworkModeChanged(QNetworkInfo::NetworkMode)), q,
-            SLOT(onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode)));
-        q->connect(_info, SIGNAL(locationAreaCodeChanged(int, const QString&)), q,
-            SLOT(onLocationAreaCodeChanged(int, const QString&)));
-        q->connect(_info, SIGNAL(networkInterfaceCountChanged(QNetworkInfo::NetworkMode, int)), q,
-            SLOT(onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode, int)));
-        q->connect(_info, SIGNAL(networkNameChanged(QNetworkInfo::NetworkMode, int, const QString&)), q,
-            SLOT(onNetworkNameChanged(QNetworkInfo::NetworkMode, int, const QString&)));
-        q->connect(_info, SIGNAL(networkSignalStrengthChanged(QNetworkInfo::NetworkMode, int, int)), q,
-            SLOT(onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode, int, int)));
-        q->connect(_info, SIGNAL(networkStatusChanged(QNetworkInfo::NetworkMode, int, QNetworkInfo::NetworkStatus)), q,
-            SLOT(onNetworkStatusChanged(QNetworkInfo::NetworkMode, int, QNetworkInfo::NetworkStatus)));
+    // in debug do log the changes else just fwd them
+    connect(_info, &QNetworkInfo::cellIdChanged, this,
+        &SystemNetworkInfo::onCellIdChanged);
+    connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged, this,
+        &SystemNetworkInfo::onCurrentCellDataTechnologyChanged);
+    connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, this,
+        &SystemNetworkInfo::onCurrentMobileCountryCodeChanged);
+    connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, this,
+        &SystemNetworkInfo::onCurrentMobileNetworkCodeChanged);
+    connect(_info, &QNetworkInfo::currentNetworkModeChanged, this,
+        &SystemNetworkInfo::onCurrentNetworkModeChanged);
+    connect(_info, &QNetworkInfo::locationAreaCodeChanged, this,
+        &SystemNetworkInfo::onLocationAreaCodeChanged);
+    connect(_info, &QNetworkInfo::networkInterfaceCountChanged, this,
+        &SystemNetworkInfo::onNetworkInterfaceCountChanged);
+    connect(_info, &QNetworkInfo::networkNameChanged, this,
+        &SystemNetworkInfo::onNetworkNameChanged);
+    connect(_info, &QNetworkInfo::networkSignalStrengthChanged, this,
+        &SystemNetworkInfo::onNetworkSignalStrengthChanged);
+    connect(_info, &QNetworkInfo::networkStatusChanged, this,
+        &SystemNetworkInfo::onNetworkStatusChanged);
 
-        q->connect(_configMan,
-            SIGNAL(onlineStateChanged(bool)), q,
-            SLOT(onOnlineStateChanged(bool)));
+    connect(_configMan,
+        &QNetworkConfigurationManager::onlineStateChanged, this,
+        &SystemNetworkInfo::onOnlineStateChanged);
 #else
-        // connect to interesting signals
-        q->connect(_info, &QNetworkInfo::cellIdChanged, q,
-            &SystemNetworkInfo::cellIdChanged);
-        q->connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged, q,
-            &SystemNetworkInfo::currentCellDataTechnologyChanged);
-        q->connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, q,
-            &SystemNetworkInfo::currentMobileCountryCodeChanged);
-        q->connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, q,
-            &SystemNetworkInfo::currentMobileNetworkCodeChanged);
-        q->connect(_info, &QNetworkInfo::currentNetworkModeChanged, q,
-            &SystemNetworkInfo::currentNetworkModeChanged);
-        q->connect(_info, &QNetworkInfo::locationAreaCodeChanged, q,
-            &SystemNetworkInfo::locationAreaCodeChanged);
-        q->connect(_info, &QNetworkInfo::networkInterfaceCountChanged, q,
-            &SystemNetworkInfo::networkInterfaceCountChanged);
-        q->connect(_info, &QNetworkInfo::networkNameChanged, q,
-            &SystemNetworkInfo::networkNameChanged);
-        q->connect(_info, &QNetworkInfo::networkSignalStrengthChanged, q,
-            &SystemNetworkInfo::networkSignalStrengthChanged);
-        q->connect(_info, &QNetworkInfo::networkStatusChanged, q,
-            &SystemNetworkInfo::networkStatusChanged);
-
-        q->connect(_configMan,
-            &QNetworkConfigurationManager::onlineStateChanged, q,
-            &SystemNetworkInfo::onlineStateChanged);
-#endif
-
-    }
-
-    ~SystemNetworkInfoPrivate() {
-        delete _info;
-        delete _configMan;
-    }
-
-    QNetworkInfo::NetworkMode currentNetworkMode() {
-        return _info->currentNetworkMode();
-    }
-
-    bool isOnline() {
-        return _configMan->isOnline();
-    }
-
-    void onOnlineStateChanged(bool online) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << online;
-        emit q->onlineStateChanged(online);
-    }
-
-#if DEBUG
-
-    void onCellIdChanged(int interface, const QString& id) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << interface << id;
-        emit q->cellIdChanged(interface, id);
-    }
-
-    void onCurrentCellDataTechnologyChanged(int interface,
-                                    QNetworkInfo::CellDataTechnology tech) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << interface << tech;
-        emit q->currentCellDataTechnologyChanged(interface, tech);
-    }
-
-    void onCurrentMobileCountryCodeChanged(int interface, const QString& mcc) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << interface << mcc;
-        emit q->currentMobileCountryCodeChanged(interface, mcc);
-    }
-
-    void onCurrentMobileNetworkCodeChanged(int interface, const QString& mnc) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << interface << mnc;
-        emit q->currentMobileNetworkCodeChanged(interface, mnc);
-    }
-
-    void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << mode;
-        emit q->currentNetworkModeChanged(mode);
-    }
-
-    void onLocationAreaCodeChanged(int interface, const QString& lac) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << interface << lac;
-        emit q->locationAreaCodeChanged(interface, lac);
-    }
-
-    void onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode mode,
-                                        int count) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << mode << count;
-        emit q->networkInterfaceCountChanged(mode, count);
-    }
-
-    void onNetworkNameChanged(QNetworkInfo::NetworkMode mode, int interface,
-                              const QString& name) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << mode << interface << name;
-        emit q->networkNameChanged(mode, interface, name);
-    }
-
-    void onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode mode,
-                                        int interface, int strength) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << mode << interface << strength;
-        emit q->networkSignalStrengthChanged(mode, interface, strength);
-    }
-
-    void onNetworkStatusChanged(QNetworkInfo::NetworkMode mode, int interface,
-                                QNetworkInfo::NetworkStatus status) {
-        Q_Q(SystemNetworkInfo);
-        TRACE << mode << interface << status;
-        emit q->networkStatusChanged(mode, interface, status);
-    }
-
-#endif
-
- private:
-    QNetworkInfo* _info;
-    QNetworkConfigurationManager* _configMan;
-    SystemNetworkInfo* q_ptr;
-};
-
-
-/*
- * PUBLIC IMPLEMENTATION
- */
-
-SystemNetworkInfo::SystemNetworkInfo(QObject *parent)
-    : QObject(parent),
-      d_ptr(new SystemNetworkInfoPrivate(this)) {
+    // connect to interesting signals
+    connect(_info, &QNetworkInfo::cellIdChanged, q,
+        &SystemNetworkInfo::cellIdChanged);
+    connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged, q,
+        &SystemNetworkInfo::currentCellDataTechnologyChanged);
+    connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, q,
+        &SystemNetworkInfo::currentMobileCountryCodeChanged);
+    connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, q,
+        &SystemNetworkInfo::currentMobileNetworkCodeChanged);
+    connect(_info, &QNetworkInfo::currentNetworkModeChanged, q,
+        &SystemNetworkInfo::currentNetworkModeChanged);
+    connect(_info, &QNetworkInfo::locationAreaCodeChanged, q,
+        &SystemNetworkInfo::locationAreaCodeChanged);
+    connect(_info, &QNetworkInfo::networkInterfaceCountChanged, q,
+        &SystemNetworkInfo::networkInterfaceCountChanged);
+    connect(_info, &QNetworkInfo::networkNameChanged, q,
+        &SystemNetworkInfo::networkNameChanged);
+    connect(_info, &QNetworkInfo::networkSignalStrengthChanged, q,
+        &SystemNetworkInfo::networkSignalStrengthChanged);
+    connect(_info, &QNetworkInfo::networkStatusChanged, q,
+        &SystemNetworkInfo::networkStatusChanged);
+
+    connect(_configMan,
+        &QNetworkConfigurationManager::onlineStateChanged, q,
+        &SystemNetworkInfo::onlineStateChanged);
+#endif
+
 }
 
 QNetworkInfo::NetworkMode
 SystemNetworkInfo::currentNetworkMode() {
-    Q_D(SystemNetworkInfo);
-    return d->currentNetworkMode();
+    return _info->currentNetworkMode();
 }
 
 bool
 SystemNetworkInfo::isOnline() {
-    Q_D(SystemNetworkInfo);
-    return d->isOnline();
-}
+    return _configMan->isOnline();
+}
+
+void
+SystemNetworkInfo::onOnlineStateChanged(bool online) {
+    TRACE << online;
+    emit onlineStateChanged(online);
+}
+
+#if DEBUG
+
+void
+SystemNetworkInfo::onCellIdChanged(int interface, const QString& id) {
+    TRACE << interface << id;
+    emit cellIdChanged(interface, id);
+}
+
+void
+SystemNetworkInfo::onCurrentCellDataTechnologyChanged(int interface,
+                                QNetworkInfo::CellDataTechnology tech) {
+    TRACE << interface << tech;
+    emit currentCellDataTechnologyChanged(interface, tech);
+}
+
+void
+SystemNetworkInfo::onCurrentMobileCountryCodeChanged(int interface, const QString& mcc) {
+    TRACE << interface << mcc;
+    emit currentMobileCountryCodeChanged(interface, mcc);
+}
+
+void
+SystemNetworkInfo::onCurrentMobileNetworkCodeChanged(int interface, const QString& mnc) {
+    TRACE << interface << mnc;
+    emit currentMobileNetworkCodeChanged(interface, mnc);
+}
+
+void
+SystemNetworkInfo::onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode) {
+    TRACE << mode;
+    emit currentNetworkModeChanged(mode);
+}
+
+void
+SystemNetworkInfo::onLocationAreaCodeChanged(int interface, const QString& lac) {
+    TRACE << interface << lac;
+    emit locationAreaCodeChanged(interface, lac);
+}
+
+void
+SystemNetworkInfo::onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode mode,
+                                                  int count) {
+    TRACE << mode << count;
+    emit networkInterfaceCountChanged(mode, count);
+}
+
+void
+SystemNetworkInfo::onNetworkNameChanged(QNetworkInfo::NetworkMode mode, int interface,
+                                        const QString& name) {
+    TRACE << mode << interface << name;
+    emit networkNameChanged(mode, interface, name);
+}
+
+void
+SystemNetworkInfo::onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode mode,
+                                                  int interface, int strength) {
+    TRACE << mode << interface << strength;
+    emit networkSignalStrengthChanged(mode, interface, strength);
+}
+
+void
+SystemNetworkInfo::onNetworkStatusChanged(QNetworkInfo::NetworkMode mode, int interface,
+                                          QNetworkInfo::NetworkStatus status) {
+    TRACE << mode << interface << status;
+    emit networkStatusChanged(mode, interface, status);
+}
+
+#endif
 
 }  // System
 
 }  // DownloadManager
 
 }  // Ubuntu
-
-#include "moc_system_network_info.cpp"

=== modified file 'libubuntudownloadmanager/system/system_network_info.h'
--- libubuntudownloadmanager/system/system_network_info.h	2013-10-29 13:42:44 +0000
+++ libubuntudownloadmanager/system/system_network_info.h	2013-11-17 14:28:30 +0000
@@ -20,6 +20,7 @@
 #define DOWNLOADER_LIB_SYSTEM_NETWORK_INFO_H
 
 #include <QNetworkAccessManager>
+#include <QNetworkConfigurationManager>
 #include <QNetworkInfo>
 #include <QObject>
 
@@ -29,10 +30,8 @@
 
 namespace System {
 
-class SystemNetworkInfoPrivate;
 class SystemNetworkInfo : public QObject {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(SystemNetworkInfo)
 
  public:
     explicit SystemNetworkInfo(QObject *parent = 0);
@@ -58,36 +57,27 @@
     void onlineStateChanged(bool online);
 
  private:
-    Q_PRIVATE_SLOT(d_func(), void onOnlineStateChanged(bool))
+    void onOnlineStateChanged(bool);
 
 #if DEBUG
     // track the changes so that we get some debug info, else we will just fwd the signals
-    Q_PRIVATE_SLOT(d_func(),
-        void onCellIdChanged(int, const QString&))
-    Q_PRIVATE_SLOT(d_func(),
-        void onCurrentCellDataTechnologyChanged(int,
-                                              QNetworkInfo::CellDataTechnology))
-    Q_PRIVATE_SLOT(d_func(),
-        void onCurrentMobileCountryCodeChanged(int, const QString&))
-    Q_PRIVATE_SLOT(d_func(),
-        void onCurrentMobileNetworkCodeChanged(int, const QString&))
-    Q_PRIVATE_SLOT(d_func(),
-        void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode))
-    Q_PRIVATE_SLOT(d_func(),
-        void onLocationAreaCodeChanged(int, const QString&))
-    Q_PRIVATE_SLOT(d_func(),
-        void onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode, int))
-    Q_PRIVATE_SLOT(d_func(),
-        void onNetworkNameChanged(QNetworkInfo::NetworkMode, int, const QString&))
-    Q_PRIVATE_SLOT(d_func(),
-        void onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode, int, int))
-    Q_PRIVATE_SLOT(d_func(),
-        void onNetworkStatusChanged(QNetworkInfo::NetworkMode, int,
-                                  QNetworkInfo::NetworkStatus))
+    void onCellIdChanged(int, const QString&);
+    void onCurrentCellDataTechnologyChanged(int,
+        QNetworkInfo::CellDataTechnology);
+    void onCurrentMobileCountryCodeChanged(int, const QString&);
+    void onCurrentMobileNetworkCodeChanged(int, const QString&);
+    void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode);
+    void onLocationAreaCodeChanged(int, const QString&);
+    void onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode, int);
+    void onNetworkNameChanged(QNetworkInfo::NetworkMode, int, const QString&);
+    void onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode, int, int);
+    void onNetworkStatusChanged(QNetworkInfo::NetworkMode, int,
+        QNetworkInfo::NetworkStatus);
 #endif
 
  private:
-    SystemNetworkInfoPrivate* d_ptr;
+    QNetworkInfo* _info;
+    QNetworkConfigurationManager* _configMan;
 };
 
 }  // System