59db258 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Depend on scopes api 3

59db258Albert Astals12 years ago

tests/mocks/Unity/CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -6,7 +6,7 @@ add_subdirectory(Notifications)

6pkg_search_module(DEE dee-1.0 REQUIRED)

7pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

8pkg_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)

11include_directories(

12 ${CMAKE_CURRENT_BINARY_DIR}

tests/mocks/Unity/fake_scopes.h+1−9

@@ -32,9 +32,6 @@ class Scopes : public unity::shell::scopes::ScopesInterface

32{

33 Q_OBJECT

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−

38public:

35public:

39 explicit Scopes(QObject *parent = 0);

36 explicit Scopes(QObject *parent = 0);

40 ~Scopes();

37 ~Scopes();

@@ -53,17 +50,12 @@ public:

53 QModelIndex parent ( const QModelIndex & index ) const;

50 QModelIndex parent ( const QModelIndex & index ) const;

55 bool loaded() const override;

52 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;

59 // This is used as part of implementation of the other C++ code, not API

55 // This is used as part of implementation of the other C++ code, not API

60 QList<unity::shell::scopes::ScopeInterface *> scopes(bool onlyVisible) const;

56 QList<unity::shell::scopes::ScopeInterface *> scopes(bool onlyVisible) const;

61 unity::shell::scopes::ScopeInterface* getScopeFromAll(const QString& scope_id) const;

57 unity::shell::scopes::ScopeInterface* getScopeFromAll(const QString& scope_id) const;

63−Q_SIGNALS:

64− // TODO Remove and depend on lp:~unity-team/unity-api/scopes-v3

65− void overviewScopeChanged();

66−

67private Q_SLOTS:

59private Q_SLOTS:

68 void updateScopes();

60 void updateScopes();