f4852da · unity8 · git.iko.soy

git.iko.soy/unity8

Fixes

commitf4852da97904cd04a0c525bbef1d70d2a890dae0 authorAlbert Astals <albert.astals@canonical.com> dateMon 12 May 2014, 18:10 (12 years ago) parent86529e6

3 files changed+3−3

compare with xenial

unifiedsplit

tests/mocks/Unity/fake_scope.cpp+1−1 tests/mocks/Unity/fake_scope.h+1−1 tests/mocks/Unity/fake_unity_plugin.cpp+1−1

tests/mocks/Unity/fake_scope.cpp+1−1

@@ -65,7 +65,7 @@ bool Scope::searchInProgress() const {

6565 return m_searching;

6666}

6767

68−Categories* Scope::categories() const {

68+unity::shell::scopes::CategoriesInterface* Scope::categories() const {

6969 return m_categories;

7070}

7171

tests/mocks/Unity/fake_scope.h+1−1

@@ -41,7 +41,7 @@ public:

4141 bool visible() const override;

4242 QString shortcut() const override;

4343 bool searchInProgress() const override;

44− Categories* categories() const override;

44+ unity::shell::scopes::CategoriesInterface* categories() const override;

4545 QString searchQuery() const override;

4646 QString noResultsHint() const override;

4747 QString formFactor() const override;

tests/mocks/Unity/fake_unity_plugin.cpp+1−1

@@ -41,7 +41,7 @@ void FakeUnityPlugin::registerTypes(const char *uri)

4141

4242 qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");

4343 qmlRegisterType<Scope>(uri, 0, 2, "Scope");

44− qmlRegisterUncreatableType<Categories>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");

44+ qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");

4545 qmlRegisterUncreatableType<ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create ResultsModel object in QML.");

4646 qmlRegisterType<PreviewModel>(uri, 0, 2, "FakePreviewModel");

4747 qmlRegisterUncreatableType<PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");