1b437b8 · unity8 · git.iko.soy

git.iko.soy/unity8

Add the new property also to mocks

commit1b437b8549ac7ffc9b11d560e3c0cd76e3d2c7f2 authorMichal Hruby <michal.mhr@gmail.com> dateFri 20 Sep 2013, 13:11 (13 years ago) parent71e7a27

3 files changed+11−2

compare with xenial

unifiedsplit

plugins/Unity/scope.h+1−1 tests/mocks/Unity/fake_scope.cpp+6 tests/mocks/Unity/fake_scope.h+4−1

plugins/Unity/scope.h+1−1

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

4444 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

4545 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

4646 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)

4848 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

4949 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

5050 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

3030Scope::Scope(QObject* parent)

3131 : QObject(parent)

3232 , m_visible(false)

33+ , m_searching(false)

3334 , m_categories(new Categories(this))

3435 , m_results(new DeeListModel(this))

3536{

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

4445 , m_id(id)

4546 , m_name(name)

4647 , m_visible(visible)

48+ , m_searching(false)

4749 , m_categories(new Categories(this))

4850 , m_results(new DeeListModel(this))

4951{

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

8587 return true;

8688}

8789

90+bool Scope::searchInProgress() const {

91+ return m_searching;

92+}

93+

8894Categories* Scope::categories() const {

8995 return m_categories;

9096}

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

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

3232 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

3333 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

3434 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)

35+ Q_PROPERTY(bool searchInProgress READ searchInProgress NOTIFY searchInProgressChanged)

3536 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)

3637 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)

3738 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)

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

5455 bool visible() const;

5556 QString shortcut() const;

5657 bool connected() const;

58+ bool searchInProgress() const;

5759 Categories* categories() const;

5860 QString searchQuery() const;

5961 QString noResultsHint() const;

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

7880 void iconHintChanged(const QString&);

7981 void descriptionChanged(const QString&);

8082 void searchHintChanged(const QString&);

83+ void searchInProgressChanged();

8184 void visibleChanged(bool);

8285 void shortcutChanged(const QString&);

8386 void connectedChanged(bool);

8487 void categoriesChanged();

85− void searchFinished(const QString&);

8688 void searchQueryChanged();

8789 void noResultsHintChanged();

8890 void formFactorChanged();

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

101103 QString m_noResultsHint;

102104 QString m_formFactor;

103105 bool m_visible;

106+ bool m_searching;

104107

105108 Categories* m_categories;

106109 DeeListModel* m_results;