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

[Manuel de la Peña]

Remove the pimpl pattern from the ProcessFactory.

Remove the pimpl pattern from the ProcessFactory.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'libubuntudownloadmanager/system/process_factory.cpp'
--- libubuntudownloadmanager/system/process_factory.cpp	2013-10-29 13:42:44 +0000
+++ libubuntudownloadmanager/system/process_factory.cpp	2013-11-14 16:15:05 +0000
@@ -24,46 +24,15 @@
 
 namespace System {
 
-/*
- * PRIVATE IMPLEMENTATION
- */
-
-class ProcessFactoryPrivate {
-    Q_DECLARE_PUBLIC(ProcessFactory)
- public:
-    explicit ProcessFactoryPrivate(ProcessFactory* parent);
-
-    Process* createProcess();
-
- private:
-    ProcessFactory* q_ptr;
-};
-
-
-ProcessFactoryPrivate::ProcessFactoryPrivate(ProcessFactory* parent)
-    : q_ptr(parent) {
+ProcessFactory::ProcessFactory(QObject* parent)
+    : QObject(parent) {
 }
 
 Process*
-ProcessFactoryPrivate::createProcess() {
+ProcessFactory::createProcess() {
     return new Process();
 }
 
-/*
- * PUBLIC IMPLEMENTATION
- */
-
-ProcessFactory::ProcessFactory(QObject *parent)
-    : QObject(parent),
-      d_ptr(new ProcessFactoryPrivate(this)) {
-}
-
-Process*
-ProcessFactory::createProcess() {
-    Q_D(ProcessFactory);
-    return d->createProcess();
-}
-
 }  // System
 
 }  // DownloadManager

=== modified file 'libubuntudownloadmanager/system/process_factory.h'
--- libubuntudownloadmanager/system/process_factory.h	2013-10-29 13:42:44 +0000
+++ libubuntudownloadmanager/system/process_factory.h	2013-11-14 16:15:05 +0000
@@ -28,19 +28,13 @@
 
 namespace System {
 
-class ProcessFactoryPrivate;
 class ProcessFactory : public QObject {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(ProcessFactory)
 
  public:
     explicit ProcessFactory(QObject *parent = 0);
 
     virtual Process* createProcess();
-
- private:
-    // use pimpl so that we can mantains ABI compatibility
-    ProcessFactoryPrivate* d_ptr;
 };
 
 }  // System