git.iko.soy/unity8
on xenial help sign in
No need for the classname
7e59affAlbert Astals
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+8−8
compare with xenial
unifiedsplit
@@ -68,17 +68,17 @@ private Q_SLOTS:
68 if (dest > lvwph->contentY()) {
68 if (dest > lvwph->contentY()) {
69 const qreal jump = 25;
69 const qreal jump = 25;
70 while (lvwph->contentY() + jump < dest) {
70 while (lvwph->contentY() + jump < dest) {
71− lvwph->QQuickFlickable::setContentY(lvwph->contentY() + jump);
71+ lvwph->setContentY(lvwph->contentY() + jump);
72 QTest::qWait(0);
72 QTest::qWait(0);
73 }
73 }
74 } else {
74 } else {
75 const qreal jump = -25;
75 const qreal jump = -25;
76 while (lvwph->contentY() + jump > dest) {
76 while (lvwph->contentY() + jump > dest) {
77− lvwph->QQuickFlickable::setContentY(lvwph->contentY() + jump);
77+ lvwph->setContentY(lvwph->contentY() + jump);
78 QTest::qWait(0);
78 QTest::qWait(0);
79 }
79 }
80 }
80 }
81− lvwph->QQuickFlickable::setContentY(dest);
81+ lvwph->setContentY(dest);
82 QTest::qWait(0);
82 QTest::qWait(0);
83 }
83 }
84
84
@@ -87,9 +87,9 @@ private Q_SLOTS:
87 const qreal jump = -25;
87 const qreal jump = -25;
88 while (!lvwph->isAtYBeginning()) {
88 while (!lvwph->isAtYBeginning()) {
89 if (lvwph->contentY() + jump > -lvwph->minYExtent()) {
89 if (lvwph->contentY() + jump > -lvwph->minYExtent()) {
90− lvwph->QQuickFlickable::setContentY(lvwph->contentY() + jump);
90+ lvwph->setContentY(lvwph->contentY() + jump);
91 } else {
91 } else {
92− lvwph->QQuickFlickable::setContentY(lvwph->contentY() - 1);
92+ lvwph->setContentY(lvwph->contentY() - 1);
93 }
93 }
94 QTest::qWait(0);
94 QTest::qWait(0);
95 }
95 }
@@ -100,9 +100,9 @@ private Q_SLOTS:
100 const qreal jump = 25;
100 const qreal jump = 25;
101 while (!lvwph->isAtYEnd()) {
101 while (!lvwph->isAtYEnd()) {
102 if (lvwph->contentY() + lvwph->height() + jump < lvwph->contentHeight()) {
102 if (lvwph->contentY() + lvwph->height() + jump < lvwph->contentHeight()) {
103− lvwph->QQuickFlickable::setContentY(lvwph->contentY() + jump);
103+ lvwph->setContentY(lvwph->contentY() + jump);
104 } else {
104 } else {
105− lvwph->QQuickFlickable::setContentY(lvwph->contentY() + 1);
105+ lvwph->setContentY(lvwph->contentY() + 1);
106 }
106 }
107 QTest::qWait(0);
107 QTest::qWait(0);
108 }
108 }
@@ -132,7 +132,7 @@ private Q_SLOTS:
132
132
133 void testDrag1PixelUp()
133 void testDrag1PixelUp()
134 {
134 {
135− lvwph->QQuickFlickable::setContentY(lvwph->contentY() + 1);
135+ lvwph->setContentY(lvwph->contentY() + 1);
136 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);
136 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);
137 QCOMPARE(lvwph->m_firstVisibleIndex, 0);
137 QCOMPARE(lvwph->m_firstVisibleIndex, 0);
138 verifyItem(0, 49., 150., false);
138 verifyItem(0, 49., 150., false);