82c2455 · unity8 · git.iko.soy

on xenial help sign in

Merge

82c2455Albert Astals Cid11 years ago

tests/mocks/Unity/fake_optionselectorfilter.cpp+5

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

38 return m_filterTag;

39}

41+QString FakeOptionSelectorFilter::title() const

42+{

43+ return m_title;

44+}

45+

41QString FakeOptionSelectorFilter::label() const

46QString FakeOptionSelectorFilter::label() const

42{

47{

43 return m_label;

48 return m_label;

tests/mocks/Unity/fake_optionselectorfilter.h+2

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

29 QString filterId() const override;

30 QString filterTag() const override;

31+ QString title() const override;

31 QString label() const override;

32 QString label() const override;

32 bool multiSelect() const override;

33 bool multiSelect() const override;

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

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

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

35private:

36private:

36 QString m_filterId;

37 QString m_filterId;

37 QString m_filterTag;

38 QString m_filterTag;

39+ QString m_title;

38 QString m_label;

40 QString m_label;

39 bool m_multiSelect;

41 bool m_multiSelect;

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

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