Mir

Merge lp:~vanvugt/mir/remove-dead-code-old-input-stuff into lp:mir

  1. remove-dead-code-old-input-stuff
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 4052
Proposed branch: lp:~vanvugt/mir/remove-dead-code-old-input-stuff
Merge into: lp:mir
Diff against target: 41 lines (+1/-10)
2 files modified
include/server/mir/input/input_dispatcher.h (+1/-1)
src/common/symbols.map (+0/-9)
To merge this branch: bzr merge lp:~vanvugt/mir/remove-dead-code-old-input-stuff
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing
Alan Griffiths Approve
Review via email: mp+318178@code.launchpad.net

Commit message

Remove references to old non-existent input code.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4051
https://mir-jenkins.ubuntu.com/job/mir-ci/3054/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4083
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4170
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4160
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4160
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4160
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4110
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4110/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4110
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4110/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4110
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4110/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4110
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4110/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4110
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4110/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4110
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4110/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3054/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

If CI is happy then so am I

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1142/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4087
    FAILURE: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1204/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1205/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4174
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4164
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4164
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4164
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4114
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4114
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4114
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4114
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4114
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4114
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4114/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/server/mir/input/input_dispatcher.h'
2--- include/server/mir/input/input_dispatcher.h 2016-01-29 08:18:22 +0000
3+++ include/server/mir/input/input_dispatcher.h 2017-02-24 03:51:32 +0000
4@@ -31,7 +31,7 @@
5 /*!
6 * \brief The InputDispatchers role is to decide what should happen with user input events.
7 *
8- * It will receive MirEvents with either MirMotionEvent or MirKeyboardEvent inside. The InputDispatcher
9+ * It will receive MirEvents with either MirPointerEvent or MirKeyboardEvent inside. The InputDispatcher
10 * implementation shall either handle the input without informing any clients or pick a client
11 * surface and send the event to it.
12 */
13
14=== modified file 'src/common/symbols.map'
15--- src/common/symbols.map 2017-02-17 07:05:32 +0000
16+++ src/common/symbols.map 2017-02-24 03:51:32 +0000
17@@ -270,13 +270,8 @@
18 MirPointerEvent::x*;
19 MirPointerEvent::y*;
20 MirTouchEvent::MirTouchEvent*;
21- MirTouchEvent::buttons*;
22- MirTouchEvent::set_buttons*;
23- MirTouchEvent::event_time*;
24- MirTouchEvent::set_event_time*;
25 MirTouchEvent::pointer_count*;
26 MirTouchEvent::set_pointer_count*;
27- MirTouchEvent::pointer_coordinates*;
28 MirTouchEvent::id*;
29 MirTouchEvent::set_id*;
30 MirTouchEvent::x*;
31@@ -291,10 +286,6 @@
32 MirTouchEvent::set_pressure*;
33 MirTouchEvent::orientation*;
34 MirTouchEvent::set_orientation*;
35- MirTouchEvent::vscroll*;
36- MirTouchEvent::set_vscroll*;
37- MirTouchEvent::hscroll*;
38- MirTouchEvent::set_hscroll*;
39 MirTouchEvent::tool_type*;
40 MirTouchEvent::set_tool_type*;
41 MirTouchEvent::action*;

Subscribers

People subscribed via source and target branches