diff options
Diffstat (limited to 'tests/auto/network-settings.h')
| -rw-r--r-- | tests/auto/network-settings.h | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 5b671bf..22d8886 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -1,6 +1,4 @@ /**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** ** This file is part of the test suite of the Qt Toolkit. @@ -40,6 +38,12 @@ ****************************************************************************/ #include <QString> +/* +#ifdef QT_NETWORK_LIB +#include <QtNetwork/QHostInfo> +#endif +*/ + #ifdef Q_OS_SYMBIAN #include <sys/socket.h> #include <net/if.h> @@ -49,10 +53,10 @@ #if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) // In emulator we use WINSOCK connectivity by default. Unfortunately winsock // does not work very well with UDP sockets. This defines skips some test -// cases which have known problems. +// cases which have known problems. // NOTE: Prefer to use WINPCAP based connectivity in S60 emulator when running -// network tests. WINPCAP connectivity uses Symbian OS IP stack, +// network tests. WINPCAP connectivity uses Symbian OS IP stack, // correspondingly as HW does. When using WINPCAP disable this define //#define SYMBIAN_WINSOCK_CONNECTIVITY #endif @@ -139,7 +143,7 @@ public: #endif return "10.10.14.172"; } - + static QByteArray expectedReplyIMAP() { #ifdef Q_OS_SYMBIAN @@ -161,7 +165,7 @@ public: QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4REV1] " ); expected = expected.append(QtNetworkSettings::serverLocalName().toAscii()); expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); - + return expected; } @@ -183,12 +187,12 @@ public: return expected; } } - + static QByteArray expectedReplyFtp() { QByteArray expected( "220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n" ); return expected; - } + } #ifdef Q_OS_SYMBIAN static void setDefaultIap() @@ -251,7 +255,7 @@ private: position += QString("=").length(); //create record - QtNetworkSettingsRecord *entry = + QtNetworkSettingsRecord *entry = new QtNetworkSettingsRecord( QString("iap.default"), line.mid(position).trimmed() ); entries.insert(entry->recordName(), entry); break; @@ -307,6 +311,15 @@ private: } #endif +/* +#ifdef QT_NETWORK_LIB + static QHostAddress serverIP() + { + return QHostInfo::fromName(serverName()).addresses().first(); + } +#endif +*/ + }; #ifdef Q_OS_SYMBIAN QHash<QString, QtNetworkSettingsRecord* > QtNetworkSettings::entries = QHash<QString, QtNetworkSettingsRecord* > (); |