git.iko.soy/unity8
on xenial help sign in
Create QDBusInterface object on the fly
95fc898Michael Terry
plugins/Ubuntu/Connectivity/Connectivity.cpp+5−7
compare with xenial
unifiedsplit
@@ -20,16 +20,14 @@
20#include <QDBusPendingCall>
20#include <QDBusPendingCall>
21
21
22Connectivity::Connectivity(QObject *parent)
22Connectivity::Connectivity(QObject *parent)
23− : QObject(parent),
23+ : QObject(parent)
24− m_interface(new QDBusInterface("com.ubuntu.connectivity1",
25− "/com/ubuntu/connectivity1/Private",
26− "com.ubuntu.connectivity1.Private",
27− QDBusConnection::sessionBus(),
28− this))
29{
24{
30}
25}
31
26
32void Connectivity::unlockAllModems()
27void Connectivity::unlockAllModems()
33{
28{
29+ QDBusInterface iface("com.ubuntu.connectivity1",
30+ "/com/ubuntu/connectivity1/Private",
31+ "com.ubuntu.connectivity1.Private");
34− m_interface->asyncCall("UnlockAllModems");
32+ iface.asyncCall("UnlockAllModems");
35}
33}
plugins/Ubuntu/Connectivity/Connectivity.h−5
@@ -19,8 +19,6 @@
19
19
20#include <QObject>
20#include <QObject>
21
21
22−class QDBusInterface;
23−
24class Connectivity : public QObject
22class Connectivity : public QObject
25{
23{
26 Q_OBJECT
24 Q_OBJECT
@@ -30,9 +28,6 @@ public:
30 explicit Connectivity(QObject *parent = 0);
28 explicit Connectivity(QObject *parent = 0);
31
29
32 Q_INVOKABLE void unlockAllModems();
30 Q_INVOKABLE void unlockAllModems();
33−
34−private:
35− QDBusInterface *m_interface;
36};
31};
37
32
38#endif // CONNECTIVITY_H
33#endif // CONNECTIVITY_H