Unity System Compositor

Merge lp:~mir-team/unity-system-compositor/respond-to-event-cleanup into lp:unity-system-compositor

  1. respond-to-event-cleanup
  2. Merge into trunk
Proposed by Robert Carr
Status: Merged
Merged at revision: 213
Proposed branch: lp:~mir-team/unity-system-compositor/respond-to-event-cleanup
Merge into: lp:unity-system-compositor
Diff against target: 26 lines (+8/-4)
1 file modified
tests/unit-tests/test_screen_event_handler.cpp (+8/-4)
To merge this branch: bzr merge lp:~mir-team/unity-system-compositor/respond-to-event-cleanup
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Needs Fixing
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+259520@code.launchpad.net

Commit message

make_event now takes std::chrono::nanoseconds

Description of the change

make_event now takes std::chrono::nanoseconds

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Can't we move to C++14?

review: Approve
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Some tabs instead of spaces.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unit-tests/test_screen_event_handler.cpp'
2--- tests/unit-tests/test_screen_event_handler.cpp 2015-04-07 13:36:48 +0000
3+++ tests/unit-tests/test_screen_event_handler.cpp 2015-05-19 15:42:32 +0000
4@@ -74,15 +74,19 @@
5
6 static const int32_t POWER_KEY_CODE = 26;
7 mir::EventUPtr power_key_down_event = mir::events::make_event(
8- MirInputDeviceId{1}, 0, mir_keyboard_action_down,
9+ MirInputDeviceId{1}, std::chrono::nanoseconds(0),
10+ mir_keyboard_action_down,
11 POWER_KEY_CODE, 0, mir_input_event_modifier_none);
12 mir::EventUPtr power_key_up_event = mir::events::make_event(
13- MirInputDeviceId{1}, 0, mir_keyboard_action_up,
14+ MirInputDeviceId{1}, std::chrono::nanoseconds(0),
15+ mir_keyboard_action_up,
16 POWER_KEY_CODE, 0, mir_input_event_modifier_none);
17 mir::EventUPtr touch_event = mir::events::make_event(
18- MirInputDeviceId{1}, 0, mir_input_event_modifier_none);
19+ MirInputDeviceId{1}, std::chrono::nanoseconds(0),
20+ mir_input_event_modifier_none);
21 mir::EventUPtr pointer_event = mir::events::make_event(
22- MirInputDeviceId{1}, 0, mir_input_event_modifier_none,
23+ MirInputDeviceId{1}, std::chrono::nanoseconds(0),
24+ mir_input_event_modifier_none,
25 mir_pointer_action_motion,
26 {}, 0.0f, 0.0f, 0.0f, 0.0f);
27

Subscribers

People subscribed via source and target branches