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

[Paweł Stołowski]

Added Scopes::closeScope abstract method.

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

[Albert Astals Cid (aacid)]

Looks good.

review: Approve

[Albert Astals Cid (aacid)]

Actually doesn't even build :D

review: Needs Fixing

[lp:~stolowski/unity-api/scopes-close-scope]

168. By Paweł Stołowski on 2015-02-12

Ups, added closeScope method to the mock.

[Albert Astals Cid (aacid)]

review: Approve

[lp:~stolowski/unity-api/scopes-close-scope]

169. By Paweł Stołowski on 2015-02-12

Merged trunk

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-11 16:28:29 +0000
+++ debian/changelog	2015-02-12 17:18:49 +0000
@@ -1,3 +1,9 @@
+unity-api (7.96-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Added close method to scopes interface.
+
+ -- Pawel Stolowski <pawel@mordor>  Thu, 12 Feb 2015 18:17:42 +0100
+
 unity-api (7.95+15.04.20150211-0ubuntu1) vivid; urgency=medium
 
   [ Michael Zanetti ]
 
=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
--- include/unity/shell/scopes/CMakeLists.txt	2014-10-20 20:45:26 +0000
+++ include/unity/shell/scopes/CMakeLists.txt	2015-02-12 17:18:49 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 5)
+set(VERSION 6)
 set(PKGCONFIG_NAME "unity-shell-scopes")
 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")
 
=== modified file 'include/unity/shell/scopes/ScopesInterface.h'
--- include/unity/shell/scopes/ScopesInterface.h	2014-10-22 15:23:38 +0000
+++ include/unity/shell/scopes/ScopesInterface.h	2015-02-12 17:18:49 +0000
@@ -112,6 +112,8 @@
     }
     // @endcond
 
+    Q_INVOKABLE virtual void closeScope(unity::shell::scopes::ScopeInterface* scope) = 0;
+
 Q_SIGNALS:
     // @cond
     void loadedChanged();
 
=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp	2014-10-22 16:30:55 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp	2015-02-12 17:18:49 +0000
@@ -92,3 +92,8 @@
 {
     // Unimplemented
 }
+
+void MockScopes::closeScope(unity::shell::scopes::ScopeInterface*)
+{
+    // Unimplemented
+}
 
=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h	2014-10-22 15:49:26 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h	2015-02-12 17:18:49 +0000
@@ -36,6 +36,7 @@
 
     Q_INVOKABLE unity::shell::scopes::ScopeInterface* getScope(int row) const override;
     Q_INVOKABLE unity::shell::scopes::ScopeInterface* getScope(const QString& scope_id) const override;
+    Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;