1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QHostInfo: remove usused -Result and -Runnable ctors

Browse Source 
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:
Marc Mutz 2023-08-02 21:19:31 +02:00 committed by Qt Cherry-pick Bot
parent f925278917
commit 566aede35f
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/kernel/qhostinfo.cpp
View File

@ -818,13 +818,6 @@ int QHostInfo::lookupHostImpl(const QString &name,
return id; 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, QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i, const QObject *receiver,
QtPrivate::SlotObjUniquePtr slotObj) QtPrivate::SlotObjUniquePtr slotObj)
: toBeLookedUp{hn}, id{i}, resultEmitter{receiver, std::move(slotObj)} : toBeLookedUp{hn}, id{i}, resultEmitter{receiver, std::move(slotObj)}

11
src/network/kernel/qhostinfo_p.h
View File

@ -43,16 +43,7 @@ class QHostInfoResult : public QObject
{ {
Q_OBJECT Q_OBJECT
public: 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); explicit QHostInfoResult(const QObject *receiver, QtPrivate::SlotObjUniquePtr slot);
~QHostInfoResult() override; ~QHostInfoResult() override;
void postResultsReady(const QHostInfo &info); void postResultsReady(const QHostInfo &info);
@ -145,8 +136,6 @@ private:
class QHostInfoRunnable : public QRunnable class QHostInfoRunnable : public QRunnable
{ {
public: public:
QHostInfoRunnable(const QString &hn, int i, const QObject *receiver,
QtPrivate::QSlotObjectBase *slotObj);
explicit QHostInfoRunnable(const QString &hn, int i, const QObject *receiver, explicit QHostInfoRunnable(const QString &hn, int i, const QObject *receiver,
QtPrivate::SlotObjUniquePtr slotObj); QtPrivate::SlotObjUniquePtr slotObj);
~QHostInfoRunnable() override; ~QHostInfoRunnable() override;