diff -r b72c6db6890b -r 5dc02b23752f src/network/access/qnetworkaccessmanager.h --- a/src/network/access/qnetworkaccessmanager.h Wed Jun 23 19:07:03 2010 +0300 +++ b/src/network/access/qnetworkaccessmanager.h Tue Jul 06 15:10:48 2010 +0300 @@ -62,12 +62,20 @@ class QNetworkProxy; class QNetworkProxyFactory; class QSslError; +#if !defined(QT_NO_BEARERMANAGEMENT) && !defined(QT_MOBILITY_BEARER) +class QNetworkConfiguration; +#endif class QNetworkReplyImplPrivate; class QNetworkAccessManagerPrivate; class Q_NETWORK_EXPORT QNetworkAccessManager: public QObject { Q_OBJECT + +#ifndef QT_NO_BEARERMANAGEMENT + Q_PROPERTY(NetworkAccessibility networkAccessible READ networkAccessible WRITE setNetworkAccessible NOTIFY networkAccessibleChanged) +#endif + public: enum Operation { HeadOperation = 1, @@ -75,10 +83,19 @@ PutOperation, PostOperation, DeleteOperation, + CustomOperation, UnknownOperation = 0 }; +#ifndef QT_NO_BEARERMANAGEMENT + enum NetworkAccessibility { + UnknownAccessibility = -1, + NotAccessible = 0, + Accessible = 1 + }; +#endif + explicit QNetworkAccessManager(QObject *parent = 0); ~QNetworkAccessManager(); @@ -102,6 +119,18 @@ QNetworkReply *put(const QNetworkRequest &request, QIODevice *data); QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data); QNetworkReply *deleteResource(const QNetworkRequest &request); + QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = 0); + +#if !defined(QT_NO_BEARERMANAGEMENT) && !defined(QT_MOBILITY_BEARER) + void setConfiguration(const QNetworkConfiguration &config); + QNetworkConfiguration configuration() const; + QNetworkConfiguration activeConfiguration() const; +#endif + +#ifndef QT_NO_BEARERMANAGEMENT + void setNetworkAccessible(NetworkAccessibility accessible); + NetworkAccessibility networkAccessible() const; +#endif Q_SIGNALS: #ifndef QT_NO_NETWORKPROXY @@ -113,6 +142,14 @@ void sslErrors(QNetworkReply *reply, const QList &errors); #endif +#if !defined(QT_NO_BEARERMANAGEMENT) && !defined(QT_MOBILITY_BEARER) + void networkSessionConnected(); +#endif + +#ifndef QT_NO_BEARERMANAGEMENT + void networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility accessible); +#endif + protected: virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0); @@ -122,6 +159,12 @@ Q_DECLARE_PRIVATE(QNetworkAccessManager) Q_PRIVATE_SLOT(d_func(), void _q_replyFinished()) Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList)) +#if !defined(QT_NO_BEARERMANAGEMENT) && !defined(QT_MOBILITY_BEARER) + Q_PRIVATE_SLOT(d_func(), void _q_networkSessionClosed()) + Q_PRIVATE_SLOT(d_func(), void _q_networkSessionNewConfigurationActivated()) + Q_PRIVATE_SLOT(d_func(), void _q_networkSessionPreferredConfigurationChanged(QNetworkConfiguration,bool)) + Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State)) +#endif }; QT_END_NAMESPACE