diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-02-14 12:07:18 +0100 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-01 21:35:12 +0100 |
commit | 4888e3e8401dc2e949f7e575c0e1e0036d746af6 (patch) | |
tree | a669832b289e0bb17eb511d4042d20136b2269e9 /src/network/access/qnetworkaccessmanager.h | |
parent | ab91ac09924f7e356e4d2b8cf40c89a3c12011bb (diff) |
Remove bearermanagement usage inside QNAM and QNetworkProxy
Change-Id: I2c4fdf598b46daf1b69a65848ebe0fd78ef8be24
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/access/qnetworkaccessmanager.h')
-rw-r--r-- | src/network/access/qnetworkaccessmanager.h | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index db843b2ee7..3a08c30a21 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -63,9 +63,6 @@ class QNetworkProxy; class QNetworkProxyFactory; class QSslError; class QHstsPolicy; -#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section -class QNetworkConfiguration; -#endif class QHttpMultiPart; class QNetworkReplyImplPrivate; @@ -74,9 +71,6 @@ class Q_NETWORK_EXPORT QNetworkAccessManager: public QObject { Q_OBJECT -#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section - Q_PROPERTY(NetworkAccessibility networkAccessible READ networkAccessible WRITE setNetworkAccessible NOTIFY networkAccessibleChanged) -#endif public: enum Operation { @@ -90,18 +84,6 @@ public: UnknownOperation = 0 }; -#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section - enum QT_DEPRECATED_NETWORK_API_5_15 NetworkAccessibility { - UnknownAccessibility = -1, - NotAccessible = 0, - Accessible = 1 - }; -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - Q_ENUM(NetworkAccessibility) -QT_WARNING_POP -#endif - explicit QNetworkAccessManager(QObject *parent = nullptr); ~QNetworkAccessManager(); @@ -148,18 +130,6 @@ QT_WARNING_POP QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QHttpMultiPart *multiPart); #endif -#if !defined(QT_NO_BEARERMANAGEMENT) // ### Qt6: Remove section - QT_DEPRECATED_VERSION_5_15 void setConfiguration(const QNetworkConfiguration &config); - QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration configuration() const; - QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration activeConfiguration() const; - -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QT_DEPRECATED_VERSION_5_15 void setNetworkAccessible(NetworkAccessibility accessible); - QT_DEPRECATED_VERSION_5_15 NetworkAccessibility networkAccessible() const; -QT_WARNING_POP -#endif - #ifndef QT_NO_SSL void connectToHostEncrypted(const QString &hostName, quint16 port = 443, const QSslConfiguration &sslConfiguration = QSslConfiguration::defaultConfiguration()); @@ -190,19 +160,6 @@ Q_SIGNALS: void preSharedKeyAuthenticationRequired(QNetworkReply *reply, QSslPreSharedKeyAuthenticator *authenticator); #endif -#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section - QT_DEPRECATED_VERSION_5_15 void networkSessionConnected(); - -#ifndef Q_MOC_RUN // moc has trouble with the expansion of these macros -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -#endif - QT_DEPRECATED_VERSION_5_15 void networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility accessible); -#ifndef Q_MOC_RUN // moc has trouble with the expansion of these macros -QT_WARNING_POP -#endif -#endif - protected: virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData = nullptr); @@ -222,12 +179,6 @@ private: Q_DECLARE_PRIVATE(QNetworkAccessManager) Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>)) Q_PRIVATE_SLOT(d_func(), void _q_replyPreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*)) -#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section - Q_PRIVATE_SLOT(d_func(), void _q_networkSessionClosed()) - Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State)) - Q_PRIVATE_SLOT(d_func(), void _q_configurationChanged(const QNetworkConfiguration &)) - Q_PRIVATE_SLOT(d_func(), void _q_networkSessionFailed(QNetworkSession::SessionError)) -#endif Q_PRIVATE_SLOT(d_func(), void _q_onlineStateChanged(bool)) }; |