Unity API

Merge lp:~nick-dedekind/unity-api/signal-namespaces into lp:unity-api

  1. signal-namespaces
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 261
Merged at revision: 261
Proposed branch: lp:~nick-dedekind/unity-api/signal-namespaces
Merge into: lp:unity-api
Diff against target: 27 lines (+3/-3)
2 files modified
include/unity/shell/application/MirSurfaceItemInterface.h (+1/-1)
include/unity/shell/application/SurfaceManagerInterface.h (+2/-2)
To merge this branch: bzr merge lp:~nick-dedekind/unity-api/signal-namespaces
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+314006@code.launchpad.net

Commit message

Fully qualify pointer type namespaces in signals so that the parameters can be used in qml.

Description of the change

Fully qualify pointer type namespaces in signals so that the parameters can be used in qml.

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

FAILED: Continuous integration, rev:261
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/127/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3656/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3684
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3529
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3529/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3529
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3529/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3529
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3529/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3529/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3529
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3529/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3529
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3529/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/127/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:261
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/128/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3663
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3691
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3536
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3536/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3536
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3536/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3536
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3536/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3536
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3536/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3536
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3536/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3536
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3536/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/128/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM, makes sense

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/shell/application/MirSurfaceItemInterface.h'
2--- include/unity/shell/application/MirSurfaceItemInterface.h 2016-11-03 12:25:43 +0000
3+++ include/unity/shell/application/MirSurfaceItemInterface.h 2017-01-03 12:42:02 +0000
4@@ -156,7 +156,7 @@
5 void surfaceStateChanged(Mir::State);
6 void liveChanged(bool live);
7 void orientationAngleChanged(Mir::OrientationAngle angle);
8- void surfaceChanged(MirSurfaceInterface*);
9+ void surfaceChanged(unity::shell::application::MirSurfaceInterface* surface);
10 void consumesInputChanged(bool value);
11 void surfaceWidthChanged(int value);
12 void surfaceHeightChanged(int value);
13
14=== modified file 'include/unity/shell/application/SurfaceManagerInterface.h'
15--- include/unity/shell/application/SurfaceManagerInterface.h 2016-11-14 20:35:23 +0000
16+++ include/unity/shell/application/SurfaceManagerInterface.h 2017-01-03 12:42:02 +0000
17@@ -37,8 +37,8 @@
18 virtual void activate(MirSurfaceInterface *surface) = 0;
19
20 Q_SIGNALS:
21- void surfaceCreated(MirSurfaceInterface *surface);
22- void surfacesRaised(const QVector<MirSurfaceInterface*> &surfaces);
23+ void surfaceCreated(unity::shell::application::MirSurfaceInterface *surface);
24+ void surfacesRaised(const QVector<unity::shell::application::MirSurfaceInterface*> &surfaces);
25 void modificationsStarted();
26 void modificationsEnded();
27 };

Subscribers

People subscribed via source and target branches

to all changes: