ubuntu-download-manager

Merge lp:~mandel/ubuntu-download-manager/apparmor-pointer into lp:ubuntu-download-manager

  1. apparmor-pointer
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 207
Merged at revision: 204
Proposed branch: lp:~mandel/ubuntu-download-manager/apparmor-pointer
Merge into: lp:ubuntu-download-manager
Prerequisite: lp:~mandel/ubuntu-download-manager/process-factory-pointer
Diff against target: 186 lines (+21/-25)
9 files modified
libubuntudownloadmanager/downloads/factory.cpp (+1/-1)
libubuntudownloadmanager/downloads/factory.h (+2/-3)
libubuntudownloadmanager/downloads/manager.cpp (+1/-1)
libubuntudownloadmanager/downloads/manager.h (+1/-1)
ubuntu-download-manager-tests/downloads/test_download_factory.cpp (+1/-2)
ubuntu-download-manager-tests/downloads/test_download_manager.cpp (+11/-12)
ubuntu-download-manager-tests/downloads/test_group_download.cpp (+1/-2)
ubuntu-download-manager-tests/fakes/fake_download_factory.cpp (+1/-1)
ubuntu-download-manager-tests/fakes/fake_download_factory.h (+2/-2)
To merge this branch: bzr merge lp:~mandel/ubuntu-download-manager/apparmor-pointer
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) Approve
Michał Karnicki (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+199259@code.launchpad.net

Commit message

Stop using the shared pointer to move to a pointer so that we manage memory better and we have no mem leaks.

Description of the change

Stop using the shared pointer to move to a pointer so that we manage memory better and we have no mem leaks.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Michał Karnicki (karni) :
review: Approve
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
lp:~mandel/ubuntu-download-manager/apparmor-pointer updated
208. By Manuel de la Peña

Merged process-factory-pointer into apparmor-pointer.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntudownloadmanager/downloads/factory.cpp'
2--- libubuntudownloadmanager/downloads/factory.cpp 2013-12-17 10:48:37 +0000
3+++ libubuntudownloadmanager/downloads/factory.cpp 2013-12-17 10:48:37 +0000
4@@ -35,7 +35,7 @@
5 */
6
7
8-Factory::Factory(QSharedPointer<AppArmor> apparmor,
9+Factory::Factory(AppArmor* apparmor,
10 SystemNetworkInfo* networkInfo,
11 RequestFactory* nam,
12 ProcessFactory* processFactory,
13
14=== modified file 'libubuntudownloadmanager/downloads/factory.h'
15--- libubuntudownloadmanager/downloads/factory.h 2013-12-17 10:48:37 +0000
16+++ libubuntudownloadmanager/downloads/factory.h 2013-12-17 10:48:37 +0000
17@@ -20,7 +20,6 @@
18 #define DOWNLOADER_LIB_DOWNLOAD_FACTORY_H
19
20 #include <QObject>
21-#include <QSharedPointer>
22 #include "metatypes.h"
23 #include "downloads/download.h"
24 #include "system/apparmor.h"
25@@ -35,7 +34,7 @@
26 Q_OBJECT
27
28 public:
29- Factory(QSharedPointer<AppArmor> apparmor,
30+ Factory(AppArmor* apparmor,
31 SystemNetworkInfo* networkInfo,
32 RequestFactory* nam,
33 ProcessFactory* processFactory,
34@@ -92,7 +91,7 @@
35 QString& rootPath,
36 bool& isConfined);
37 private:
38- QSharedPointer<AppArmor> _apparmor;
39+ AppArmor* _apparmor;
40 SystemNetworkInfo* _networkInfo;
41 RequestFactory* _nam;
42 ProcessFactory* _processFactory;
43
44=== modified file 'libubuntudownloadmanager/downloads/manager.cpp'
45--- libubuntudownloadmanager/downloads/manager.cpp 2013-12-17 10:48:37 +0000
46+++ libubuntudownloadmanager/downloads/manager.cpp 2013-12-17 10:48:37 +0000
47@@ -38,7 +38,7 @@
48 _throttle(0),
49 _stoppable(stoppable) {
50 _conn = connection;
51- _apparmor = QSharedPointer<AppArmor>(new AppArmor(connection));
52+ _apparmor = new AppArmor(connection);
53 _networkInfo = new SystemNetworkInfo();
54 RequestFactory* nam = new RequestFactory(_stoppable);
55 _processFactory = new ProcessFactory();
56
57=== modified file 'libubuntudownloadmanager/downloads/manager.h'
58--- libubuntudownloadmanager/downloads/manager.h 2013-12-17 10:48:37 +0000
59+++ libubuntudownloadmanager/downloads/manager.h 2013-12-17 10:48:37 +0000
60@@ -100,7 +100,7 @@
61 private:
62 QSharedPointer<Application> _app;
63 qulonglong _throttle;
64- QSharedPointer<AppArmor> _apparmor;
65+ AppArmor* _apparmor;
66 SystemNetworkInfo* _networkInfo;
67 ProcessFactory* _processFactory;
68 QSharedPointer<Factory> _downloadFactory;
69
70=== modified file 'ubuntu-download-manager-tests/downloads/test_download_factory.cpp'
71--- ubuntu-download-manager-tests/downloads/test_download_factory.cpp 2013-12-17 10:48:37 +0000
72+++ ubuntu-download-manager-tests/downloads/test_download_factory.cpp 2013-12-17 10:48:37 +0000
73@@ -33,8 +33,7 @@
74 _networkInfo = new FakeSystemNetworkInfo();
75 _nam = new FakeRequestFactory();
76 _processFactory = new FakeProcessFactory();
77- _downFactory = new Factory(QSharedPointer<AppArmor>(_apparmor),
78- _networkInfo, _nam, _processFactory);
79+ _downFactory = new Factory(_apparmor, _networkInfo, _nam, _processFactory);
80 }
81
82 void
83
84=== modified file 'ubuntu-download-manager-tests/downloads/test_download_manager.cpp'
85--- ubuntu-download-manager-tests/downloads/test_download_manager.cpp 2013-12-17 10:48:37 +0000
86+++ ubuntu-download-manager-tests/downloads/test_download_manager.cpp 2013-12-17 10:48:37 +0000
87@@ -39,9 +39,8 @@
88 _uuidFactory = QSharedPointer<FakeUuidFactory>(new FakeUuidFactory());
89 _apparmor = new FakeAppArmor(_uuidFactory);
90 _requestFactory = new FakeRequestFactory();
91- _downloadFactory = new FakeDownloadFactory(
92- QSharedPointer<AppArmor>(_apparmor), _networkInfo, _requestFactory,
93- new FakeProcessFactory());
94+ _downloadFactory = new FakeDownloadFactory(_apparmor, _networkInfo,
95+ _requestFactory, new FakeProcessFactory());
96 _man = new Manager(_appPointer, _conn, _networkInfo, _downloadFactory, _q);
97 }
98
99@@ -253,9 +252,9 @@
100 // do not use the fake uuid factory, else we only get one object path
101 _apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
102 new UuidFactory()));
103- _downloadFactory = new FakeDownloadFactory(
104- QSharedPointer<AppArmor>(_apparmor), new FakeSystemNetworkInfo(),
105- new FakeRequestFactory(), new FakeProcessFactory());
106+ _downloadFactory = new FakeDownloadFactory(_apparmor,
107+ new FakeSystemNetworkInfo(), new FakeRequestFactory(),
108+ new FakeProcessFactory());
109 _man = new Manager(_appPointer, _conn, _networkInfo,
110 _downloadFactory, _q);
111
112@@ -300,9 +299,9 @@
113 // do not use the fake uuid factory, else we only get one object path
114 _apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
115 new UuidFactory()));
116- _downloadFactory = new FakeDownloadFactory(
117- QSharedPointer<AppArmor>(_apparmor), new FakeSystemNetworkInfo(),
118- new FakeRequestFactory(), new FakeProcessFactory());
119+ _downloadFactory = new FakeDownloadFactory(_apparmor,
120+ new FakeSystemNetworkInfo(), new FakeRequestFactory(),
121+ new FakeProcessFactory());
122 _man = new Manager(_appPointer, _conn, _networkInfo,
123 _downloadFactory, _q);
124
125@@ -378,9 +377,9 @@
126 // do not use the fake uuid factory, else we only get one object path
127 _apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(
128 new UuidFactory()));
129- _downloadFactory = new FakeDownloadFactory(
130- QSharedPointer<AppArmor>(_apparmor), new FakeSystemNetworkInfo(),
131- new FakeRequestFactory(), new FakeProcessFactory());
132+ _downloadFactory = new FakeDownloadFactory(_apparmor,
133+ new FakeSystemNetworkInfo(), new FakeRequestFactory(),
134+ new FakeProcessFactory());
135 _man = new Manager(_appPointer, _conn, _networkInfo,
136 _downloadFactory, _q);
137
138
139=== modified file 'ubuntu-download-manager-tests/downloads/test_group_download.cpp'
140--- ubuntu-download-manager-tests/downloads/test_group_download.cpp 2013-12-17 10:48:37 +0000
141+++ ubuntu-download-manager-tests/downloads/test_group_download.cpp 2013-12-17 10:48:37 +0000
142@@ -41,8 +41,7 @@
143 _processFactory = new FakeProcessFactory();
144 _uuidFactory = new UuidFactory();
145 _apparmor = new FakeAppArmor(QSharedPointer<UuidFactory>(_uuidFactory));
146- _downloadFactory = new FakeDownloadFactory(
147- QSharedPointer<AppArmor>(_apparmor),
148+ _downloadFactory = new FakeDownloadFactory(_apparmor,
149 _networkInfo, _nam, _processFactory);
150 _fileManager = QSharedPointer<FakeFileManager>(new FakeFileManager());
151 }
152
153=== modified file 'ubuntu-download-manager-tests/fakes/fake_download_factory.cpp'
154--- ubuntu-download-manager-tests/fakes/fake_download_factory.cpp 2013-12-17 10:48:37 +0000
155+++ ubuntu-download-manager-tests/fakes/fake_download_factory.cpp 2013-12-17 10:48:37 +0000
156@@ -20,7 +20,7 @@
157 #include "fake_download_factory.h"
158
159 FakeDownloadFactory::FakeDownloadFactory(
160- QSharedPointer<AppArmor> apparmor,
161+ AppArmor* apparmor,
162 SystemNetworkInfo* networkInfo,
163 RequestFactory* nam,
164 ProcessFactory* processFactory,
165
166=== modified file 'ubuntu-download-manager-tests/fakes/fake_download_factory.h'
167--- ubuntu-download-manager-tests/fakes/fake_download_factory.h 2013-12-17 10:48:37 +0000
168+++ ubuntu-download-manager-tests/fakes/fake_download_factory.h 2013-12-17 10:48:37 +0000
169@@ -30,7 +30,7 @@
170 Q_OBJECT
171
172 public:
173- FakeDownloadFactory(QSharedPointer<AppArmor> apparmor,
174+ FakeDownloadFactory(AppArmor* apparmor,
175 SystemNetworkInfo* networkInfo,
176 RequestFactory* nam,
177 ProcessFactory* processFactory,
178@@ -72,7 +72,7 @@
179 QList<Download*> downloads();
180
181 private:
182- QSharedPointer<AppArmor> _apparmor;
183+ AppArmor* _apparmor;
184 SystemNetworkInfo* _networkInfo;
185 RequestFactory* _nam;
186 ProcessFactory* _processFactory;

Subscribers

People subscribed via source and target branches