1b437b8 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Add the new property also to mocks

1b437b8Michal Hruby13 years ago

plugins/Unity/scope.h+1−1

compare with xenial

unifiedsplit

@@ -44,7 +44,7 @@ class Scope : public QObject

44 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

45 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

46 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)

47− Q_PROPERTY(QString searchInProgress READ searchInProgress NOTIFY searchInProgressChanged)

47+ Q_PROPERTY(bool searchInProgress READ searchInProgress NOTIFY searchInProgressChanged)

48 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

49 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

50 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)

tests/mocks/Unity/fake_scope.cpp+6

@@ -30,6 +30,7 @@ static DeeModel* create_results_model(unsigned category_count, unsigned result_c

30Scope::Scope(QObject* parent)

31 : QObject(parent)

32 , m_visible(false)

33+ , m_searching(false)

33 , m_categories(new Categories(this))

34 , m_categories(new Categories(this))

34 , m_results(new DeeListModel(this))

35 , m_results(new DeeListModel(this))

35{

36{

@@ -44,6 +45,7 @@ Scope::Scope(QString const& id, QString const& name, bool visible, QObject* pare

44 , m_id(id)

45 , m_id(id)

45 , m_name(name)

46 , m_name(name)

46 , m_visible(visible)

47 , m_visible(visible)

48+ , m_searching(false)

47 , m_categories(new Categories(this))

49 , m_categories(new Categories(this))

48 , m_results(new DeeListModel(this))

50 , m_results(new DeeListModel(this))

49{

51{

@@ -85,6 +87,10 @@ bool Scope::connected() const {

85 return true;

87 return true;

86}

88}

90+bool Scope::searchInProgress() const {

91+ return m_searching;

92+}

93+

88Categories* Scope::categories() const {

94Categories* Scope::categories() const {

89 return m_categories;

95 return m_categories;

90}

96}

tests/mocks/Unity/fake_scope.h+4−1

@@ -32,6 +32,7 @@ class Scope : public QObject

32 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

33 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

34 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)

35+ Q_PROPERTY(bool searchInProgress READ searchInProgress NOTIFY searchInProgressChanged)

35 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

36 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

36 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

37 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

37 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)

38 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)

@@ -54,6 +55,7 @@ public:

54 bool visible() const;

55 bool visible() const;

55 QString shortcut() const;

56 QString shortcut() const;

56 bool connected() const;

57 bool connected() const;

58+ bool searchInProgress() const;

57 Categories* categories() const;

59 Categories* categories() const;

58 QString searchQuery() const;

60 QString searchQuery() const;

59 QString noResultsHint() const;

61 QString noResultsHint() const;

@@ -78,11 +80,11 @@ Q_SIGNALS:

78 void iconHintChanged(const QString&);

80 void iconHintChanged(const QString&);

79 void descriptionChanged(const QString&);

81 void descriptionChanged(const QString&);

80 void searchHintChanged(const QString&);

82 void searchHintChanged(const QString&);

83+ void searchInProgressChanged();

81 void visibleChanged(bool);

84 void visibleChanged(bool);

82 void shortcutChanged(const QString&);

85 void shortcutChanged(const QString&);

83 void connectedChanged(bool);

86 void connectedChanged(bool);

84 void categoriesChanged();

87 void categoriesChanged();

85− void searchFinished(const QString&);

86 void searchQueryChanged();

88 void searchQueryChanged();

87 void noResultsHintChanged();

89 void noResultsHintChanged();

88 void formFactorChanged();

90 void formFactorChanged();

@@ -101,6 +103,7 @@ protected:

101 QString m_noResultsHint;

103 QString m_noResultsHint;

102 QString m_formFactor;

104 QString m_formFactor;

103 bool m_visible;

105 bool m_visible;

106+ bool m_searching;

104

107

105 Categories* m_categories;

108 Categories* m_categories;

106 DeeListModel* m_results;

109 DeeListModel* m_results;