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

[Manuel de la Peña]

Remove the not needed pimpl pattern from the DBusConnection class.

Remove the not needed pimpl pattern from the DBusConnection class.

[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/213/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/102

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

review: Approve (continuous-integration)

=== modified file 'libubuntudownloadmanager/system/dbus_connection.cpp'
--- libubuntudownloadmanager/system/dbus_connection.cpp	2013-10-29 13:42:44 +0000
+++ libubuntudownloadmanager/system/dbus_connection.cpp	2013-11-13 20:44:29 +0000
@@ -24,79 +24,32 @@
 
 namespace System {
 
-/*
- * PRIVATE IMPLEMENTATION
- */
-
-
-class DBusConnectionPrivate {
-    Q_DECLARE_PUBLIC(DBusConnection)
- public:
-    DBusConnectionPrivate(DBusConnection* parent)
-        : _conn(QDBusConnection::connectToBus(QDBusConnection::ActivationBus, "DBUS")),
-         q_ptr(parent) {
-    }
-
-    bool registerService(const QString& serviceName) {
-        return _conn.registerService(serviceName);
-    }
-
-    bool registerObject(const QString& path,
-                        QObject* object,
-                        QDBusConnection::RegisterOptions options =
-                            QDBusConnection::ExportAdaptors) {
-        return _conn.registerObject(path, object, options);
-    }
-
-    void unregisterObject(const QString& path,
-                          QDBusConnection::UnregisterMode mode =
-                              QDBusConnection::UnregisterNode) {
-        return _conn.unregisterObject(path, mode);
-    }
-
-    QDBusConnection connection() {
-        return _conn;
-    }
-
- private:
-    QDBusConnection _conn;
-    DBusConnection* q_ptr;
-};
-
-/*
- * PUBLIC IMPLEMENTATION
- */
-
-DBusConnection::DBusConnection(QObject *parent)
+DBusConnection::DBusConnection(QObject* parent)
     : QObject(parent),
-      d_ptr(new DBusConnectionPrivate(this)) {
+     _conn(QDBusConnection::connectToBus(QDBusConnection::ActivationBus, "DBUS")) {
 }
 
 bool
 DBusConnection::registerService(const QString& serviceName) {
-    Q_D(DBusConnection);
-    return d->registerService(serviceName);
+    return _conn.registerService(serviceName);
 }
 
 bool
 DBusConnection::registerObject(const QString& path,
-		               QObject* object,
-                               QDBusConnection::RegisterOptions options) {
-    Q_D(DBusConnection);
-    return d->registerObject(path, object, options);
+                    QObject* object,
+                    QDBusConnection::RegisterOptions options) {
+    return _conn.registerObject(path, object, options);
 }
 
 void
 DBusConnection::unregisterObject(const QString& path,
-                                 QDBusConnection::UnregisterMode mode) {
-    Q_D(DBusConnection);
-    d->unregisterObject(path, mode);
+                      QDBusConnection::UnregisterMode mode) {
+    return _conn.unregisterObject(path, mode);
 }
 
 QDBusConnection
 DBusConnection::connection() {
-    Q_D(DBusConnection);
-    return d->connection();
+    return _conn;
 }
 
 }  // System

=== modified file 'libubuntudownloadmanager/system/dbus_connection.h'
--- libubuntudownloadmanager/system/dbus_connection.h	2013-10-29 13:42:44 +0000
+++ libubuntudownloadmanager/system/dbus_connection.h	2013-11-13 20:44:29 +0000
@@ -28,10 +28,8 @@
 
 namespace System {
 
-class DBusConnectionPrivate;
 class DBusConnection : public QObject {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(DBusConnection)
  public:
     explicit DBusConnection(QObject *parent = 0);
 
@@ -43,7 +41,7 @@
     virtual QDBusConnection connection();
 
  private:
-    DBusConnectionPrivate* d_ptr;
+    QDBusConnection _conn;
 };
 
 }  // System