qtubuntu

Merge lp:~dandrader/qtubuntu/loggingFixes into lp:qtubuntu

  1. loggingFixes
  2. Merge into trunk
Proposed by Daniel d'Andrada on 2016-09-09
Status: Merged
Approved by: Gerry Boland on 2016-09-12
Approved revision: 344
Merged at revision: 346
Proposed branch: lp:~dandrader/qtubuntu/loggingFixes
Merge into: lp:qtubuntu
Diff against target: 36 lines (+9/-3)
2 files modified
src/ubuntumirclient/input.cpp (+8/-2)
src/ubuntumirclient/window.cpp (+1/-1)
To merge this branch: bzr merge lp:~dandrader/qtubuntu/loggingFixes
Reviewer Review Type Date Requested Status
Gerry Boland 2016-09-09 Approve on 2016-09-12
Unity8 CI Bot continuous-integration Approve on 2016-09-09
Review via email: mp+305374@code.launchpad.net

Commit Message

Some logging fixes

To post a comment you must log in.
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:343
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/114/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2829
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2857
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2715/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/114/rebuild

review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

+ case mir_event_type_input_device_state:
+ return "mir_event_type_input_device_state";
     default:
return "invalid";

this is why I try to avoid "default" for these cases - entries added to the Mir enum aren't noticed by us. Does it compile if you remove the "default"?

Looks ok otherwise

review: Needs Information
lp:~dandrader/qtubuntu/loggingFixes updated on 2016-09-12
344. By Daniel d'Andrada on 2016-09-12

Tweak switch

Daniel d'Andrada (dandrader) wrote :

> + case mir_event_type_input_device_state:
> + return "mir_event_type_input_device_state";
> default:
> return "invalid";
>
> this is why I try to avoid "default" for these cases - entries added to the
> Mir enum aren't noticed by us. Does it compile if you remove the "default"?
>

Yes. Updated.

Gerry Boland (gerboland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntumirclient/input.cpp'
2--- src/ubuntumirclient/input.cpp 2016-08-24 12:40:30 +0000
3+++ src/ubuntumirclient/input.cpp 2016-09-12 13:59:46 +0000
4@@ -224,11 +224,17 @@
5 return "mir_event_type_close_surface";
6 case mir_event_type_input:
7 return "mir_event_type_input";
8+ case mir_event_type_keymap:
9+ return "mir_event_type_keymap";
10+ case mir_event_type_input_configuration:
11+ return "mir_event_type_input_configuration";
12 case mir_event_type_surface_output:
13 return "mir_event_type_surface_output";
14- default:
15- return "invalid";
16+ case mir_event_type_input_device_state:
17+ return "mir_event_type_input_device_state";
18 }
19+
20+ return "unknown/invalid";
21 }
22
23 void UbuntuInput::customEvent(QEvent* event)
24
25=== modified file 'src/ubuntumirclient/window.cpp'
26--- src/ubuntumirclient/window.cpp 2016-08-31 01:51:15 +0000
27+++ src/ubuntumirclient/window.cpp 2016-09-12 13:59:46 +0000
28@@ -655,7 +655,7 @@
29
30 void UbuntuWindow::handleSurfaceVisibilityChanged(bool visible)
31 {
32- qCDebug(ubuntumirclient, "handleSurfaceFocused(window=%p)", window());
33+ qCDebug(ubuntumirclient, "handleSurfaceVisibilityChanged(visible=%d)", visible);
34
35 if (mWindowVisible == visible) return;
36 mWindowVisible = visible;

Subscribers

People subscribed via source and target branches