git.iko.soy/unity8
on xenial help sign in
Adapt to unity-api changes
commit18409e472af4b7ccd8d855246e0ed297732eb3ed authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 14 Oct 2015, 14:46 (11 years ago) parent58dc51a
6 files changed+7−18
compare with xenial
unifiedsplit
tests/mocks/Unity/fake_categories.cpp−5 tests/mocks/Unity/fake_categories.h−1 tests/mocks/Unity/fake_scope.cpp+5 tests/mocks/Unity/fake_scope.h+2 tests/mocks/Unity/fake_scopesoverview.cpp−10 tests/mocks/Unity/fake_scopesoverview.h−2
tests/mocks/Unity/fake_categories.cpp−5
@@ -32,11 +32,6 @@ int Categories::rowCount(const QModelIndex& /*parent*/) const
3232 return m_category_count;
3333}
3434
35−void Categories::addSpecialCategory(QString const& /*categoryId*/, QString const& /*name*/, QString const& /*icon*/, QString const& /*rawTemplate*/, QObject* /*countObject*/)
36−{
37− qFatal("Using un-implemented Categories::addSpecialCategory");
38−}
39−
4035bool Categories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
4136{
4237 qFatal("Using un-implemented Categories::overrideCategoryJson");
tests/mocks/Unity/fake_categories.h−1
@@ -34,7 +34,6 @@ public:
3434 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
3535 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
3636
37− Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
3837 Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
3938
4039 Q_INVOKABLE QVariant data(int row, int role) const;
tests/mocks/Unity/fake_scope.cpp+5
@@ -271,6 +271,11 @@ void Scope::refresh()
271271 Q_EMIT refreshed();
272272}
273273
274+void Scope::activateAction(QVariant const& /*result*/, QString const& /*categoryId*/, QString const& /*actionId*/)
275+{
276+ qFatal("Using Scope::activateAction");
277+}
278+
274279unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)
275280{
276281 if (id.isEmpty())
tests/mocks/Unity/fake_scope.h+2
@@ -79,6 +79,8 @@ public:
7979
8080 Q_INVOKABLE void refresh() override;
8181
82+ Q_INVOKABLE virtual void activateAction(QVariant const& result, QString const& categoryId, QString const& actionId) override;
83+
8284Q_SIGNALS:
8385 // These are not in the Interface, here for testing benefits
8486 void refreshed();
tests/mocks/Unity/fake_scopesoverview.cpp−10
@@ -74,11 +74,6 @@ int ScopesOverviewCategories::rowCount(const QModelIndex& /*parent*/) const
7474 return 2;
7575}
7676
77−void ScopesOverviewCategories::addSpecialCategory(QString const&, QString const&, QString const&, QString const&, QObject*)
78−{
79− qFatal("Using un-implemented ScopesOverviewCategories::addSpecialCategory");
80−}
81−
8277bool ScopesOverviewCategories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
8378{
8479 qFatal("Using un-implemented ScopesOverviewCategories::overrideCategoryJson");
@@ -175,11 +170,6 @@ int ScopesOverviewSearchCategories::rowCount(const QModelIndex& /*parent*/) cons
175170 return 2;
176171}
177172
178−void ScopesOverviewSearchCategories::addSpecialCategory(QString const&, QString const&, QString const&, QString const&, QObject*)
179−{
180− qFatal("Using un-implemented ScopesOverviewSearchCategories::addSpecialCategory");
181−}
182−
183173bool ScopesOverviewSearchCategories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
184174{
185175 qFatal("Using un-implemented ScopesOverviewSearchCategories::overrideCategoryJson");
tests/mocks/Unity/fake_scopesoverview.h−2
@@ -53,7 +53,6 @@ public:
5353 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
5454 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
5555
56− Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
5756 Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
5857
5958 // This is implementation detail
@@ -76,7 +75,6 @@ public:
7675 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
7776 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
7877
79− Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
8078 Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
8179
8280private: