src/network: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support

Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>

2 files changed, 6 insertions, 24 deletions

diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp
index 0165385..87902c3 100644
--- a/src/network/kernel/qnetworkinterface_win.cpp
+++ b/src/network/kernel/qnetworkinterface_win.cpp
@@ -66,19 +66,14 @@ static void resolveLibs()
     if (!done) {
         done = true;
 
-        HINSTANCE iphlpapiHnd;
-        QT_WA({
-                iphlpapiHnd = LoadLibraryW(L"iphlpapi");
-            }, {
-                iphlpapiHnd = LoadLibraryA("iphlpapi");
-            });
+        HINSTANCE iphlpapiHnd = LoadLibrary(L"iphlpapi");
         if (iphlpapiHnd == NULL)
-            return;             // failed to load, probably Windows 95
+            return;
 
 #if defined(Q_OS_WINCE)
-        ptrGetAdaptersInfo = (PtrGetAdaptersInfo)GetProcAddressW(iphlpapiHnd, L"GetAdaptersInfo");
-        ptrGetAdaptersAddresses = (PtrGetAdaptersAddresses)GetProcAddressW(iphlpapiHnd, L"GetAdaptersAddresses");
-        ptrGetNetworkParams = (PtrGetNetworkParams)GetProcAddressW(iphlpapiHnd, L"GetNetworkParams");
+        ptrGetAdaptersInfo = (PtrGetAdaptersInfo)GetProcAddress(iphlpapiHnd, L"GetAdaptersInfo");
+        ptrGetAdaptersAddresses = (PtrGetAdaptersAddresses)GetProcAddress(iphlpapiHnd, L"GetAdaptersAddresses");
+        ptrGetNetworkParams = (PtrGetNetworkParams)GetProcAddress(iphlpapiHnd, L"GetNetworkParams");
 #else
         ptrGetAdaptersInfo = (PtrGetAdaptersInfo)GetProcAddress(iphlpapiHnd, "GetAdaptersInfo");
         ptrGetAdaptersAddresses = (PtrGetAdaptersAddresses)GetProcAddress(iphlpapiHnd, "GetAdaptersAddresses");
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp
index 5fda228..7052bcc2 100644
--- a/src/network/kernel/qnetworkproxy_win.cpp
+++ b/src/network/kernel/qnetworkproxy_win.cpp
@@ -43,8 +43,6 @@
 
 #ifndef QT_NO_NETWORKPROXY
 
-#if defined(UNICODE)
-
 #include <qmutex.h>
 #include <qstringlist.h>
 #include <qregexp.h>
@@ -269,15 +267,13 @@ void QWindowsSystemProxy::init()
     if (initialized)
         return;
     initialized = true;
-    if (QSysInfo::windowsVersion() & QSysInfo::WV_DOS_based)
-        return;                 // no point, this library is only available on 2k, XP and up
 
 #ifdef Q_OS_WINCE
     // Windows CE does not have any of the following API
     return;
 #else
     // load the winhttp.dll library
-    HINSTANCE winhttpHnd = LoadLibraryW(L"winhttp");
+    HINSTANCE winhttpHnd = LoadLibrary(L"winhttp");
     if (!winhttpHnd)
         return;                 // failed to load
 
@@ -401,15 +397,6 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro
     return parseServerList(query, sp->proxyServerList);
 }
 
-#else  // !UNICODE
-
-QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkProxyQuery &)
-{
-    return QList<QNetworkProxy>() << QNetworkProxy::NoProxy;
-}
-
-#endif
-
 QT_END_NAMESPACE
 
 #endif