2d05265 · unity8 · git.iko.soy

git.iko.soy/unity8

rolenames come from interface

commit2d052652da143e3469665de9cdba3b4f0bd42191 authorAlbert Astals <albert.astals@canonical.com> dateTue 13 May 2014, 16:05 (12 years ago) parent11dfaf4

12 files changed−87

compare with xenial

unifiedsplit

tests/mocks/Unity/fake_categories.cpp−22

@@ -25,22 +25,6 @@ Categories::Categories(int category_count, QObject* parent)

2525 : m_category_count(category_count)

2626{

2727 setParent(parent);

28−

29− m_roles[Categories::RoleCategoryId] = "categoryId";

30− m_roles[Categories::RoleName] = "name";

31− m_roles[Categories::RoleIcon] = "icon";

32− m_roles[Categories::RoleRawRendererTemplate] = "rawRendererTemplate";

33− m_roles[Categories::RoleRenderer] = "renderer";

34− m_roles[Categories::RoleComponents] = "components";

35− m_roles[Categories::RoleProgressSource] = "progressSource";

36− m_roles[Categories::RoleResults] = "results";

37− m_roles[Categories::RoleCount] = "count";

38−}

39−

40−QHash<int, QByteArray>

41−Categories::roleNames() const

42−{

43− return m_roles;

4428}

4529

4630int Categories::rowCount(const QModelIndex& /*parent*/) const

@@ -127,9 +111,6 @@ Categories::data(const QModelIndex& index, int role) const

127111 map["title"] = "HOLA";

128112 return map;

129113 }

130− case RoleProgressSource:

131− qFatal("Using un-implemented RoleProgressSource Categories role");

132− return QVariant();

133114 case RoleResults:

134115 return QVariant();

135116 case RoleCount:

@@ -165,9 +146,6 @@ Categories::data(const QModelIndex& index, int role) const

165146 map["title"] = "HOLA";

166147 return map;

167148 }

168− case RoleProgressSource:

169− qFatal("Using un-implemented RoleProgressSource Categories role");

170− return QVariant();

171149 case RoleResults:

172150 return QVariant::fromValue(resultsModel);

173151 case RoleCount:

tests/mocks/Unity/fake_categories.h−2

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

3232 Categories(int category_count, QObject* parent = 0);

3333

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

35− QHash<int, QByteArray> roleNames() const override;

3635 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

3736

3837 Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;

@@ -43,7 +42,6 @@ private Q_SLOTS:

4342

4443private:

4544 mutable QHash<int, ResultsModel*> m_resultsModels;

46− QHash<int, QByteArray> m_roles;

4745 int m_category_count;

4846

4947 struct CategoryData {

tests/mocks/Unity/fake_previewmodel.cpp−9

@@ -36,15 +36,6 @@ PreviewModel::PreviewModel(QObject* parent)

3636 m_previewWidgetModels.append(columnModel);

3737}

3838

39−QHash<int, QByteArray> PreviewModel::roleNames() const

40−{

41− QHash<int, QByteArray> roles;

42−

43− roles[Roles::RoleColumnModel] = "columnModel";

44−

45− return roles;

46−}

47−

4839void PreviewModel::setWidgetColumnCount(int count)

4940{

5041 if (count != 1) {

tests/mocks/Unity/fake_previewmodel.h−2

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

3333 explicit PreviewModel(QObject* parent = 0);

3434

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

36− QHash<int, QByteArray> roleNames() const override;

3736 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

3837

3938 void setWidgetColumnCount(int count) override;

@@ -43,7 +42,6 @@ public:

4342 void setProcessingAction(bool processing);

4443

4544private:

46− QHash<int, QByteArray> m_roles;

4745 QList<PreviewWidgetModel*> m_previewWidgetModels;

4846};

4947

tests/mocks/Unity/fake_previewstack.cpp−9

@@ -32,15 +32,6 @@ PreviewStack::~PreviewStack()

3232{

3333}

3434

35−QHash<int, QByteArray> PreviewStack::roleNames() const

36−{

37− QHash<int, QByteArray> roles;

38−

39− roles[Roles::RolePreviewModel] = "previewModel";

40−

41− return roles;

42−}

43−

4435void PreviewStack::setWidgetColumnCount(int columnCount)

4536{

4637 if (columnCount != 1) {

tests/mocks/Unity/fake_previewstack.h−1

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

3434 virtual ~PreviewStack();

3535

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

37− QHash<int, QByteArray> roleNames() const override;

3837 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

3938

4039 Q_INVOKABLE unity::shell::scopes::PreviewModelInterface* get(int index) const override;

tests/mocks/Unity/fake_previewwidgetmodel.cpp−9

@@ -39,10 +39,6 @@ PreviewWidgetModel::PreviewWidgetModel(QObject* parent)

3939{

4040 setParent(parent);

4141

42− m_roles[Roles::RoleWidgetId] = "widgetId";

43− m_roles[Roles::RoleType] = "type";

44− m_roles[Roles::RoleProperties] = "properties";

45−

4642 populateWidgets();

4743}

4844

@@ -62,11 +58,6 @@ void PreviewWidgetModel::populateWidgets()

6258

6359}

6460

65−QHash<int, QByteArray> PreviewWidgetModel::roleNames() const

66−{

67− return m_roles;

68−}

69−

7061int PreviewWidgetModel::rowCount(const QModelIndex&) const

7162{

7263 return m_previewWidgets.size();

tests/mocks/Unity/fake_previewwidgetmodel.h−2

@@ -33,11 +33,9 @@ public:

3333 explicit PreviewWidgetModel(QObject* parent = 0);

3434

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

36− QHash<int, QByteArray> roleNames() const override;

3736 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

3837

3938private:

40− QHash<int, QByteArray> m_roles;

4139 QList<QSharedPointer<PreviewData>> m_previewWidgets;

4240

4341 void populateWidgets();

tests/mocks/Unity/fake_resultsmodel.cpp−17

@@ -27,17 +27,6 @@ ResultsModel::ResultsModel(int result_count, int categoryId, QObject* parent)

2727 , m_categoryId(categoryId)

2828{

2929 setParent(parent);

30−

31− m_roles[ResultsModel::RoleUri] = "uri";

32− m_roles[ResultsModel::RoleCategoryId] = "categoryId";

33− m_roles[ResultsModel::RoleDndUri] = "dndUri";

34− m_roles[ResultsModel::RoleResult] = "result";

35− m_roles[ResultsModel::RoleTitle] = "title";

36− m_roles[ResultsModel::RoleArt] = "art";

37− m_roles[ResultsModel::RoleSubtitle] = "subtitle";

38− m_roles[ResultsModel::RoleMascot] = "mascot";

39− m_roles[ResultsModel::RoleEmblem] = "emblem";

40− m_roles[ResultsModel::RoleSummary] = "summary";

4130}

4231

4332QString ResultsModel::categoryId() const

@@ -50,12 +39,6 @@ void ResultsModel::setCategoryId(QString const& /*id*/)

5039 qFatal("Calling un-implemented ResultsModel::setCategoryId");

5140}

5241

53−QHash<int, QByteArray>

54−ResultsModel::roleNames() const

55−{

56− return m_roles;

57−}

58−

5942int ResultsModel::rowCount(const QModelIndex& parent) const

6043{

6144 Q_UNUSED(parent);

tests/mocks/Unity/fake_resultsmodel.h−2

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

3131 explicit ResultsModel(int result_count, int categoryId, QObject* parent = 0);

3232

3333 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

34− QHash<int, QByteArray> roleNames() const override;

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

3635

3736 Q_INVOKABLE QVariant get(int row) const override;

@@ -44,7 +43,6 @@ public:

4443 void setCategoryId(QString const& id) override;

4544

4645private:

47− QHash<int, QByteArray> m_roles;

4846 int m_result_count;

4947 int m_categoryId;

5048};

tests/mocks/Unity/fake_scopes.cpp−10

@@ -29,11 +29,6 @@ Scopes::Scopes(QObject *parent) : m_loaded(false)

2929{

3030 setParent(parent);

3131

32− m_roles[Scopes::RoleScope] = "scope";

33− m_roles[Scopes::RoleId] = "id";

34− m_roles[Scopes::RoleVisible] = "visible";

35− m_roles[Scopes::RoleTitle] = "title";

36−

3732 QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

3833 QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

3934 QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));

@@ -83,11 +78,6 @@ void Scopes::load()

8378 timer.start();

8479}

8580

86−QHash<int, QByteArray> Scopes::roleNames() const

87−{

88− return m_roles;

89−}

90−

9181int Scopes::rowCount(const QModelIndex&) const

9282{

9383 return m_scopes.count();

tests/mocks/Unity/fake_scopes.h−2

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

4747 Q_INVOKABLE void load();

4848

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

50− QHash<int, QByteArray> roleNames() const;

5150 QModelIndex parent ( const QModelIndex & index ) const;

5251

5352 bool loaded() const override;

@@ -62,7 +61,6 @@ private Q_SLOTS:

6261

6362private:

6463 QList<Scope*> m_scopes;

65− QHash<int, QByteArray> m_roles;

6664 bool m_loaded;

6765 QTimer timer;

6866};