c0bf7c8 · unity8 · git.iko.soy

on xenial help sign in

Merge

c0bf7c8Albert Astals Cid11 years ago

tests/mocks/Unity/fake_optionselectorfilter.cpp+5

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

39 return m_filterTag;

40}

42+QString FakeOptionSelectorFilter::title() const

43+{

44+ return m_title;

45+}

46+

42QString FakeOptionSelectorFilter::label() const

47QString FakeOptionSelectorFilter::label() const

43{

48{

44 return m_label;

49 return m_label;

tests/mocks/Unity/fake_optionselectorfilter.h+2

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

31 QString filterId() const override;

32 QString filterTag() const override;

33+ QString title() const override;

33 QString label() const override;

34 QString label() const override;

34 bool multiSelect() const override;

35 bool multiSelect() const override;

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

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

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

42private:

43private:

43 QString m_filterId;

44 QString m_filterId;

44 QString m_filterTag;

45 QString m_filterTag;

46+ QString m_title;

45 QString m_label;

47 QString m_label;

46 bool m_multiSelect;

48 bool m_multiSelect;

47 FakeOptionSelectorOptions* m_options;

49 FakeOptionSelectorOptions* m_options;