4b871f2 · unity8 · git.iko.soy

git.iko.soy/unity8

Merge

commit4b871f2523dc71820af787742724543b4f0cff3d authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 18 Nov 2015, 10:35 (11 years ago) parent5efcb1d c0bf7c8

2 files changed+7

compare with xenial

unifiedsplit

tests/mocks/Unity/fake_optionselectorfilter.cpp+5 tests/mocks/Unity/fake_optionselectorfilter.h+2

tests/mocks/Unity/fake_optionselectorfilter.cpp+5

@@ -39,6 +39,11 @@ QString FakeOptionSelectorFilter::filterTag() const

3939 return m_filterTag;

4040}

4141

42+QString FakeOptionSelectorFilter::title() const

43+{

44+ return m_title;

45+}

46+

4247QString FakeOptionSelectorFilter::label() const

4348{

4449 return m_label;

tests/mocks/Unity/fake_optionselectorfilter.h+2

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

3030

3131 QString filterId() const override;

3232 QString filterTag() const override;

33+ QString title() const override;

3334 QString label() const override;

3435 bool multiSelect() const override;

3536 unity::shell::scopes::OptionSelectorOptionsInterface* options() const override;

@@ -42,6 +43,7 @@ Q_SIGNALS:

4243private:

4344 QString m_filterId;

4445 QString m_filterTag;

46+ QString m_title;

4547 QString m_label;

4648 bool m_multiSelect;

4749 FakeOptionSelectorOptions* m_options;