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

[Daniel d'Andrada]

Some logging fixes

[Unity8 CI Bot (unity8-ci-bot)]

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)]

+ 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]

344. By Daniel d'Andrada on 2016-09-12

Tweak switch

[Daniel d'Andrada (dandrader)]

> + 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

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2016-08-24 12:40:30 +0000
+++ src/ubuntumirclient/input.cpp	2016-09-12 13:59:46 +0000
@@ -224,11 +224,17 @@
         return "mir_event_type_close_surface";
     case mir_event_type_input:
         return "mir_event_type_input";
+    case mir_event_type_keymap:
+        return "mir_event_type_keymap";
+    case mir_event_type_input_configuration:
+        return "mir_event_type_input_configuration";
     case mir_event_type_surface_output:
         return "mir_event_type_surface_output";
-    default:
-        return "invalid";
+    case mir_event_type_input_device_state:
+        return "mir_event_type_input_device_state";
     }
+
+    return "unknown/invalid";
 }
 
 void UbuntuInput::customEvent(QEvent* event)

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2016-08-31 01:51:15 +0000
+++ src/ubuntumirclient/window.cpp	2016-09-12 13:59:46 +0000
@@ -655,7 +655,7 @@
 
 void UbuntuWindow::handleSurfaceVisibilityChanged(bool visible)
 {
-    qCDebug(ubuntumirclient, "handleSurfaceFocused(window=%p)", window());
+    qCDebug(ubuntumirclient, "handleSurfaceVisibilityChanged(visible=%d)", visible);
 
     if (mWindowVisible == visible) return;
     mWindowVisible = visible;