git.iko.soy/unity8
on xenial help sign in
Don't steal QClassName from Qt
7554dc7Albert Astals
tests/plugins/DashViews/horizontaljournaltest.cpp+5−5
compare with xenial
unifiedsplit
@@ -30,7 +30,7 @@
30
30
31#include "horizontaljournal.h"
31#include "horizontaljournal.h"
32
32
33−class QWidthModel : public QAbstractListModel {
33+class WidthModel : public QAbstractListModel {
34public:
34public:
35 QHash<int, QByteArray> roleNames() const
35 QHash<int, QByteArray> roleNames() const
36 {
36 {
@@ -125,7 +125,7 @@ private Q_SLOTS:
125 view->setResizeMode(QQuickView::SizeRootObjectToView);
125 view->setResizeMode(QQuickView::SizeRootObjectToView);
126 view->engine()->addImportPath(BUILT_PLUGINS_DIR);
126 view->engine()->addImportPath(BUILT_PLUGINS_DIR);
127
127
128− model = new QWidthModel();
128+ model = new WidthModel();
129 QStringList heightList;
129 QStringList heightList;
130 heightList << "100" << "50" << "125" << "10" << "40" << "70" << "200" << "110" << "160" << "20" << "20" << "65" << "80" << "200" << "300" << "130" << "400" << "300" << "500" << "10";
130 heightList << "100" << "50" << "125" << "10" << "40" << "70" << "200" << "110" << "160" << "20" << "20" << "65" << "80" << "200" << "300" << "130" << "400" << "300" << "500" << "10";
131 model->setStringList(heightList);
131 model->setStringList(heightList);
@@ -314,7 +314,7 @@ private Q_SLOTS:
314
314
315 void testChangeModel()
315 void testChangeModel()
316 {
316 {
317− QWidthModel *model2 = new QWidthModel();
317+ WidthModel *model2 = new WidthModel();
318 QStringList list2;
318 QStringList list2;
319 list2 << "100" << "50" << "125" << "25" << "50" << "50";
319 list2 << "100" << "50" << "125" << "25" << "50" << "50";
320 model2->setStringList(list2);
320 model2->setStringList(list2);
@@ -385,7 +385,7 @@ private Q_SLOTS:
385
385
386 void testModelAppendRemoveLast()
386 void testModelAppendRemoveLast()
387 {
387 {
388− QWidthModel *model2 = new QWidthModel();
388+ WidthModel *model2 = new WidthModel();
389 QStringList heightList;
389 QStringList heightList;
390 heightList << "100" << "50" << "125" << "25" << "50" << "50";
390 heightList << "100" << "50" << "125" << "25" << "50" << "50";
391 model2->setStringList(heightList);
391 model2->setStringList(heightList);
@@ -457,7 +457,7 @@ private Q_SLOTS:
457private:
457private:
458 QQuickView *view;
458 QQuickView *view;
459 HorizontalJournal *hj;
459 HorizontalJournal *hj;
460− QWidthModel *model;
460+ WidthModel *model;
461};
461};
462
462
463QTEST_MAIN(HorizontalJournalTest)
463QTEST_MAIN(HorizontalJournalTest)
tests/plugins/DashViews/verticaljournaltest.cpp+5−5
@@ -30,7 +30,7 @@
30
30
31#include "verticaljournal.h"
31#include "verticaljournal.h"
32
32
33−class QHeightModel : public QAbstractListModel {
33+class HeightModel : public QAbstractListModel {
34public:
34public:
35 QHash<int, QByteArray> roleNames() const
35 QHash<int, QByteArray> roleNames() const
36 {
36 {
@@ -127,7 +127,7 @@ private Q_SLOTS:
127 view->setResizeMode(QQuickView::SizeRootObjectToView);
127 view->setResizeMode(QQuickView::SizeRootObjectToView);
128 view->engine()->addImportPath(BUILT_PLUGINS_DIR);
128 view->engine()->addImportPath(BUILT_PLUGINS_DIR);
129
129
130− model = new QHeightModel();
130+ model = new HeightModel();
131 QStringList heightList;
131 QStringList heightList;
132 heightList << "100" << "50" << "125" << "10" << "40" << "70" << "200" << "110" << "160" << "20" << "20" << "65" << "80" << "200" << "300" << "130" << "400" << "300" << "500" << "10";
132 heightList << "100" << "50" << "125" << "10" << "40" << "70" << "200" << "110" << "160" << "20" << "20" << "65" << "80" << "200" << "300" << "130" << "400" << "300" << "500" << "10";
133 model->setStringList(heightList);
133 model->setStringList(heightList);
@@ -323,7 +323,7 @@ private Q_SLOTS:
323
323
324 void testChangeModel()
324 void testChangeModel()
325 {
325 {
326− QHeightModel *model2 = new QHeightModel();
326+ HeightModel *model2 = new HeightModel();
327 QStringList list2;
327 QStringList list2;
328 list2 << "100" << "50" << "25" << "25" << "50" << "50";
328 list2 << "100" << "50" << "25" << "25" << "50" << "50";
329 model2->setStringList(list2);
329 model2->setStringList(list2);
@@ -393,7 +393,7 @@ private Q_SLOTS:
393
393
394 void testModelAppendRemoveLast()
394 void testModelAppendRemoveLast()
395 {
395 {
396− QHeightModel *model2 = new QHeightModel();
396+ HeightModel *model2 = new HeightModel();
397 QStringList list2;
397 QStringList list2;
398 list2 << "100" << "50" << "25" << "25" << "50" << "50";
398 list2 << "100" << "50" << "25" << "25" << "50" << "50";
399 model2->setStringList(list2);
399 model2->setStringList(list2);
@@ -462,7 +462,7 @@ private Q_SLOTS:
462private:
462private:
463 QQuickView *view;
463 QQuickView *view;
464 VerticalJournal *vj;
464 VerticalJournal *vj;
465− QHeightModel *model;
465+ HeightModel *model;
466};
466};
467
467
468QTEST_MAIN(VerticalJournalTest)
468QTEST_MAIN(VerticalJournalTest)