d84d749 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Add missing nameOwner property to mock UnityMenuModel.

d84d749Michał Sawicz12 years ago

tests/mocks/QMenuModel/unitymenumodel.cpp+5

compare with xenial

unifiedsplit

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

126{

127}

128

129+QString UnityMenuModel::nameOwner() const

130+{

131+ return QString("");

132+}

133+

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

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

130{

135{

131 return m_modelData.count();

136 return m_modelData.count();

tests/mocks/QMenuModel/unitymenumodel.h+4

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

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

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

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

35+ Q_PROPERTY(QString nameOwner READ nameOwner NOTIFY nameOwnerChanged)

36public:

37public:

37 UnityMenuModel(QObject *parent = NULL);

38 UnityMenuModel(QObject *parent = NULL);

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

56 ActionStateParser* actionStateParser() const;

57 ActionStateParser* actionStateParser() const;

57 void setActionStateParser(ActionStateParser* actionStateParser);

58 void setActionStateParser(ActionStateParser* actionStateParser);

60+ QString nameOwner() const;

61+

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

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

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

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

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

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

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

79 void menuObjectPathChanged();

82 void menuObjectPathChanged();

80 void actionStateParserChanged();

83 void actionStateParserChanged();

81 void modelDataChanged();

84 void modelDataChanged();

85+ void nameOwnerChanged();

83private:

87private:

84 QVariantMap rowData(int row) const;

88 QVariantMap rowData(int row) const;