Merge lp:~veebers/autopilot-qt/add-GetVersion into lp:autopilot-qt

Proposed by Christopher Lee
Status: Merged
Approved by: Thomi Richards
Approved revision: 56
Merged at revision: 56
Proposed branch: lp:~veebers/autopilot-qt/add-GetVersion
Merge into: lp:autopilot-qt
Diff against target: 35 lines (+11/-0)
2 files modified
driver/dbus_adaptor.cpp (+7/-0)
driver/dbus_adaptor.h (+4/-0)
To merge this branch: bzr merge lp:~veebers/autopilot-qt/add-GetVersion
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+162899@code.launchpad.net

Commit message

Adding GetVersion so we can check that the version of the DBus protocol is as expected.

Description of the change

Adding GetVersion so we can check that the version of the DBus protocol is as expected.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'driver/dbus_adaptor.cpp'
2--- driver/dbus_adaptor.cpp 2012-12-19 12:27:25 +0000
3+++ driver/dbus_adaptor.cpp 2013-05-07 23:50:32 +0000
4@@ -48,3 +48,10 @@
5 );
6 }
7
8+void AutopilotAdaptor::GetVersion(const QDBusMessage &message)
9+{
10+ QDBusMessage reply = message.createReply();
11+ reply << QVariant(QString("1.3"));
12+ QDBusConnection::sessionBus().send(reply);
13+}
14+
15
16=== modified file 'driver/dbus_adaptor.h'
17--- driver/dbus_adaptor.h 2012-07-22 23:25:29 +0000
18+++ driver/dbus_adaptor.h 2013-05-07 23:50:32 +0000
19@@ -29,6 +29,9 @@
20 " <arg type='s' name='piece' direction='in' />"
21 " <arg type='a(sv)' name='state' direction='out' />"
22 " </method>"
23+" <method name='GetVersion'>"
24+" <arg type='s' name='version' direction='out' />"
25+" </method>"
26 " </interface>\n"
27 "")
28 public:
29@@ -38,6 +41,7 @@
30 public: // PROPERTIES
31 public Q_SLOTS: // METHODS
32 void GetState(const QString &piece, const QDBusMessage &message);
33+ void GetVersion(const QDBusMessage &message);
34 Q_SIGNALS: // SIGNALS
35 };
36

Subscribers

People subscribed via source and target branches