diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-15 23:30:38 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 02:11:20 (GMT) |
commit | 331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06 (patch) | |
tree | 3ac789066de67ad2fdb89a06d0156ea15a58bb89 /src/network/access/qnetworkaccessmanager_p.h | |
parent | 39818f933b958d504b9cc18487658209d1df22da (diff) | |
download | Qt-331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06.zip Qt-331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06.tar.gz Qt-331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06.tar.bz2 |
Rename networkAccess property to networkAccessible.
Add unit test and update docs.
Diffstat (limited to 'src/network/access/qnetworkaccessmanager_p.h')
-rw-r--r-- | src/network/access/qnetworkaccessmanager_p.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h index 0140268..1785685 100644 --- a/src/network/access/qnetworkaccessmanager_p.h +++ b/src/network/access/qnetworkaccessmanager_p.h @@ -58,6 +58,7 @@ #include "qnetworkaccessbackend_p.h" #include "private/qobject_p.h" #include "QtNetwork/qnetworkproxy.h" +#include "QtNetwork/qnetworksession.h" QT_BEGIN_NAMESPACE @@ -65,7 +66,6 @@ class QAuthenticator; class QAbstractNetworkCache; class QNetworkAuthenticationCredential; class QNetworkCookieJar; -class QNetworkSession; class QNetworkAccessManagerPrivate: public QObjectPrivate { @@ -76,7 +76,8 @@ public: proxyFactory(0), #endif networkSession(0), - networkAccessEnabled(true), + networkAccessible(QNetworkAccessManager::Accessible), + online(false), initializeSession(true), cookieJarCreated(false) { } @@ -109,6 +110,7 @@ public: void _q_networkSessionNewConfigurationActivated(); void _q_networkSessionPreferredConfigurationChanged(const QNetworkConfiguration &config, bool isSeamless); + void _q_networkSessionStateChanged(QNetworkSession::State state); // this is the cache for storing downloaded files QAbstractNetworkCache *networkCache; @@ -123,7 +125,8 @@ public: QNetworkSession *networkSession; QString networkConfiguration; - bool networkAccessEnabled; + QNetworkAccessManager::NetworkAccessibility networkAccessible; + bool online; bool initializeSession; bool cookieJarCreated; |