From 1a3f573bd9fd7463e1def4c1fe655bcf0e2e6baa Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 2 Aug 2023 21:19:31 +0200 Subject: [PATCH] QHostInfo: remove usused -Result and -Runnable ctors Clean up after all users are ported to the SlotObjUniquePtr overloads. Pick-to: 6.6 6.5 Change-Id: I3e58249296ea9674c45fb412463ae3201518de72 Reviewed-by: Ivan Solovev Reviewed-by: Volker Hilsheimer --- src/network/kernel/qhostinfo.cpp | 7 ------- src/network/kernel/qhostinfo_p.h | 11 ----------- 2 files changed, 18 deletions(-) diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 7564fc3197..e7df47da6f 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -818,13 +818,6 @@ int QHostInfo::lookupHostImpl(const QString &name, return id; } -QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i, const QObject *receiver, - QtPrivate::QSlotObjectBase *slotObj) : - toBeLookedUp(hn), id(i), resultEmitter(receiver, slotObj) -{ - setAutoDelete(true); -} - QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i, const QObject *receiver, QtPrivate::SlotObjUniquePtr slotObj) : toBeLookedUp{hn}, id{i}, resultEmitter{receiver, std::move(slotObj)} diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 9303a19fc7..70cacc6b3d 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -43,16 +43,7 @@ class QHostInfoResult : public QObject { Q_OBJECT public: - QHostInfoResult(const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj) - : receiver(receiver), slotObj(slotObj), - withContextObject(slotObj && receiver) - { - if (receiver) - moveToThread(receiver->thread()); - } - explicit QHostInfoResult(const QObject *receiver, QtPrivate::SlotObjUniquePtr slot); - ~QHostInfoResult() override; void postResultsReady(const QHostInfo &info); @@ -145,8 +136,6 @@ private: class QHostInfoRunnable : public QRunnable { public: - QHostInfoRunnable(const QString &hn, int i, const QObject *receiver, - QtPrivate::QSlotObjectBase *slotObj); explicit QHostInfoRunnable(const QString &hn, int i, const QObject *receiver, QtPrivate::SlotObjUniquePtr slotObj); ~QHostInfoRunnable() override;