From 7d28f7772cd8f5aad63359ed0b9c57c12923dc85 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 30 May 2012 13:53:24 +0200 Subject: Use QPointer instead of QWeakPointer. The use of QWeakPointer for tracking QObject pointers is to be deprecated. Change-Id: If460ca7f515db77af24030152f4bd56e1a5fae7c Reviewed-by: Thiago Macieira --- .../qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/other/qsharedpointer_and_qwidget') diff --git a/tests/auto/other/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp b/tests/auto/other/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp index 6540ab596b..ebfec4d457 100644 --- a/tests/auto/other/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp +++ b/tests/auto/other/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp @@ -76,7 +76,7 @@ public: void tst_QSharedPointer_and_QWidget::weak_externalDelete() { QWidget *w = new QWidget; - QWeakPointer ptr = w; + QPointer ptr = w; QVERIFY(!ptr.isNull()); @@ -88,7 +88,7 @@ void tst_QSharedPointer_and_QWidget::weak_parentDelete() { QWidget *parent = new QWidget; QWidget *w = new QWidget(parent); - QWeakPointer ptr = w; + QPointer ptr = w; QVERIFY(!ptr.isNull()); @@ -100,7 +100,7 @@ void tst_QSharedPointer_and_QWidget::weak_parentDelete_setParent() { QWidget *parent = new QWidget; QWidget *w = new QWidget; - QWeakPointer ptr = w; + QPointer ptr = w; w->setParent(parent); QVERIFY(!ptr.isNull()); @@ -114,7 +114,7 @@ void tst_QSharedPointer_and_QWidget::weak_parentDelete_setParent() void tst_QSharedPointer_and_QWidget::strong_weak() { QSharedPointer ptr(new QWidget); - QWeakPointer weak = ptr.data(); + QPointer weak = ptr.data(); QWeakPointer weak2 = ptr; QVERIFY(!weak.isNull()); -- cgit v1.2.3