git.iko.soy/unity8
on xenial help sign in
Depend on scopes api 3
commit59db2586bb99c5a9bccb0fefab97bf7c40999154 authorAlbert Astals <albert.astals@canonical.com> dateFri 18 Jul 2014, 16:32 (12 years ago) parent7fe84b9
2 files changed+2−10
compare with xenial
unifiedsplit
tests/mocks/Unity/CMakeLists.txt+1−1 tests/mocks/Unity/fake_scopes.h+1−9
tests/mocks/Unity/CMakeLists.txt+1−1
@@ -6,7 +6,7 @@ add_subdirectory(Notifications)
66pkg_search_module(DEE dee-1.0 REQUIRED)
77pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
88pkg_search_module(DEEQT libdee-qt5 REQUIRED)
9−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=2)
9+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)
1010
1111include_directories(
1212 ${CMAKE_CURRENT_BINARY_DIR}
tests/mocks/Unity/fake_scopes.h+1−9
@@ -32,9 +32,6 @@ class Scopes : public unity::shell::scopes::ScopesInterface
3232{
3333 Q_OBJECT
3434
35− // TODO Remove and depend on lp:~unity-team/unity-api/scopes-v3
36− Q_PROPERTY(unity::shell::scopes::ScopeInterface* overviewScope READ overviewScope NOTIFY overviewScopeChanged)
37−
3835public:
3936 explicit Scopes(QObject *parent = 0);
4037 ~Scopes();
@@ -53,17 +50,12 @@ public:
5350 QModelIndex parent ( const QModelIndex & index ) const;
5451
5552 bool loaded() const override;
56− // TODO Add override when dependin on lp:~unity-team/unity-api/scopes-v3
57− unity::shell::scopes::ScopeInterface* overviewScope() const;
53+ unity::shell::scopes::ScopeInterface* overviewScope() const override;
5854
5955 // This is used as part of implementation of the other C++ code, not API
6056 QList<unity::shell::scopes::ScopeInterface *> scopes(bool onlyVisible) const;
6157 unity::shell::scopes::ScopeInterface* getScopeFromAll(const QString& scope_id) const;
6258
63−Q_SIGNALS:
64− // TODO Remove and depend on lp:~unity-team/unity-api/scopes-v3
65− void overviewScopeChanged();
66−
6759private Q_SLOTS:
6860 void updateScopes();
6961