From 2134980e4c480c04852ebeda138bdc656233a8f6 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Tue, 18 May 2010 10:43:35 +0200
Subject: Remove QT_NO_THREAD support for QHostInfo

Reviewed-by: Thiago
---
 dist/changes-4.8.0                    |  1 +
 src/network/kernel/qhostinfo.cpp      | 26 ++------------------------
 src/network/kernel/qhostinfo_p.h      |  7 +------
 src/network/kernel/qhostinfo_unix.cpp |  2 --
 src/network/kernel/qhostinfo_win.cpp  |  2 --
 5 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0
index 27bb885..9d16f11 100644
--- a/dist/changes-4.8.0
+++ b/dist/changes-4.8.0
@@ -36,6 +36,7 @@ Third party components
 
 QtCore
 ------
+ - Removed support for QT_NO_THREAD define for QHostInfo.
 
 QtGui
 -----
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index f287630..a2c2c63 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -60,9 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_THREAD
 Q_GLOBAL_STATIC(QHostInfoLookupManager, theHostInfoLookupManager)
-#endif
 
 //#define QHOSTINFO_DEBUG
 
@@ -91,10 +89,8 @@ Q_GLOBAL_STATIC(QHostInfoLookupManager, theHostInfoLookupManager)
     \snippet doc/src/snippets/code/src_network_kernel_qhostinfo.cpp 0
 
 
-    The slot is invoked when the results are ready. (If you use
-    Qt for Embedded Linux and disabled multithreading support by defining
-    \c QT_NO_THREAD, lookupHost() will block until the lookup has
-    finished.) The results are stored in a QHostInfo object. Call
+    The slot is invoked when the results are ready. The results are
+    stored in a QHostInfo object. Call
     addresses() to get the list of IP addresses for the host, and
     hostName() to get the host name that was looked up.
 
@@ -180,14 +176,6 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
         return id;
     }
 
-#ifdef QT_NO_THREAD
-    QHostInfo hostInfo = QHostInfoAgent::fromName(name);
-    hostInfo.setLookupId(id);
-    QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
-    QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
-                     receiver, member, Qt::QueuedConnection);
-    result.data()->emitResultsReady(hostInfo);
-#else
     QHostInfoLookupManager *manager = theHostInfoLookupManager();
     if (manager) {
         // the application is still alive
@@ -208,8 +196,6 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
         QObject::connect(&runnable->resultEmitter, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection);
         manager->scheduleLookup(runnable);
     }
-#endif
-
     return id;
 }
 
@@ -220,12 +206,7 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
 */
 void QHostInfo::abortHostLookup(int id)
 {
-#ifndef QT_NO_THREAD
     theHostInfoLookupManager()->abortLookup(id);
-#else
-    // we cannot abort if it was non threaded.. the result signal has already been posted
-    Q_UNUSED(id);
-#endif
 }
 
 /*!
@@ -426,7 +407,6 @@ void QHostInfo::setErrorString(const QString &str)
     \sa hostName()
 */
 
-#ifndef QT_NO_THREAD
 QHostInfoRunnable::QHostInfoRunnable(QString hn, int i) : toBeLookedUp(hn), id(i)
 {
     setAutoDelete(true);
@@ -722,6 +702,4 @@ void QHostInfoCache::clear()
     cache.clear();
 }
 
-#endif // QT_NO_THREAD
-
 QT_END_NAMESPACE
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index e11766b..acd2bf0 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -60,8 +60,6 @@
 #include "QtCore/qwaitcondition.h"
 #include "QtCore/qobject.h"
 #include "QtCore/qpointer.h"
-
-#ifndef QT_NO_THREAD
 #include "QtCore/qthread.h"
 #include "QtCore/qthreadpool.h"
 #include "QtCore/qmutex.h"
@@ -70,7 +68,7 @@
 #include "QtCore/qqueue.h"
 #include <QTime>
 #include <QCache>
-#endif
+
 
 QT_BEGIN_NAMESPACE
 
@@ -112,7 +110,6 @@ public:
     int lookupId;
 };
 
-#ifndef QT_NO_THREAD
 // These functions are outside of the QHostInfo class and strictly internal.
 // Do NOT use them outside of QAbstractSocket.
 QHostInfo Q_NETWORK_EXPORT qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char *member, bool *valid, int *id);
@@ -190,8 +187,6 @@ private slots:
     void waitForThreadPoolDone() { threadPool.waitForDone(); }
 };
 
-#endif
-
 QT_END_NAMESPACE
 
 #endif // QHOSTINFO_P_H
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index a186e78..0887f89 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -131,9 +131,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
     // Load res_init on demand.
     static volatile bool triedResolve = false;
     if (!triedResolve) {
-#ifndef QT_NO_THREAD
         QMutexLocker locker(QMutexPool::globalInstanceGet(&local_res_init));
-#endif
         if (!triedResolve) {
             resolveLibrary();
             triedResolve = true;
diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp
index 4264f60..89aaa34 100644
--- a/src/network/kernel/qhostinfo_win.cpp
+++ b/src/network/kernel/qhostinfo_win.cpp
@@ -116,9 +116,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
     // Load res_init on demand.
     static volatile bool triedResolve = false;
     if (!triedResolve) {
-#ifndef QT_NO_THREAD
         QMutexLocker locker(QMutexPool::globalInstanceGet(&local_getaddrinfo));
-#endif
         if (!triedResolve) {
             resolveLibrary();
             triedResolve = true;
-- 
cgit v0.12