d84d749 · unity8 · git.iko.soy

git.iko.soy/unity8

Add missing nameOwner property to mock UnityMenuModel.

Approved by: Michael Terry

commitd84d749333b79987a1b62ec3030b0c8fd476bdec authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 21 Jul 2014, 14:56 (12 years ago) parent3d29c69 ca26e98

2 files changed+9

compare with xenial

unifiedsplit

tests/mocks/QMenuModel/unitymenumodel.cpp+5 tests/mocks/QMenuModel/unitymenumodel.h+4

tests/mocks/QMenuModel/unitymenumodel.cpp+5

@@ -126,6 +126,11 @@ void UnityMenuModel::setActionStateParser(ActionStateParser*)

126126{

127127}

128128

129+QString UnityMenuModel::nameOwner() const

130+{

131+ return QString("");

132+}

133+

129134int UnityMenuModel::rowCount(const QModelIndex&) const

130135{

131136 return m_modelData.count();

tests/mocks/QMenuModel/unitymenumodel.h+4

@@ -32,6 +32,7 @@ class Q_DECL_EXPORT UnityMenuModel : public QAbstractListModel

3232 Q_PROPERTY(QVariantMap actions READ actions WRITE setActions NOTIFY actionsChanged)

3333 Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged)

3434 Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged)

35+ Q_PROPERTY(QString nameOwner READ nameOwner NOTIFY nameOwnerChanged)

3536

3637public:

3738 UnityMenuModel(QObject *parent = NULL);

@@ -56,6 +57,8 @@ public:

5657 ActionStateParser* actionStateParser() const;

5758 void setActionStateParser(ActionStateParser* actionStateParser);

5859

60+ QString nameOwner() const;

61+

5962 int rowCount(const QModelIndex &parent = QModelIndex()) const;

6063 int columnCount(const QModelIndex &parent = QModelIndex()) const;

6164 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;

@@ -79,6 +82,7 @@ Q_SIGNALS:

7982 void menuObjectPathChanged();

8083 void actionStateParserChanged();

8184 void modelDataChanged();

85+ void nameOwnerChanged();

8286

8387private:

8488 QVariantMap rowData(int row) const;