ubuntu-download-manager

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

  1. remove-network-info-pimpl
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 173
Merged at revision: 179
Proposed branch: lp:~mandel/ubuntu-download-manager/remove-network-info-pimpl
Merge into: lp:ubuntu-download-manager
Diff against target: 408 lines (+149/-201)
2 files modified
libubuntudownloadmanager/system/system_network_info.cpp (+133/-175)
libubuntudownloadmanager/system/system_network_info.h (+16/-26)
To merge this branch: bzr merge lp:~mandel/ubuntu-download-manager/remove-network-info-pimpl
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Diego Sarmentero (community) Approve
Review via email: mp+195120@code.launchpad.net

Commit message

Remove the pimpl patter from the system network info. Because pimpl is out we can use the new signal connection.

Description of the change

Remove the pimpl patter from the system network info. Because pimpl is out we can use the new signal connection.

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

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

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

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

review: Needs Fixing (continuous-integration)
lp:~mandel/ubuntu-download-manager/remove-network-info-pimpl updated
173. By Manuel de la Peña

Fixed merge issues.

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

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libubuntudownloadmanager/system/system_network_info.cpp'
--- libubuntudownloadmanager/system/system_network_info.cpp 2013-11-12 11:27:26 +0000
+++ libubuntudownloadmanager/system/system_network_info.cpp 2013-11-17 14:28:30 +0000
@@ -28,196 +28,154 @@
2828
29namespace System {29namespace System {
3030
31/*31SystemNetworkInfo::SystemNetworkInfo(QObject* parent)
32 * PRIVATE IMPLEMENTATION32 : QObject(parent) {
33 */33 _info = new QNetworkInfo(this);
3434 _configMan = new QNetworkConfigurationManager(this);
35class SystemNetworkInfoPrivate {
36 Q_DECLARE_PUBLIC(SystemNetworkInfo)
37
38 public:
39 explicit SystemNetworkInfoPrivate(SystemNetworkInfo* parent)
40 : q_ptr(parent) {
41 Q_Q(SystemNetworkInfo);
42 _info = new QNetworkInfo();
43 _configMan = new QNetworkConfigurationManager();
4435
45#ifdef DEBUG36#ifdef DEBUG
46 // in debug do log the changes else just fwd them37 // in debug do log the changes else just fwd them
47 q->connect(_info, SIGNAL(cellIdChanged(int, const QString&)), q,38 connect(_info, &QNetworkInfo::cellIdChanged, this,
48 SLOT(onCellIdChanged(int, const QString&)));39 &SystemNetworkInfo::onCellIdChanged);
49 q->connect(_info, SIGNAL(currentCellDataTechnologyChanged(int, QNetworkInfo::CellDataTechnology)), q,40 connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged, this,
50 SLOT(onCurrentCellDataTechnologyChanged(int, QNetworkInfo::CellDataTechnology)));41 &SystemNetworkInfo::onCurrentCellDataTechnologyChanged);
51 q->connect(_info, SIGNAL(currentMobileCountryCodeChanged(int, const QString&)), q,42 connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, this,
52 SLOT(onCurrentMobileCountryCodeChanged(int, const QString&)));43 &SystemNetworkInfo::onCurrentMobileCountryCodeChanged);
53 q->connect(_info, SIGNAL(currentMobileNetworkCodeChanged(int, const QString&)), q,44 connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, this,
54 SLOT(onCurrentMobileNetworkCodeChanged(int, const QString&)));45 &SystemNetworkInfo::onCurrentMobileNetworkCodeChanged);
55 q->connect(_info, SIGNAL(currentNetworkModeChanged(QNetworkInfo::NetworkMode)), q,46 connect(_info, &QNetworkInfo::currentNetworkModeChanged, this,
56 SLOT(onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode)));47 &SystemNetworkInfo::onCurrentNetworkModeChanged);
57 q->connect(_info, SIGNAL(locationAreaCodeChanged(int, const QString&)), q,48 connect(_info, &QNetworkInfo::locationAreaCodeChanged, this,
58 SLOT(onLocationAreaCodeChanged(int, const QString&)));49 &SystemNetworkInfo::onLocationAreaCodeChanged);
59 q->connect(_info, SIGNAL(networkInterfaceCountChanged(QNetworkInfo::NetworkMode, int)), q,50 connect(_info, &QNetworkInfo::networkInterfaceCountChanged, this,
60 SLOT(onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode, int)));51 &SystemNetworkInfo::onNetworkInterfaceCountChanged);
61 q->connect(_info, SIGNAL(networkNameChanged(QNetworkInfo::NetworkMode, int, const QString&)), q,52 connect(_info, &QNetworkInfo::networkNameChanged, this,
62 SLOT(onNetworkNameChanged(QNetworkInfo::NetworkMode, int, const QString&)));53 &SystemNetworkInfo::onNetworkNameChanged);
63 q->connect(_info, SIGNAL(networkSignalStrengthChanged(QNetworkInfo::NetworkMode, int, int)), q,54 connect(_info, &QNetworkInfo::networkSignalStrengthChanged, this,
64 SLOT(onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode, int, int)));55 &SystemNetworkInfo::onNetworkSignalStrengthChanged);
65 q->connect(_info, SIGNAL(networkStatusChanged(QNetworkInfo::NetworkMode, int, QNetworkInfo::NetworkStatus)), q,56 connect(_info, &QNetworkInfo::networkStatusChanged, this,
66 SLOT(onNetworkStatusChanged(QNetworkInfo::NetworkMode, int, QNetworkInfo::NetworkStatus)));57 &SystemNetworkInfo::onNetworkStatusChanged);
6758
68 q->connect(_configMan,59 connect(_configMan,
69 SIGNAL(onlineStateChanged(bool)), q,60 &QNetworkConfigurationManager::onlineStateChanged, this,
70 SLOT(onOnlineStateChanged(bool)));61 &SystemNetworkInfo::onOnlineStateChanged);
71#else62#else
72 // connect to interesting signals63 // connect to interesting signals
73 q->connect(_info, &QNetworkInfo::cellIdChanged, q,64 connect(_info, &QNetworkInfo::cellIdChanged, q,
74 &SystemNetworkInfo::cellIdChanged);65 &SystemNetworkInfo::cellIdChanged);
75 q->connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged, q,66 connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged, q,
76 &SystemNetworkInfo::currentCellDataTechnologyChanged);67 &SystemNetworkInfo::currentCellDataTechnologyChanged);
77 q->connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, q,68 connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, q,
78 &SystemNetworkInfo::currentMobileCountryCodeChanged);69 &SystemNetworkInfo::currentMobileCountryCodeChanged);
79 q->connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, q,70 connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, q,
80 &SystemNetworkInfo::currentMobileNetworkCodeChanged);71 &SystemNetworkInfo::currentMobileNetworkCodeChanged);
81 q->connect(_info, &QNetworkInfo::currentNetworkModeChanged, q,72 connect(_info, &QNetworkInfo::currentNetworkModeChanged, q,
82 &SystemNetworkInfo::currentNetworkModeChanged);73 &SystemNetworkInfo::currentNetworkModeChanged);
83 q->connect(_info, &QNetworkInfo::locationAreaCodeChanged, q,74 connect(_info, &QNetworkInfo::locationAreaCodeChanged, q,
84 &SystemNetworkInfo::locationAreaCodeChanged);75 &SystemNetworkInfo::locationAreaCodeChanged);
85 q->connect(_info, &QNetworkInfo::networkInterfaceCountChanged, q,76 connect(_info, &QNetworkInfo::networkInterfaceCountChanged, q,
86 &SystemNetworkInfo::networkInterfaceCountChanged);77 &SystemNetworkInfo::networkInterfaceCountChanged);
87 q->connect(_info, &QNetworkInfo::networkNameChanged, q,78 connect(_info, &QNetworkInfo::networkNameChanged, q,
88 &SystemNetworkInfo::networkNameChanged);79 &SystemNetworkInfo::networkNameChanged);
89 q->connect(_info, &QNetworkInfo::networkSignalStrengthChanged, q,80 connect(_info, &QNetworkInfo::networkSignalStrengthChanged, q,
90 &SystemNetworkInfo::networkSignalStrengthChanged);81 &SystemNetworkInfo::networkSignalStrengthChanged);
91 q->connect(_info, &QNetworkInfo::networkStatusChanged, q,82 connect(_info, &QNetworkInfo::networkStatusChanged, q,
92 &SystemNetworkInfo::networkStatusChanged);83 &SystemNetworkInfo::networkStatusChanged);
9384
94 q->connect(_configMan,85 connect(_configMan,
95 &QNetworkConfigurationManager::onlineStateChanged, q,86 &QNetworkConfigurationManager::onlineStateChanged, q,
96 &SystemNetworkInfo::onlineStateChanged);87 &SystemNetworkInfo::onlineStateChanged);
97#endif88#endif
9889
99 }
100
101 ~SystemNetworkInfoPrivate() {
102 delete _info;
103 delete _configMan;
104 }
105
106 QNetworkInfo::NetworkMode currentNetworkMode() {
107 return _info->currentNetworkMode();
108 }
109
110 bool isOnline() {
111 return _configMan->isOnline();
112 }
113
114 void onOnlineStateChanged(bool online) {
115 Q_Q(SystemNetworkInfo);
116 TRACE << online;
117 emit q->onlineStateChanged(online);
118 }
119
120#if DEBUG
121
122 void onCellIdChanged(int interface, const QString& id) {
123 Q_Q(SystemNetworkInfo);
124 TRACE << interface << id;
125 emit q->cellIdChanged(interface, id);
126 }
127
128 void onCurrentCellDataTechnologyChanged(int interface,
129 QNetworkInfo::CellDataTechnology tech) {
130 Q_Q(SystemNetworkInfo);
131 TRACE << interface << tech;
132 emit q->currentCellDataTechnologyChanged(interface, tech);
133 }
134
135 void onCurrentMobileCountryCodeChanged(int interface, const QString& mcc) {
136 Q_Q(SystemNetworkInfo);
137 TRACE << interface << mcc;
138 emit q->currentMobileCountryCodeChanged(interface, mcc);
139 }
140
141 void onCurrentMobileNetworkCodeChanged(int interface, const QString& mnc) {
142 Q_Q(SystemNetworkInfo);
143 TRACE << interface << mnc;
144 emit q->currentMobileNetworkCodeChanged(interface, mnc);
145 }
146
147 void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode) {
148 Q_Q(SystemNetworkInfo);
149 TRACE << mode;
150 emit q->currentNetworkModeChanged(mode);
151 }
152
153 void onLocationAreaCodeChanged(int interface, const QString& lac) {
154 Q_Q(SystemNetworkInfo);
155 TRACE << interface << lac;
156 emit q->locationAreaCodeChanged(interface, lac);
157 }
158
159 void onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode mode,
160 int count) {
161 Q_Q(SystemNetworkInfo);
162 TRACE << mode << count;
163 emit q->networkInterfaceCountChanged(mode, count);
164 }
165
166 void onNetworkNameChanged(QNetworkInfo::NetworkMode mode, int interface,
167 const QString& name) {
168 Q_Q(SystemNetworkInfo);
169 TRACE << mode << interface << name;
170 emit q->networkNameChanged(mode, interface, name);
171 }
172
173 void onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode mode,
174 int interface, int strength) {
175 Q_Q(SystemNetworkInfo);
176 TRACE << mode << interface << strength;
177 emit q->networkSignalStrengthChanged(mode, interface, strength);
178 }
179
180 void onNetworkStatusChanged(QNetworkInfo::NetworkMode mode, int interface,
181 QNetworkInfo::NetworkStatus status) {
182 Q_Q(SystemNetworkInfo);
183 TRACE << mode << interface << status;
184 emit q->networkStatusChanged(mode, interface, status);
185 }
186
187#endif
188
189 private:
190 QNetworkInfo* _info;
191 QNetworkConfigurationManager* _configMan;
192 SystemNetworkInfo* q_ptr;
193};
194
195
196/*
197 * PUBLIC IMPLEMENTATION
198 */
199
200SystemNetworkInfo::SystemNetworkInfo(QObject *parent)
201 : QObject(parent),
202 d_ptr(new SystemNetworkInfoPrivate(this)) {
203}90}
20491
205QNetworkInfo::NetworkMode92QNetworkInfo::NetworkMode
206SystemNetworkInfo::currentNetworkMode() {93SystemNetworkInfo::currentNetworkMode() {
207 Q_D(SystemNetworkInfo);94 return _info->currentNetworkMode();
208 return d->currentNetworkMode();
209}95}
21096
211bool97bool
212SystemNetworkInfo::isOnline() {98SystemNetworkInfo::isOnline() {
213 Q_D(SystemNetworkInfo);99 return _configMan->isOnline();
214 return d->isOnline();100}
215}101
102void
103SystemNetworkInfo::onOnlineStateChanged(bool online) {
104 TRACE << online;
105 emit onlineStateChanged(online);
106}
107
108#if DEBUG
109
110void
111SystemNetworkInfo::onCellIdChanged(int interface, const QString& id) {
112 TRACE << interface << id;
113 emit cellIdChanged(interface, id);
114}
115
116void
117SystemNetworkInfo::onCurrentCellDataTechnologyChanged(int interface,
118 QNetworkInfo::CellDataTechnology tech) {
119 TRACE << interface << tech;
120 emit currentCellDataTechnologyChanged(interface, tech);
121}
122
123void
124SystemNetworkInfo::onCurrentMobileCountryCodeChanged(int interface, const QString& mcc) {
125 TRACE << interface << mcc;
126 emit currentMobileCountryCodeChanged(interface, mcc);
127}
128
129void
130SystemNetworkInfo::onCurrentMobileNetworkCodeChanged(int interface, const QString& mnc) {
131 TRACE << interface << mnc;
132 emit currentMobileNetworkCodeChanged(interface, mnc);
133}
134
135void
136SystemNetworkInfo::onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode) {
137 TRACE << mode;
138 emit currentNetworkModeChanged(mode);
139}
140
141void
142SystemNetworkInfo::onLocationAreaCodeChanged(int interface, const QString& lac) {
143 TRACE << interface << lac;
144 emit locationAreaCodeChanged(interface, lac);
145}
146
147void
148SystemNetworkInfo::onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode mode,
149 int count) {
150 TRACE << mode << count;
151 emit networkInterfaceCountChanged(mode, count);
152}
153
154void
155SystemNetworkInfo::onNetworkNameChanged(QNetworkInfo::NetworkMode mode, int interface,
156 const QString& name) {
157 TRACE << mode << interface << name;
158 emit networkNameChanged(mode, interface, name);
159}
160
161void
162SystemNetworkInfo::onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode mode,
163 int interface, int strength) {
164 TRACE << mode << interface << strength;
165 emit networkSignalStrengthChanged(mode, interface, strength);
166}
167
168void
169SystemNetworkInfo::onNetworkStatusChanged(QNetworkInfo::NetworkMode mode, int interface,
170 QNetworkInfo::NetworkStatus status) {
171 TRACE << mode << interface << status;
172 emit networkStatusChanged(mode, interface, status);
173}
174
175#endif
216176
217} // System177} // System
218178
219} // DownloadManager179} // DownloadManager
220180
221} // Ubuntu181} // Ubuntu
222
223#include "moc_system_network_info.cpp"
224182
=== modified file 'libubuntudownloadmanager/system/system_network_info.h'
--- libubuntudownloadmanager/system/system_network_info.h 2013-10-29 13:42:44 +0000
+++ libubuntudownloadmanager/system/system_network_info.h 2013-11-17 14:28:30 +0000
@@ -20,6 +20,7 @@
20#define DOWNLOADER_LIB_SYSTEM_NETWORK_INFO_H20#define DOWNLOADER_LIB_SYSTEM_NETWORK_INFO_H
2121
22#include <QNetworkAccessManager>22#include <QNetworkAccessManager>
23#include <QNetworkConfigurationManager>
23#include <QNetworkInfo>24#include <QNetworkInfo>
24#include <QObject>25#include <QObject>
2526
@@ -29,10 +30,8 @@
2930
30namespace System {31namespace System {
3132
32class SystemNetworkInfoPrivate;
33class SystemNetworkInfo : public QObject {33class SystemNetworkInfo : public QObject {
34 Q_OBJECT34 Q_OBJECT
35 Q_DECLARE_PRIVATE(SystemNetworkInfo)
3635
37 public:36 public:
38 explicit SystemNetworkInfo(QObject *parent = 0);37 explicit SystemNetworkInfo(QObject *parent = 0);
@@ -58,36 +57,27 @@
58 void onlineStateChanged(bool online);57 void onlineStateChanged(bool online);
5958
60 private:59 private:
61 Q_PRIVATE_SLOT(d_func(), void onOnlineStateChanged(bool))60 void onOnlineStateChanged(bool);
6261
63#if DEBUG62#if DEBUG
64 // track the changes so that we get some debug info, else we will just fwd the signals63 // track the changes so that we get some debug info, else we will just fwd the signals
65 Q_PRIVATE_SLOT(d_func(),64 void onCellIdChanged(int, const QString&);
66 void onCellIdChanged(int, const QString&))65 void onCurrentCellDataTechnologyChanged(int,
67 Q_PRIVATE_SLOT(d_func(),66 QNetworkInfo::CellDataTechnology);
68 void onCurrentCellDataTechnologyChanged(int,67 void onCurrentMobileCountryCodeChanged(int, const QString&);
69 QNetworkInfo::CellDataTechnology))68 void onCurrentMobileNetworkCodeChanged(int, const QString&);
70 Q_PRIVATE_SLOT(d_func(),69 void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode);
71 void onCurrentMobileCountryCodeChanged(int, const QString&))70 void onLocationAreaCodeChanged(int, const QString&);
72 Q_PRIVATE_SLOT(d_func(),71 void onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode, int);
73 void onCurrentMobileNetworkCodeChanged(int, const QString&))72 void onNetworkNameChanged(QNetworkInfo::NetworkMode, int, const QString&);
74 Q_PRIVATE_SLOT(d_func(),73 void onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode, int, int);
75 void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode))74 void onNetworkStatusChanged(QNetworkInfo::NetworkMode, int,
76 Q_PRIVATE_SLOT(d_func(),75 QNetworkInfo::NetworkStatus);
77 void onLocationAreaCodeChanged(int, const QString&))
78 Q_PRIVATE_SLOT(d_func(),
79 void onNetworkInterfaceCountChanged(QNetworkInfo::NetworkMode, int))
80 Q_PRIVATE_SLOT(d_func(),
81 void onNetworkNameChanged(QNetworkInfo::NetworkMode, int, const QString&))
82 Q_PRIVATE_SLOT(d_func(),
83 void onNetworkSignalStrengthChanged(QNetworkInfo::NetworkMode, int, int))
84 Q_PRIVATE_SLOT(d_func(),
85 void onNetworkStatusChanged(QNetworkInfo::NetworkMode, int,
86 QNetworkInfo::NetworkStatus))
87#endif76#endif
8877
89 private:78 private:
90 SystemNetworkInfoPrivate* d_ptr;79 QNetworkInfo* _info;
80 QNetworkConfigurationManager* _configMan;
91};81};
9282
93} // System83} // System

Subscribers

People subscribed via source and target branches