summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-07-17 07:03:38 +0200
committerMarc Mutz <marc.mutz@qt.io>2023-07-19 13:38:02 +0200
commit56651915e8dbb61ef6832531b6752059ec7237fc (patch)
treeb766244d3facd7e648af99a2d850b58c13f2b76c
parentc58074b42dcd48a293fe493795d51ca2b101a280 (diff)
QFutureInterface: port to new SlotObjUniquePtr
... removing a ### comments to that effect. Pick-to: 6.6 Change-Id: I635ca9593ec72a66d328ff6de61cd311c1b4e89f Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
-rw-r--r--src/corelib/thread/qfutureinterface.cpp6
1 files changed, 1 insertions, 5 deletions
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<QSlotObjectBase, Deleter>(slotObj);
+ auto slot = SlotObjUniquePtr(slotObj);
auto *watcher = new QBasicFutureWatcher;
watcher->moveToThread(context->thread());