diff options
author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-11-01 14:20:19 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-14 18:41:17 +0100 |
commit | 4329030b77dc2faf267cecc0a8b03ce3ed3437cf (patch) | |
tree | 3c543ff088b626b3aaa5b58826b7e595776d82ca /src/network/kernel/qhostinfo_p.h | |
parent | 49bd825a9626eda77fd9e8313e1868bed4c77bff (diff) |
network: remove Symbian specific code
removes several files and cleans up the code, removing all Symbian
specific #ifdef's etc.
Change-Id: Ie457e54cb4b3a992f251383320d47822259c38f1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/kernel/qhostinfo_p.h')
-rw-r--r-- | src/network/kernel/qhostinfo_p.h | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 035aa0126a..fb7ae37c53 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -72,12 +72,6 @@ #include <QNetworkSession> #include <QSharedPointer> -#ifdef Q_OS_SYMBIAN -// Symbian Headers -#include <es_sock.h> -#include <in_sock.h> -#endif - QT_BEGIN_NAMESPACE @@ -102,11 +96,6 @@ class QHostInfoAgent : public QObject public: static QHostInfo fromName(const QString &hostName); static QHostInfo fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession); - -#ifdef Q_OS_SYMBIAN - static int lookupHost(const QString &name, QObject *receiver, const char *member); - static void abortHostLookup(int lookupId); -#endif }; class QHostInfoPrivate @@ -188,7 +177,6 @@ protected: }; -#ifndef Q_OS_SYMBIAN class QHostInfoLookupManager : public QAbstractHostInfoLookupManager { Q_OBJECT @@ -225,95 +213,6 @@ private slots: void waitForThreadPoolDone() { threadPool.waitForDone(); } }; -#else - -class QSymbianHostResolver : public CActive -{ -public: - QSymbianHostResolver(const QString &hostName, int id, QSharedPointer<QNetworkSession> networkSession); - ~QSymbianHostResolver(); - - void requestHostLookup(); - void abortHostLookup(); - int id(); - - void returnResults(); - - QHostInfoResult resultEmitter; - -private: - void DoCancel(); - void RunL(); - void run(); - TInt RunError(TInt aError); - - void processNameResult(); - void nextNameResult(); - void processAddressResult(); - -private: - int iId; - - const QString iHostName; - QString iEncodedHostName; - TPtrC iHostNamePtr; - - RSocketServ& iSocketServ; - RHostResolver iHostResolver; - QSharedPointer<QNetworkSession> iNetworkSession; - - TNameEntry iNameResult; - TInetAddr IpAdd; - - QHostAddress iAddress; - - QHostInfo iResults; - - QList<QHostAddress> iHostAddresses; - - enum { - EIdle, - EGetByName, - EGetByAddress, - ECompleteFromCache, - EError - } iState; -}; - -class QSymbianHostInfoLookupManager : public QAbstractHostInfoLookupManager -{ - Q_OBJECT -public: - QSymbianHostInfoLookupManager(); - ~QSymbianHostInfoLookupManager(); - - static QSymbianHostInfoLookupManager* globalInstance(); - - int id(); - void clear(); - - // called from QHostInfo - void scheduleLookup(QSymbianHostResolver *r); - void abortLookup(int id); - - // called from QSymbianHostResolver - void lookupFinished(QSymbianHostResolver *r); - -private: - void runNextLookup(); - - // this is true for single threaded use, with multiple threads the max is ((number of threads) + KMaxConcurrentLookups - 1) - static const int KMaxConcurrentLookups = 5; - - QList<QSymbianHostResolver*> iCurrentLookups; - QList<QSymbianHostResolver*> iScheduledLookups; - - QMutex mutex; -}; -#endif - - - QT_END_NAMESPACE #endif // QHOSTINFO_P_H |