ubuntu-download-manager

Merge lp:~mandel/ubuntu-download-manager/leak-dbus-include into lp:ubuntu-download-manager

  1. leak-dbus-include
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 231
Merged at revision: 231
Proposed branch: lp:~mandel/ubuntu-download-manager/leak-dbus-include
Merge into: lp:ubuntu-download-manager
Diff against target: 140 lines (+16/-5)
10 files modified
ubuntu-download-manager-common/ubuntu/download_manager/download_struct.cpp (+1/-0)
ubuntu-download-manager-common/ubuntu/download_manager/download_struct.h (+1/-1)
ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.cpp (+1/-0)
ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.h (+3/-1)
ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.cpp (+2/-0)
ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.h (+2/-1)
ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.cpp (+1/-0)
ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.h (+2/-1)
ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.cpp (+1/-0)
ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.h (+2/-1)
To merge this branch: bzr merge lp:~mandel/ubuntu-download-manager/leak-dbus-include
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Diego Sarmentero (community) Approve
Review via email: mp+205344@code.launchpad.net

Commit message

Ensure that we do not leak includes from QDBus.

Description of the change

Ensure that we do not leak includes from QDBus.

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/download_struct.cpp'
2--- ubuntu-download-manager-common/ubuntu/download_manager/download_struct.cpp 2014-01-24 11:43:22 +0000
3+++ ubuntu-download-manager-common/ubuntu/download_manager/download_struct.cpp 2014-02-07 11:21:55 +0000
4@@ -16,6 +16,7 @@
5 * Boston, MA 02110-1301, USA.
6 */
7
8+#include <QDBusArgument>
9 #include "download_struct.h"
10
11 namespace Ubuntu {
12
13=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/download_struct.h'
14--- ubuntu-download-manager-common/ubuntu/download_manager/download_struct.h 2014-01-24 11:43:22 +0000
15+++ ubuntu-download-manager-common/ubuntu/download_manager/download_struct.h 2014-02-07 11:21:55 +0000
16@@ -19,11 +19,11 @@
17 #ifndef DOWNLOADER_LIB_DOWNLOAD_STRUCT_H
18 #define DOWNLOADER_LIB_DOWNLOAD_STRUCT_H
19
20-#include <QDBusArgument>
21 #include <QMap>
22 #include <QString>
23 #include <QVariantMap>
24
25+class QDBusArgument;
26 namespace Ubuntu {
27
28 namespace DownloadManager {
29
30=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.cpp'
31--- ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.cpp 2013-11-12 12:30:18 +0000
32+++ ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.cpp 2014-02-07 11:21:55 +0000
33@@ -17,6 +17,7 @@
34 */
35
36 #include <QDBusMetaType>
37+#include <QDBusArgument>
38 #include "group_download_struct.h"
39 #include "system/hash_algorithm.h"
40
41
42=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.h'
43--- ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.h 2013-11-12 12:30:18 +0000
44+++ ubuntu-download-manager-common/ubuntu/download_manager/group_download_struct.h 2014-02-07 11:21:55 +0000
45@@ -19,7 +19,9 @@
46 #ifndef DOWNLOADER_LIB_GROUP_DOWNLOAD_STRUCT_H
47 #define DOWNLOADER_LIB_GROUP_DOWNLOAD_STRUCT_H
48
49-#include <QDBusArgument>
50+#include <QString>
51+
52+class QDBusArgument;
53
54 namespace Ubuntu {
55
56
57=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.cpp'
58--- ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.cpp 2014-01-27 12:04:54 +0000
59+++ ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.cpp 2014-02-07 11:21:55 +0000
60@@ -15,6 +15,8 @@
61 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
62 * Boston, MA 02110-1301, USA.
63 */
64+
65+#include <QDBusArgument>
66 #include "http_error_struct.h"
67
68 namespace Ubuntu {
69
70=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.h'
71--- ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.h 2014-01-27 12:04:54 +0000
72+++ ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.h 2014-02-07 11:21:55 +0000
73@@ -19,9 +19,10 @@
74 #ifndef DOWNLOADER_LIB_HTTP_ERROR_STRUCT_H
75 #define DOWNLOADER_LIB_HTTP_ERROR_STRUCT_H
76
77-#include <QDBusArgument>
78 #include <QString>
79
80+class QDBusArgument;
81+
82 namespace Ubuntu {
83
84 namespace DownloadManager {
85
86=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.cpp'
87--- ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.cpp 2014-01-27 16:36:44 +0000
88+++ ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.cpp 2014-02-07 11:21:55 +0000
89@@ -16,6 +16,7 @@
90 * Boston, MA 02110-1301, USA.
91 */
92
93+#include <QDBusArgument>
94 #include <QNetworkReply>
95 #include "network_error_struct.h"
96
97
98=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.h'
99--- ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.h 2014-01-27 16:36:44 +0000
100+++ ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.h 2014-02-07 11:21:55 +0000
101@@ -19,9 +19,10 @@
102 #ifndef DOWNLOADER_LIB_NETWORK_ERROR_STRUCT_H
103 #define DOWNLOADER_LIB_NETWORK_ERROR_STRUCT_H
104
105-#include <QDBusArgument>
106 #include <QString>
107
108+class QDBusArgument;
109+
110 namespace Ubuntu {
111
112 namespace DownloadManager {
113
114=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.cpp'
115--- ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.cpp 2014-01-29 13:47:00 +0000
116+++ ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.cpp 2014-02-07 11:21:55 +0000
117@@ -16,6 +16,7 @@
118 * Boston, MA 02110-1301, USA.
119 */
120
121+#include <QDBusArgument>
122 #include <QProcess>
123 #include "process_error_struct.h"
124
125
126=== modified file 'ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.h'
127--- ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.h 2014-01-29 13:47:00 +0000
128+++ ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.h 2014-02-07 11:21:55 +0000
129@@ -19,9 +19,10 @@
130 #ifndef DOWNLOADER_LIB_PROCESS_ERROR_STRUCT_H
131 #define DOWNLOADER_LIB_PROCESS_ERROR_STRUCT_H
132
133-#include <QDBusArgument>
134 #include <QString>
135
136+class QDBusArgument;
137+
138 namespace Ubuntu {
139
140 namespace DownloadManager {

Subscribers

People subscribed via source and target branches