f4852da · unity8 · git.iko.soy

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

compare with xenial

unifiedsplit

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

65 return m_searching;

66}

67

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

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

69 return m_categories;

70}

71

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

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

41 bool visible() const override;

42 QString shortcut() const override;

43 bool searchInProgress() const override;

44− Categories* categories() const override;

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

45 QString searchQuery() const override;

46 QString noResultsHint() const override;

47 QString formFactor() const override;

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

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

41

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

43 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.");

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

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

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