From 56651915e8dbb61ef6832531b6752059ec7237fc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 17 Jul 2023 07:03:38 +0200 Subject: QFutureInterface: port to new SlotObjUniquePtr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... removing a ### comments to that effect. Pick-to: 6.6 Change-Id: I635ca9593ec72a66d328ff6de61cd311c1b4e89f Reviewed-by: MÃ¥rten Nordheim Reviewed-by: Ivan Solovev --- src/corelib/thread/qfutureinterface.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/corelib/thread/qfutureinterface.cpp') diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index 6184d9133a..de35089b2c 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -118,11 +118,7 @@ void QtPrivate::watchContinuationImpl(const QObject *context, QSlotObjectBase *s Q_ASSERT(context); Q_ASSERT(slotObj); - // ### we're missing `QSlotObjectPtr`... - struct Deleter { - void operator()(QSlotObjectBase *p) const { p->destroyIfLastRef(); } - }; - auto slot = std::unique_ptr(slotObj); + auto slot = SlotObjUniquePtr(slotObj); auto *watcher = new QBasicFutureWatcher; watcher->moveToThread(context->thread()); -- cgit v1.2.3