82c2455 · unity8 · git.iko.soy

git.iko.soy/unity8

Merge

commit82c2455d795c66a50709dca59c3ae11ae023be02 authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 18 Nov 2015, 10:34 (11 years ago) parent9cea78e ff872db

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

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

3838 return m_filterTag;

3939}

4040

41+QString FakeOptionSelectorFilter::title() const

42+{

43+ return m_title;

44+}

45+

4146QString FakeOptionSelectorFilter::label() const

4247{

4348 return m_label;

tests/mocks/Unity/fake_optionselectorfilter.h+2

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

2828

2929 QString filterId() const override;

3030 QString filterTag() const override;

31+ QString title() const override;

3132 QString label() const override;

3233 bool multiSelect() const override;

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

@@ -35,6 +36,7 @@ public:

3536private:

3637 QString m_filterId;

3738 QString m_filterTag;

39+ QString m_title;

3840 QString m_label;

3941 bool m_multiSelect;

4042 unity::shell::scopes::OptionSelectorOptionsInterface* m_options;