Merge lp:~aacid/qtmir/fix_clang_build into lp:qtmir

[Albert Astals Cid]

Fix clang build

    /home/tsdgeos/phablet/qtmir/qtmir/src/platforms/mirserver/mirserverhooks.cpp:40:11: error: member 'PromptSessionListener' found in multiple base classes of different types
        using PromptSessionListener::PromptSessionListener;
              ^
    /home/tsdgeos/phablet/qtmir/qtmir/src/platforms/mirserver/promptsessionlistener.h:28:7: note: member found by ambiguous name lookup
    class PromptSessionListener : public QObject
          ^
    /usr/include/mirserver/mir/scene/prompt_session_listener.h:31:7: note: member found by ambiguous name lookup
    class PromptSessionListener
          ^
    1 error generated.

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
N/A

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

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

PASSED: Continuous integration, rev:609
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/543/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4277
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4305
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4139
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4139/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4139
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4139/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4139
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4139/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4139
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4139/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4139
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4139/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4139
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4139/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

/me surprised the code not needed at all. But ok

review: Approve

[Alan Griffiths (alan-griffiths)]

This doesn't quite do the same thing as the original code. My alternative fix was:

- using PromptSessionListener::PromptSessionListener;
+ using ::PromptSessionListener::PromptSessionListener;

Which provides a PromptSessionListenerImpl::PromptSessionListenerImpl(QObject* = 0) constructor (which is Qt style as I understand it).

But that ctor could be re-introduced if ever needed.

review: Approve

=== modified file 'src/platforms/mirserver/mirserverhooks.cpp'
--- src/platforms/mirserver/mirserverhooks.cpp	2017-02-08 12:19:14 +0000
+++ src/platforms/mirserver/mirserverhooks.cpp	2017-03-02 10:30:49 +0000
@@ -37,7 +37,6 @@
 {
 struct PromptSessionListenerImpl : PromptSessionListener, mir::scene::PromptSessionListener
 {
-    using PromptSessionListener::PromptSessionListener;
     ~PromptSessionListenerImpl();
 
     void starting(std::shared_ptr<mir::scene::PromptSession> const& prompt_session) override;