Unity API

Merge lp:~stolowski/unity-api/scopes-close-scope into lp:unity-api

  1. scopes-close-scope
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 168
Merged at revision: 169
Proposed branch: lp:~stolowski/unity-api/scopes-close-scope
Merge into: lp:unity-api
Diff against target: 63 lines (+15/-1)
5 files modified
debian/changelog (+6/-0)
include/unity/shell/scopes/CMakeLists.txt (+1/-1)
include/unity/shell/scopes/ScopesInterface.h (+2/-0)
test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp (+5/-0)
test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h (+1/-0)
To merge this branch: bzr merge lp:~stolowski/unity-api/scopes-close-scope
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Review via email: mp+248725@code.launchpad.net

Commit message

Added Scopes::closeScope abstract method.

Description of the change

Added Scopes::closeScope abstract method. See https://code.launchpad.net/~stolowski/unity-scopes-shell/fix-temp-scopes/+merge/248235

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good.

review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

Actually doesn't even build :D

review: Needs Fixing
lp:~stolowski/unity-api/scopes-close-scope updated
168. By Paweł Stołowski

Ups, added closeScope method to the mock.

Revision history for this message
Albert Astals Cid (aacid) :
review: Approve
lp:~stolowski/unity-api/scopes-close-scope updated
169. By Paweł Stołowski

Merged trunk

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 2015-02-11 16:28:29 +0000
3+++ debian/changelog 2015-02-12 17:18:49 +0000
4@@ -1,3 +1,9 @@
5+unity-api (7.96-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Added close method to scopes interface.
8+
9+ -- Pawel Stolowski <pawel@mordor> Thu, 12 Feb 2015 18:17:42 +0100
10+
11 unity-api (7.95+15.04.20150211-0ubuntu1) vivid; urgency=medium
12
13 [ Michael Zanetti ]
14
15=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
16--- include/unity/shell/scopes/CMakeLists.txt 2014-10-20 20:45:26 +0000
17+++ include/unity/shell/scopes/CMakeLists.txt 2015-02-12 17:18:49 +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 5)
23+set(VERSION 6)
24 set(PKGCONFIG_NAME "unity-shell-scopes")
25 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
26 set(PKGCONFIG_REQUIRES "Qt5Core")
27
28=== modified file 'include/unity/shell/scopes/ScopesInterface.h'
29--- include/unity/shell/scopes/ScopesInterface.h 2014-10-22 15:23:38 +0000
30+++ include/unity/shell/scopes/ScopesInterface.h 2015-02-12 17:18:49 +0000
31@@ -112,6 +112,8 @@
32 }
33 // @endcond
34
35+ Q_INVOKABLE virtual void closeScope(unity::shell::scopes::ScopeInterface* scope) = 0;
36+
37 Q_SIGNALS:
38 // @cond
39 void loadedChanged();
40
41=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp'
42--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp 2014-10-22 16:30:55 +0000
43+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp 2015-02-12 17:18:49 +0000
44@@ -92,3 +92,8 @@
45 {
46 // Unimplemented
47 }
48+
49+void MockScopes::closeScope(unity::shell::scopes::ScopeInterface*)
50+{
51+ // Unimplemented
52+}
53
54=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h'
55--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h 2014-10-22 15:49:26 +0000
56+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h 2015-02-12 17:18:49 +0000
57@@ -36,6 +36,7 @@
58
59 Q_INVOKABLE unity::shell::scopes::ScopeInterface* getScope(int row) const override;
60 Q_INVOKABLE unity::shell::scopes::ScopeInterface* getScope(const QString& scope_id) const override;
61+ Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
62
63 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
64

Subscribers

People subscribed via source and target branches

to all changes: