Unity API

Merge lp:~aacid/unity-api/add_override into lp:unity-api

  1. add_override
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 230
Merged at revision: 234
Proposed branch: lp:~aacid/unity-api/add_override
Merge into: lp:unity-api
Diff against target: 25 lines (+2/-2)
2 files modified
include/unity/shell/application/ApplicationManagerInterface.h (+1/-1)
include/unity/shell/application/MirSurfaceListInterface.h (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity-api/add_override
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+294613@code.launchpad.net

Commit message

Mark roleNames as override

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

PASSED: Continuous integration, rev:230
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/75/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1626
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1580
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1580
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1573/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1573
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1573/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Innocent enough. +1

review: Approve
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

> Innocent enough. +1

Sorry, that was not to say the fix is not a good one! Great job picking this up :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/shell/application/ApplicationManagerInterface.h'
2--- include/unity/shell/application/ApplicationManagerInterface.h 2016-04-13 16:47:27 +0000
3+++ include/unity/shell/application/ApplicationManagerInterface.h 2016-05-13 09:36:23 +0000
4@@ -103,7 +103,7 @@
5 /// @cond
6 virtual ~ApplicationManagerInterface() {}
7
8- virtual QHash<int, QByteArray> roleNames() const
9+ QHash<int, QByteArray> roleNames() const override
10 {
11 return m_roleNames;
12 }
13
14=== modified file 'include/unity/shell/application/MirSurfaceListInterface.h'
15--- include/unity/shell/application/MirSurfaceListInterface.h 2016-04-13 16:47:27 +0000
16+++ include/unity/shell/application/MirSurfaceListInterface.h 2016-05-13 09:36:23 +0000
17@@ -62,7 +62,7 @@
18
19 /// @cond
20 // QAbstractItemModel methods
21- QHash<int, QByteArray> roleNames() const {
22+ QHash<int, QByteArray> roleNames() const override {
23 QHash<int, QByteArray> roleNames;
24 roleNames.insert(SurfaceRole, "surface");
25 return roleNames;

Subscribers

People subscribed via source and target branches

to all changes: