1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkAccessManager: store QNetworkConfiguration instead of identifier

Browse Source 
In case a network session is not required, we need access to the
configuration object rather than to the QString.

Change-Id: I05945525ce8247e343d0bebd7ec15e0e162ed826
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
This commit is contained in:
Peter Hartmann 2013-02-20 17:17:38 +01:00 committed by The Qt Project
parent 4a5182e63d
commit 16269904a2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/access/qnetworkaccessmanager.cpp
View File

@ -844,7 +844,9 @@ QNetworkReply *QNetworkAccessManager::deleteResource(const QNetworkRequest &requ
*/ */
void QNetworkAccessManager::setConfiguration(const QNetworkConfiguration &config) void QNetworkAccessManager::setConfiguration(const QNetworkConfiguration &config)
{ {
d_func()->createSession(config); Q_D(QNetworkAccessManager);
d->networkConfiguration = config;
d->createSession(config);
} }
/*! /*!
@ -1050,10 +1052,10 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
return new QDisabledNetworkReply(this, req, op); return new QDisabledNetworkReply(this, req, op);
} }
if (!d->networkSessionStrongRef && (d->initializeSession || !d->networkConfiguration.isEmpty())) { if (!d->networkSessionStrongRef && (d->initializeSession || !d->networkConfiguration.identifier().isEmpty())) {
QNetworkConfigurationManager manager; QNetworkConfigurationManager manager;
if (!d->networkConfiguration.isEmpty()) { if (!d->networkConfiguration.identifier().isEmpty()) {
d->createSession(manager.configurationFromIdentifier(d->networkConfiguration)); d->createSession(d->networkConfiguration);
} else { } else {
if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired)
d->createSession(manager.defaultConfiguration()); d->createSession(manager.defaultConfiguration());
@ -1403,7 +1405,7 @@ void QNetworkAccessManagerPrivate::_q_networkSessionClosed()
Q_Q(QNetworkAccessManager); Q_Q(QNetworkAccessManager);
QSharedPointer<QNetworkSession> networkSession(getNetworkSession()); QSharedPointer<QNetworkSession> networkSession(getNetworkSession());
if (networkSession) { if (networkSession) {
networkConfiguration = networkSession->configuration().identifier(); networkConfiguration = networkSession->configuration();
//disconnect from old session //disconnect from old session
QObject::disconnect(networkSession.data(), SIGNAL(opened()), q, SIGNAL(networkSessionConnected())); QObject::disconnect(networkSession.data(), SIGNAL(opened()), q, SIGNAL(networkSessionConnected()));

2
src/network/access/qnetworkaccessmanager_p.h
View File

@ -148,7 +148,7 @@ public:
QSharedPointer<QNetworkSession> networkSessionStrongRef; QSharedPointer<QNetworkSession> networkSessionStrongRef;
QWeakPointer<QNetworkSession> networkSessionWeakRef; QWeakPointer<QNetworkSession> networkSessionWeakRef;
QNetworkSession::State lastSessionState; QNetworkSession::State lastSessionState;
QString networkConfiguration; QNetworkConfiguration networkConfiguration;
QNetworkAccessManager::NetworkAccessibility networkAccessible; QNetworkAccessManager::NetworkAccessibility networkAccessible;
int activeReplyCount; int activeReplyCount;
bool online; bool online;