QHostInfo: remove usused -Result and -Runnable ctors
Clean up after all users are ported to the SlotObjUniquePtr overloads. Change-Id: I3e58249296ea9674c45fb412463ae3201518de72 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1a3f573bd9fd7463e1def4c1fe655bcf0e2e6baa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
f925278917
commit
566aede35f
@ -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)}
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user