1 files changed, 34 insertions, 68 deletions

diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index fa6529bdfd..1798ceab0a 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -81,69 +81,50 @@ QT_BEGIN_NAMESPACE
 class QHostInfoResult : public QObject
 {
     Q_OBJECT
-
-    QPointer<const QObject> receiver = nullptr;
-    QtPrivate::QSlotObjectBase *slotObj = nullptr;
-    const bool withContextObject = false;
-
 public:
-    QHostInfoResult() = default;
-    QHostInfoResult(const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj) :
-        receiver(receiver),
-        slotObj(slotObj),
-        withContextObject(slotObj && receiver)
+    QHostInfoResult(const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj)
+        : receiver(receiver), slotObj(slotObj),
+          withContextObject(slotObj && receiver)
     {
-        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this,
-                &QObject::deleteLater);
-        if (slotObj && receiver)
+        if (receiver)
             moveToThread(receiver->thread());
     }
 
     void postResultsReady(const QHostInfo &info);
 
-public Q_SLOTS:
-    inline void emitResultsReady(const QHostInfo &info)
-    {
-        if (slotObj) {
-            // we either didn't have a context object, or it's still alive
-            if (!withContextObject || receiver) {
-                QHostInfo copy = info;
-                void *args[2] = { 0, reinterpret_cast<void *>(&copy) };
-                slotObj->call(const_cast<QObject*>(receiver.data()), args);
-            }
-            slotObj->destroyIfLastRef();
-        } else {
-            emit resultsReady(info);
-        }
-    }
+Q_SIGNALS:
+    void resultsReady(const QHostInfo &info);
 
 protected:
-    bool event(QEvent *event) override
+    bool event(QEvent *event) override;
+
+private:
+    QHostInfoResult(const QHostInfoResult *other)
+        : receiver(other->receiver), slotObj(other->slotObj),
+          withContextObject(other->withContextObject)
     {
-        if (event->type() == QEvent::MetaCall) {
-            auto metaCallEvent = static_cast<QMetaCallEvent *>(event);
-            auto args = metaCallEvent->args();
-            auto hostInfo = reinterpret_cast<QHostInfo *>(args[1]);
-            emitResultsReady(*hostInfo);
-            deleteLater();
-            return true;
-        }
-        return QObject::event(event);
+        // cleanup if the application terminates before results are delivered
+        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
+                this, &QObject::deleteLater);
+        // maintain thread affinity
+        moveToThread(other->thread());
     }
 
-Q_SIGNALS:
-    void resultsReady(const QHostInfo &info);
+    QPointer<const QObject> receiver = nullptr;
+    QtPrivate::QSlotObjectBase *slotObj = nullptr;
+    const bool withContextObject = false;
 };
 
-// needs to be QObject because fromName calls tr()
-class QHostInfoAgent : public QObject
+class QHostInfoAgent
 {
-    Q_OBJECT
 public:
     static QHostInfo fromName(const QString &hostName);
 #ifndef QT_NO_BEARERMANAGEMENT
     static QHostInfo fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession);
 #endif
+private:
+    static QHostInfo lookup(const QString &hostName);
+    static QHostInfo reverseLookup(const QHostAddress &address);
 };
 
 class QHostInfoPrivate
@@ -159,6 +140,10 @@ public:
     //not a public API yet
     static QHostInfo fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession);
 #endif
+    static int lookupHostImpl(const QString &name,
+                              const QObject *receiver,
+                              QtPrivate::QSlotObjectBase *slotObj,
+                              const char *member);
 
     QHostInfo::HostInfoError err;
     QString errorStr;
@@ -203,7 +188,6 @@ private:
 class QHostInfoRunnable : public QRunnable
 {
 public:
-    QHostInfoRunnable(const QString &hn, int i);
     QHostInfoRunnable(const QString &hn, int i, const QObject *receiver,
                       QtPrivate::QSlotObjectBase *slotObj);
     void run() override;
@@ -214,31 +198,13 @@ public:
 };
 
 
-class QAbstractHostInfoLookupManager : public QObject
+class QHostInfoLookupManager
 {
-    Q_OBJECT
-
-public:
-    ~QAbstractHostInfoLookupManager() {}
-    virtual void clear() = 0;
-
-    QHostInfoCache cache;
-
-protected:
-     QAbstractHostInfoLookupManager() {}
-     static QAbstractHostInfoLookupManager* globalInstance();
-
-};
-
-class QHostInfoLookupManager : public QAbstractHostInfoLookupManager
-{
-    Q_OBJECT
 public:
     QHostInfoLookupManager();
     ~QHostInfoLookupManager();
 
-    void clear() override;
-    void work();
+    void clear();
 
     // called from QHostInfo
     void scheduleLookup(QHostInfoRunnable *r);
@@ -248,6 +214,8 @@ public:
     void lookupFinished(QHostInfoRunnable *r);
     bool wasAborted(int id);
 
+    QHostInfoCache cache;
+
     friend class QHostInfoRunnable;
 protected:
 #if QT_CONFIG(thread)
@@ -265,10 +233,8 @@ protected:
 
     bool wasDeleted;
 
-private slots:
-#if QT_CONFIG(thread)
-    void waitForThreadPoolDone() { threadPool.waitForDone(); }
-#endif
+private:
+    void rescheduleWithMutexHeld();
 };
 
 QT_END_NAMESPACE