80cb348 · unity8 · git.iko.soy

git.iko.soy/unity8

Fix FTBFS when using latest unity-api.

Approved by: Michał Sawicz

commit80cb348c4f4184a483832a1e1804389393af5c0f authorMichal Hruby <michal.mhr@gmail.com> dateWed 9 Jul 2014, 19:43 (12 years ago) parentbed961f 22bd460

5 files changed+54−20

compare with xenial

unifiedsplit

debian/control+1−1 tests/mocks/Unity/CMakeLists.txt+1−1 tests/mocks/Unity/fake_categories.cpp+4 tests/mocks/Unity/fake_scope.cpp+46−18 tests/mocks/Unity/fake_scope.h+2

debian/control+1−1

@@ -19,7 +19,7 @@ Build-Depends: cmake,

1919 libpulse-dev,

2020 libqmenumodel-dev (>= 0.2.7),

2121 libqt5xmlpatterns5-dev,

22− libunity-api-dev (>= 7.83),

22+ libunity-api-dev (>= 7.85),

2323 libunity-mir-dev,

2424 libusermetricsoutput1-dev,

2525 libxcb1-dev,

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=1)

9+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=2)

1010

1111include_directories(

1212 ${CMAKE_CURRENT_BINARY_DIR}

tests/mocks/Unity/fake_categories.cpp+4

@@ -116,6 +116,8 @@ Categories::data(const QModelIndex& index, int role) const

116116 map["title"] = "HOLA";

117117 return map;

118118 }

119+ case RoleHeaderLink:

120+ return QString();

119121 case RoleResults:

120122 return QVariant();

121123 case RoleCount:

@@ -163,6 +165,8 @@ Categories::data(const QModelIndex& index, int role) const

163165 map["subtitle"] = "HOLA";

164166 return map;

165167 }

168+ case RoleHeaderLink:

169+ return QString();

166170 case RoleResults:

167171 return QVariant::fromValue(resultsModel);

168172 case RoleCount:

tests/mocks/Unity/fake_scope.cpp+46−18

@@ -35,87 +35,110 @@ Scope::Scope(QString const& id, QString const& name, bool visible, QObject* pare

3535{

3636}

3737

38−QString Scope::id() const {

38+QString Scope::id() const

39+{

3940 return m_id;

4041}

4142

42−QString Scope::name() const {

43+QString Scope::name() const

44+{

4345 return m_name;

4446}

4547

46−QString Scope::searchQuery() const {

48+QString Scope::searchQuery() const

49+{

4750 return m_searchQuery;

4851}

4952

50−QString Scope::iconHint() const {

53+QString Scope::iconHint() const

54+{

5155 return m_iconHint;

5256}

5357

54−QString Scope::description() const {

58+QString Scope::description() const

59+{

5560 return m_description;

5661}

5762

58−QString Scope::searchHint() const {

63+QString Scope::searchHint() const

64+{

5965 return QString("");

6066}

6167

62−QString Scope::shortcut() const {

68+QString Scope::shortcut() const

69+{

6370 return QString("");

6471}

6572

66−bool Scope::searchInProgress() const {

73+bool Scope::searchInProgress() const

74+{

6775 return m_searching;

6876}

6977

70−unity::shell::scopes::CategoriesInterface* Scope::categories() const {

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

79+{

7180 return m_categories;

7281}

7382

74−QString Scope::noResultsHint() const {

83+unity::shell::scopes::SettingsModelInterface* Scope::settings() const

84+{

85+ return nullptr;

86+}

87+

88+QString Scope::noResultsHint() const

89+{

7590 return m_noResultsHint;

7691}

7792

78−QString Scope::formFactor() const {

93+QString Scope::formFactor() const

94+{

7995 return m_formFactor;

8096}

8197

82−bool Scope::visible() const {

98+bool Scope::visible() const

99+{

83100 return m_visible;

84101}

85102

86−bool Scope::isActive() const {

103+bool Scope::isActive() const

104+{

87105 return m_isActive;

88106}

89107

90−void Scope::setSearchQuery(const QString &str) {

108+void Scope::setSearchQuery(const QString &str)

109+{

91110 if (str != m_searchQuery) {

92111 m_searchQuery = str;

93112 Q_EMIT searchQueryChanged();

94113 }

95114}

96115

97−void Scope::setFormFactor(const QString &str) {

116+void Scope::setFormFactor(const QString &str)

117+{

98118 if (str != m_formFactor) {

99119 m_formFactor = str;

100120 Q_EMIT formFactorChanged();

101121 }

102122}

103123

104−void Scope::setActive(const bool active) {

124+void Scope::setActive(const bool active)

125+{

105126 if (active != m_isActive) {

106127 m_isActive = active;

107128 Q_EMIT isActiveChanged();

108129 }

109130}

110131

111−void Scope::setSearchInProgress(const bool inProg) {

132+void Scope::setSearchInProgress(const bool inProg)

133+{

112134 if (inProg != m_searching) {

113135 m_searching = inProg;

114136 Q_EMIT searchInProgressChanged();

115137 }

116138}

117139

118−void Scope::setNoResultsHint(const QString& str) {

140+void Scope::setNoResultsHint(const QString& str)

141+{

119142 if (str != m_noResultsHint) {

120143 m_noResultsHint = str;

121144 Q_EMIT noResultsHintChanged();

@@ -182,3 +205,8 @@ void Scope::loadDepartment(const QString& id)

182205 m_currentDeparment = id;

183206 Q_EMIT currentDepartmentIdChanged();

184207}

208+

209+void Scope::performQuery(const QString& query)

210+{

211+ Q_UNUSED(query);

212+}

tests/mocks/Unity/fake_scope.h+2

@@ -46,6 +46,7 @@ public:

4646 QString noResultsHint() const override;

4747 QString formFactor() const override;

4848 bool isActive() const override;

49+ unity::shell::scopes::SettingsModelInterface* settings() const override;

4950

5051 /* setters */

5152 void setSearchQuery(const QString& search_query) override;

@@ -63,6 +64,7 @@ public:

6364 bool hasDepartments() const override;

6465 Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;

6566 Q_INVOKABLE void loadDepartment(const QString& id) override;

67+ Q_INVOKABLE void performQuery(const QString& query) override;

6668

6769 QVariantMap customizations() const override;

6870