git.iko.soy/unity8
on xenial help sign in
Don't steal QClassName from Qt
commit7554dc7486becb423582de9e2613a8ff134a8f68 authorAlbert Astals <albert.astals@canonical.com> dateFri 3 Jan 2014, 09:37 (13 years ago) parent2205d51
2 files changed+10−10
compare with xenial
unifiedsplit
tests/plugins/DashViews/horizontaljournaltest.cpp+5−5 tests/plugins/DashViews/verticaljournaltest.cpp+5−5
tests/plugins/DashViews/horizontaljournaltest.cpp+5−5
@@ -30,7 +30,7 @@
3030
3131#include "horizontaljournal.h"
3232
33−class QWidthModel : public QAbstractListModel {
33+class WidthModel : public QAbstractListModel {
3434public:
3535 QHash<int, QByteArray> roleNames() const
3636 {
@@ -125,7 +125,7 @@ private Q_SLOTS:
125125 view->setResizeMode(QQuickView::SizeRootObjectToView);
126126 view->engine()->addImportPath(BUILT_PLUGINS_DIR);
127127
128− model = new QWidthModel();
128+ model = new WidthModel();
129129 QStringList heightList;
130130 heightList << "100" << "50" << "125" << "10" << "40" << "70" << "200" << "110" << "160" << "20" << "20" << "65" << "80" << "200" << "300" << "130" << "400" << "300" << "500" << "10";
131131 model->setStringList(heightList);
@@ -314,7 +314,7 @@ private Q_SLOTS:
314314
315315 void testChangeModel()
316316 {
317− QWidthModel *model2 = new QWidthModel();
317+ WidthModel *model2 = new WidthModel();
318318 QStringList list2;
319319 list2 << "100" << "50" << "125" << "25" << "50" << "50";
320320 model2->setStringList(list2);
@@ -385,7 +385,7 @@ private Q_SLOTS:
385385
386386 void testModelAppendRemoveLast()
387387 {
388− QWidthModel *model2 = new QWidthModel();
388+ WidthModel *model2 = new WidthModel();
389389 QStringList heightList;
390390 heightList << "100" << "50" << "125" << "25" << "50" << "50";
391391 model2->setStringList(heightList);
@@ -457,7 +457,7 @@ private Q_SLOTS:
457457private:
458458 QQuickView *view;
459459 HorizontalJournal *hj;
460− QWidthModel *model;
460+ WidthModel *model;
461461};
462462
463463QTEST_MAIN(HorizontalJournalTest)
tests/plugins/DashViews/verticaljournaltest.cpp+5−5
@@ -30,7 +30,7 @@
3030
3131#include "verticaljournal.h"
3232
33−class QHeightModel : public QAbstractListModel {
33+class HeightModel : public QAbstractListModel {
3434public:
3535 QHash<int, QByteArray> roleNames() const
3636 {
@@ -127,7 +127,7 @@ private Q_SLOTS:
127127 view->setResizeMode(QQuickView::SizeRootObjectToView);
128128 view->engine()->addImportPath(BUILT_PLUGINS_DIR);
129129
130− model = new QHeightModel();
130+ model = new HeightModel();
131131 QStringList heightList;
132132 heightList << "100" << "50" << "125" << "10" << "40" << "70" << "200" << "110" << "160" << "20" << "20" << "65" << "80" << "200" << "300" << "130" << "400" << "300" << "500" << "10";
133133 model->setStringList(heightList);
@@ -323,7 +323,7 @@ private Q_SLOTS:
323323
324324 void testChangeModel()
325325 {
326− QHeightModel *model2 = new QHeightModel();
326+ HeightModel *model2 = new HeightModel();
327327 QStringList list2;
328328 list2 << "100" << "50" << "25" << "25" << "50" << "50";
329329 model2->setStringList(list2);
@@ -393,7 +393,7 @@ private Q_SLOTS:
393393
394394 void testModelAppendRemoveLast()
395395 {
396− QHeightModel *model2 = new QHeightModel();
396+ HeightModel *model2 = new HeightModel();
397397 QStringList list2;
398398 list2 << "100" << "50" << "25" << "25" << "50" << "50";
399399 model2->setStringList(list2);
@@ -462,7 +462,7 @@ private Q_SLOTS:
462462private:
463463 QQuickView *view;
464464 VerticalJournal *vj;
465− QHeightModel *model;
465+ HeightModel *model;
466466};
467467
468468QTEST_MAIN(VerticalJournalTest)