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

[Manuel de la Peña]

Remove pimpl pattern from the Process class.

Remove pimpl pattern from the Process class.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[Manuel de la Peña (mandel)]

Re-approve because it is an error from Jenkins.

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

[Manuel de la Peña (mandel)]

Re-approve because is an issue with Jenkins.

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

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

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

Fixed merge issues.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'libubuntudownloadmanager/system/process.cpp'
--- libubuntudownloadmanager/system/process.cpp	2013-11-12 11:27:26 +0000
+++ libubuntudownloadmanager/system/process.cpp	2013-11-19 10:35:46 +0000
@@ -26,93 +26,49 @@
 
 namespace System {
 
-/*
- * PRIVATE IMPLEMENTATION
- */
-
-class ProcessPrivate {
-    Q_DECLARE_PUBLIC(Process)
-
- public:
-    explicit ProcessPrivate(Process* parent);
-    ~ProcessPrivate();
-
-    void start(const QString& program,
-               const QStringList& arguments,
-               QProcess::OpenMode mode = QProcess::ReadWrite);
-
-    void onReadyReadStandardError();
-    void onReadyReadStandardOutput();
-
- private:
-    QProcess* _process;
-    Process* q_ptr;
-};
-
-ProcessPrivate::ProcessPrivate(Process* parent)
-    : q_ptr(parent) {
-    Q_Q(Process);
-    _process = new QProcess();
+
+Process::Process(QObject* parent)
+    : QObject(parent) {
+    _process = new QProcess(this);
     _process->setProcessChannelMode(QProcess::SeparateChannels);
 
     // connect so that we foward the signals
-    q->connect(_process, SIGNAL(finished(int, QProcess::ExitStatus)),
-        q, SIGNAL(finished(int, QProcess::ExitStatus)));
-    q->connect(_process, SIGNAL(error(QProcess::ProcessError)),
-        q, SIGNAL(error(QProcess::ProcessError)));
+    connect(_process, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>
+        (&QProcess::finished),
+            this, &Process::finished);
+    connect(_process, static_cast<void(QProcess::*)(QProcess::ProcessError)>
+            (&QProcess::error),
+                this, &Process::error);
 
     // connect so that we can log the stdout and stderr of the process
-    q->connect(_process, SIGNAL(readyReadStandardError()),
-        q, SLOT(onReadyReadStandardError()));
-    q->connect(_process, SIGNAL(readyReadStandardOutput()),
-        q, SLOT(onReadyReadStandardOutput()));
-}
-
-ProcessPrivate::~ProcessPrivate() {
-    delete _process;
+    connect(_process, &QProcess::readyReadStandardError,
+        this, &Process::onReadyReadStandardError);
+    connect(_process, &QProcess::readyReadStandardOutput,
+        this, &Process::onReadyReadStandardOutput);
 }
 
 void
-ProcessPrivate::start(const QString& program,
-                      const QStringList& arguments,
-                      QProcess::OpenMode mode) {
+Process::start(const QString& program,
+               const QStringList& arguments,
+               QProcess::OpenMode mode) {
     qDebug() << __FUNCTION__ << program << arguments << mode;
     _process->start(program, arguments, mode);
 }
 
 void
-ProcessPrivate::onReadyReadStandardError() {
+Process::onReadyReadStandardError() {
     // use qCritical this is important stuff
     qCritical() << QString(_process->readAllStandardError());
 }
 
 void
-ProcessPrivate::onReadyReadStandardOutput() {
+Process::onReadyReadStandardOutput() {
     // use qDebug
     qDebug() << QString(_process->readAllStandardOutput());
 }
 
-/*
- * PUBLIC IMPLEMENTATION
- */
-
-Process::Process(QObject *parent)
-    : QObject(parent),
-      d_ptr(new ProcessPrivate(this)) {
-}
-
-void
-Process::start(const QString& program,
-                    const QStringList& arguments,
-                    QProcess::OpenMode mode) {
-    Q_D(Process);
-    d->start(program, arguments, mode);
-}
-
 }  // System
 
 }  // DownloadManager
 
 }  // Ubuntu
-
-#include "moc_process.cpp"

=== modified file 'libubuntudownloadmanager/system/process.h'
--- libubuntudownloadmanager/system/process.h	2013-10-29 13:42:44 +0000
+++ libubuntudownloadmanager/system/process.h	2013-11-19 10:35:46 +0000
@@ -28,10 +28,8 @@
 
 namespace System {
 
-class ProcessPrivate;
 class Process : public QObject {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(Process)
 
  public:
     explicit Process(QObject *parent = 0);
@@ -45,12 +43,11 @@
     void finished(int exitCode, QProcess::ExitStatus exitStatus);
 
  private:
-    Q_PRIVATE_SLOT(d_func(), void onReadyReadStandardError())
-    Q_PRIVATE_SLOT(d_func(), void onReadyReadStandardOutput())
+    void onReadyReadStandardError();
+    void onReadyReadStandardOutput();
 
  private:
-    // use pimpl so that we can mantains ABI compatibility
-    ProcessPrivate* d_ptr;
+    QProcess* _process;
 };
 
 }  // System