diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-02-11 16:33:46 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-12 16:18:27 +0000 |
commit | 0e92e0bd6e7209ad491472b3928840ad78c5371a (patch) | |
tree | 1195f62920b2fbc74e0c0efdbf5912b884a1b383 /tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp | |
parent | e33794e0537efbb22f9d8c4d528bfa062335da03 (diff) |
Replace QScopedPointer with std::unique_ptr
Fix compiler warning, QScopedPointer::take was deprecated in Qt 6.1.
Change-Id: I67045bce97efb082b1b7467a6c24d5dbf996fdc1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 070072e7cabd6f4f26f4938b1616e56254ad25d9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp')
-rw-r--r-- | tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp index a6b0ea7059..32e4a1a05a 100644 --- a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp +++ b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp @@ -1074,40 +1074,40 @@ void tst_QQuickRepeater::ownership() QQmlComponent component(&engine, testFileUrl("ownership.qml")); - QScopedPointer<QAbstractItemModel> aim(new QStandardItemModel); - QPointer<QAbstractItemModel> modelGuard(aim.data()); - QQmlEngine::setObjectOwnership(aim.data(), QQmlEngine::JavaScriptOwnership); + std::unique_ptr<QAbstractItemModel> aim(new QStandardItemModel); + QPointer<QAbstractItemModel> modelGuard(aim.get()); + QQmlEngine::setObjectOwnership(aim.get(), QQmlEngine::JavaScriptOwnership); { - QJSValue wrapper = engine.newQObject(aim.data()); + QJSValue wrapper = engine.newQObject(aim.get()); } - QScopedPointer<QObject> repeater(component.create()); - QVERIFY(!repeater.isNull()); + std::unique_ptr<QObject> repeater(component.create()); + QVERIFY(repeater); - QVERIFY(!QQmlData::keepAliveDuringGarbageCollection(aim.data())); + QVERIFY(!QQmlData::keepAliveDuringGarbageCollection(aim.get())); - repeater->setProperty("model", QVariant::fromValue<QObject*>(aim.data())); + repeater->setProperty("model", QVariant::fromValue<QObject*>(aim.get())); - QVERIFY(!QQmlData::keepAliveDuringGarbageCollection(aim.data())); + QVERIFY(!QQmlData::keepAliveDuringGarbageCollection(aim.get())); engine.collectGarbage(); QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete); QVERIFY(modelGuard); - QScopedPointer<QQmlComponent> delegate(new QQmlComponent(&engine)); + std::unique_ptr<QQmlComponent> delegate(new QQmlComponent(&engine)); delegate->setData(QByteArrayLiteral("import QtQuick 2.0\nItem{}"), dataDirectoryUrl().resolved(QUrl("inline.qml"))); - QPointer<QQmlComponent> delegateGuard(delegate.data()); - QQmlEngine::setObjectOwnership(delegate.data(), QQmlEngine::JavaScriptOwnership); + QPointer<QQmlComponent> delegateGuard(delegate.get()); + QQmlEngine::setObjectOwnership(delegate.get(), QQmlEngine::JavaScriptOwnership); { - QJSValue wrapper = engine.newQObject(delegate.data()); + QJSValue wrapper = engine.newQObject(delegate.get()); } - QVERIFY(!QQmlData::keepAliveDuringGarbageCollection(delegate.data())); + QVERIFY(!QQmlData::keepAliveDuringGarbageCollection(delegate.get())); - repeater->setProperty("delegate", QVariant::fromValue<QObject*>(delegate.data())); + repeater->setProperty("delegate", QVariant::fromValue<QObject*>(delegate.get())); - QVERIFY(!QQmlData::keepAliveDuringGarbageCollection(delegate.data())); + QVERIFY(!QQmlData::keepAliveDuringGarbageCollection(delegate.get())); engine.collectGarbage(); QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete); @@ -1120,8 +1120,8 @@ void tst_QQuickRepeater::ownership() QVERIFY(delegateGuard); QVERIFY(modelGuard); - delegate.take(); - aim.take(); + delegate.release(); + aim.release(); engine.collectGarbage(); QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete); |