Merge lp:~dandrader/unity-api/removeHotspot into lp:unity-api

Proposed by Daniel d'Andrada on 2016-05-03
Status: Merged
Approved by: Lukáš Tinkl on 2016-05-09
Approved revision: no longer in the source branch.
Merged at revision: 232
Proposed branch: lp:~dandrader/unity-api/removeHotspot
Merge into: lp:unity-api
Diff against target: 74 lines (+8/-18)
3 files modified
debian/changelog (+6/-0)
include/unity/shell/application/CMakeLists.txt (+1/-1)
include/unity/shell/application/MirMousePointerInterface.h (+1/-17)
To merge this branch: bzr merge lp:~dandrader/unity-api/removeHotspot
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) 2016-05-03 Approve on 2016-05-09
Unity8 CI Bot continuous-integration Needs Fixing on 2016-05-03
Review via email: mp+293627@code.launchpad.net

Commit Message

Remove hotspot property from MirMousePointerInterface

There's no use for it any longer.

To post a comment you must log in.
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Lukáš Tinkl (lukas-kde) wrote :

LGTM

review: Approve
230. By Daniel d'Andrada on 2016-05-18

Moved prompt surfaces to ApplicationInfo and added MirSurfaceListInterface::first

- Moved promptSurfaceList from MirSurfaceInterface to ApplicationInfoInterface
- Added MirSurfaceListInterface::first property

231. By CI Train Bot Account on 2016-05-18

Releasing 7.112+16.04.20160518-0ubuntu1

232. By Daniel d'Andrada on 2016-05-18

Remove hotspot property from MirMousePointerInterface

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-05-18 09:31:07 +0000
3+++ debian/changelog 2016-05-18 20:52:24 +0000
4@@ -1,3 +1,9 @@
5+unity-api (7.113) UNRELEASED; urgency=medium
6+
7+ * Remove hotspot property from MirMousePointerInterface
8+
9+ -- Daniel d'Andrada <daniel.dandrada@canonical.com> Tue, 03 May 2016 10:40:00 -0300
10+
11 unity-api (7.112+16.04.20160518-0ubuntu1) xenial; urgency=medium
12
13 [ Daniel d'Andrada ]
14
15=== modified file 'include/unity/shell/application/CMakeLists.txt'
16--- include/unity/shell/application/CMakeLists.txt 2016-05-17 19:39:52 +0000
17+++ include/unity/shell/application/CMakeLists.txt 2016-05-18 20:52:24 +0000
18@@ -7,7 +7,7 @@
19
20 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
21
22-set(VERSION 16)
23+set(VERSION 17)
24 set(PKGCONFIG_NAME "unity-shell-application")
25 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
26 set(PKGCONFIG_REQUIRES "Qt5Core")
27
28=== modified file 'include/unity/shell/application/MirMousePointerInterface.h'
29--- include/unity/shell/application/MirMousePointerInterface.h 2015-11-23 10:13:22 +0000
30+++ include/unity/shell/application/MirMousePointerInterface.h 2016-05-18 20:52:24 +0000
31@@ -1,5 +1,5 @@
32 /*
33- * Copyright (C) 2015 Canonical, Ltd.
34+ * Copyright (C) 2015-2016 Canonical, Ltd.
35 *
36 * This program is free software: you can redistribute it and/or modify it under
37 * the terms of the GNU Lesser General Public License version 3, as published by
38@@ -42,17 +42,6 @@
39 */
40 Q_PROPERTY(QString themeName READ themeName NOTIFY themeNameChanged)
41
42- /**
43- * @brief X coordinate of the cursor hotspot
44- * Is value depends on the current cursor name and theme
45- */
46- Q_PROPERTY(qreal hotspotX READ hotspotX NOTIFY hotspotXChanged)
47-
48- /**
49- * @brief Y coordinate of the cursor hotspot
50- * Is value depends on the current cursor name and theme
51- */
52- Q_PROPERTY(qreal hotspotY READ hotspotY NOTIFY hotspotYChanged)
53 public:
54 /**
55 * @brief The constructor
56@@ -65,9 +54,6 @@
57
58 virtual void setThemeName(const QString &themeName) = 0;
59 virtual QString themeName() const = 0;
60-
61- virtual qreal hotspotX() const = 0;
62- virtual qreal hotspotY() const = 0;
63 /// @endcond
64
65 /**
66@@ -83,8 +69,6 @@
67 /// @cond
68 void cursorNameChanged(QString name);
69 void themeNameChanged(QString name);
70- void hotspotXChanged(qreal value);
71- void hotspotYChanged(qreal value);
72 /// @endcond
73
74 public Q_SLOTS:

Subscribers

People subscribed via source and target branches

to all changes: