fcfe3a0 · unity8 · git.iko.soy

git.iko.soy/unity8

Plug memory leaks in tst_DirectionalDragArea

commitfcfe3a07b24060685033cc6aaf83673b2fe76675 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateFri 24 Apr 2015, 10:23 (11 years ago) parentaf30282

1 file changed+20−20

compare with xenial

unifiedsplit

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+20−20

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+20−20

@@ -202,7 +202,7 @@ void tst_DirectionalDragArea::dragWithShortDirectionChange()

202202 DirectionalDragArea *edgeDragArea =

203203 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

204204 QVERIFY(edgeDragArea != 0);

205− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

205+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

206206 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

207207

208208 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea);

@@ -297,7 +297,7 @@ void tst_DirectionalDragArea::sceneXAndX()

297297 DirectionalDragArea *edgeDragArea =

298298 m_view->rootObject()->findChild<DirectionalDragArea*>("hnDragArea");

299299 QVERIFY(edgeDragArea != 0);

300− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

300+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

301301 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

302302 edgeDragArea->setImmediateRecognition(true);

303303

@@ -326,7 +326,7 @@ void tst_DirectionalDragArea::sceneYAndY()

326326 DirectionalDragArea *edgeDragArea =

327327 m_view->rootObject()->findChild<DirectionalDragArea*>("vnDragArea");

328328 QVERIFY(edgeDragArea != 0);

329− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

329+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

330330 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

331331 edgeDragArea->setImmediateRecognition(true);

332332

@@ -357,7 +357,7 @@ void tst_DirectionalDragArea::twoFingerTap()

357357 DirectionalDragArea *edgeDragArea =

358358 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

359359 QVERIFY(edgeDragArea != 0);

360− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

360+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

361361 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

362362

363363 // Make touches evenly spaced along the edgeDragArea

@@ -439,7 +439,7 @@ void tst_DirectionalDragArea::movingDDA()

439439 DirectionalDragArea *edgeDragArea =

440440 rightwardsLauncher->findChild<DirectionalDragArea*>("hpDragArea");

441441 Q_ASSERT(edgeDragArea != 0);

442− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

442+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

443443 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

444444

445445 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea);

@@ -479,7 +479,7 @@ void tst_DirectionalDragArea::ignoreOldFinger()

479479 DirectionalDragArea *edgeDragArea =

480480 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

481481 Q_ASSERT(edgeDragArea != 0);

482− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

482+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

483483 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

484484

485485 // Make touches evenly spaced along the edgeDragArea

@@ -542,7 +542,7 @@ void tst_DirectionalDragArea::rotated()

542542 DirectionalDragArea *edgeDragArea =

543543 rightwardsLauncher->findChild<DirectionalDragArea*>("hpDragArea");

544544 Q_ASSERT(edgeDragArea != 0);

545− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

545+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

546546 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

547547

548548 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea);

@@ -582,7 +582,7 @@ void tst_DirectionalDragArea::sceneDistance()

582582 DirectionalDragArea *edgeDragArea =

583583 rightwardsLauncher->findChild<DirectionalDragArea*>("hpDragArea");

584584 Q_ASSERT(edgeDragArea != 0);

585− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

585+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

586586 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

587587

588588 // to disable the position smoothing so that we can more easily check sceneDistance values

@@ -640,7 +640,7 @@ void tst_DirectionalDragArea::disabledWhileDragging()

640640 DirectionalDragArea *edgeDragArea =

641641 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

642642 Q_ASSERT(edgeDragArea != 0);

643− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

643+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

644644 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

645645

646646 QPointF touchPoint = calculateInitialTouchPos(edgeDragArea);

@@ -678,7 +678,7 @@ void tst_DirectionalDragArea::oneFingerDownFollowedByLateSecondFingerDown()

678678 DirectionalDragArea *edgeDragArea =

679679 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

680680 Q_ASSERT(edgeDragArea != 0);

681− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

681+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

682682 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

683683

684684 // Disable some constraints we're not interested in

@@ -753,7 +753,7 @@ void tst_DirectionalDragArea::givesUpWhenLosesTouch()

753753 DirectionalDragArea *edgeDragArea =

754754 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

755755 Q_ASSERT(edgeDragArea != 0);

756− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

756+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

757757 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

758758

759759 // Disable some constraints we're not interested in

@@ -798,7 +798,7 @@ void tst_DirectionalDragArea::threeFingerDrag()

798798 DirectionalDragArea *edgeDragArea =

799799 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

800800 Q_ASSERT(edgeDragArea != 0);

801− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

801+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

802802 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

803803

804804 // Disable some constraints we're not interested in

@@ -867,7 +867,7 @@ void tst_DirectionalDragArea::immediateRecognitionWhenConstraintsDisabled()

867867 DirectionalDragArea *edgeDragArea =

868868 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

869869 Q_ASSERT(edgeDragArea != 0);

870− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

870+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

871871 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

872872

873873 // Disable the minimum amount of constraints to ensure immediate recognition

@@ -900,7 +900,7 @@ void tst_DirectionalDragArea::withdrawTouchOwnershipCandidacyIfDisabledDuringRec

900900 DirectionalDragArea *edgeDragArea =

901901 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

902902 Q_ASSERT(edgeDragArea != 0);

903− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

903+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

904904 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

905905

906906 QPointF touchPoint = calculateInitialTouchPos(edgeDragArea);

@@ -964,7 +964,7 @@ void tst_DirectionalDragArea::gettingTouchOwnershipMakesMouseAreaBehindGetCancel

964964 DirectionalDragArea *edgeDragArea =

965965 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

966966 QVERIFY(edgeDragArea != nullptr);

967− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

967+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

968968 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

969969

970970 QQuickMouseArea *mouseArea =

@@ -1014,7 +1014,7 @@ void tst_DirectionalDragArea::interleavedTouches()

10141014 DirectionalDragArea *edgeDragArea =

10151015 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

10161016 QVERIFY(edgeDragArea != 0);

1017− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

1017+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

10181018 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

10191019

10201020 QPointF touch0 = edgeDragArea->mapToScene(

@@ -1109,7 +1109,7 @@ void tst_DirectionalDragArea::makoRightEdgeDrag()

11091109 DirectionalDragArea *edgeDragArea =

11101110 m_view->rootObject()->findChild<DirectionalDragArea*>("hnDragArea");

11111111 QVERIFY(edgeDragArea != nullptr);

1112− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

1112+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

11131113 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

11141114

11151115 StatusSpy *statusSpy = new StatusSpy(edgeDragArea);

@@ -1154,7 +1154,7 @@ void tst_DirectionalDragArea::makoRightEdgeDrag_verticalDownwards()

11541154 DirectionalDragArea *edgeDragArea =

11551155 m_view->rootObject()->findChild<DirectionalDragArea*>("hnDragArea");

11561156 QVERIFY(edgeDragArea != nullptr);

1157− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

1157+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

11581158 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

11591159

11601160 edgeDragArea->d->setPixelsPerMm(320.0 /*mako ppi*/ * 0.03937 /* inches per mm*/);

@@ -1198,7 +1198,7 @@ void tst_DirectionalDragArea::makoLeftEdgeDrag_slowStart()

11981198 DirectionalDragArea *edgeDragArea =

11991199 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

12001200 QVERIFY(edgeDragArea != nullptr);

1201− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

1201+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

12021202 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

12031203

12041204 edgeDragArea->d->setPixelsPerMm(320.0 /*mako ppi*/ * 0.03937 /* inches per mm*/);

@@ -1262,7 +1262,7 @@ void tst_DirectionalDragArea::makoLeftEdgeDrag_movesSlightlyBackwardsOnStart()

12621262 DirectionalDragArea *edgeDragArea =

12631263 m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

12641264 QVERIFY(edgeDragArea != nullptr);

1265− edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer());

1265+ edgeDragArea->d->setRecognitionTimer(m_fakeTimerFactory->createTimer(edgeDragArea));

12661266 edgeDragArea->d->setTimeSource(m_fakeTimerFactory->timeSource());

12671267

12681268 edgeDragArea->d->setPixelsPerMm(320.0 /*mako ppi*/ * 0.03937 /* inches per mm*/);