ProxyAuthHandler Use QPointer instead of QWeakPointer

QWeakPointer::data is deprecated.
In this case we should use QPointer
This commit is contained in:
Olivier Goffart 2020-02-05 12:52:58 +01:00 committed by Kevin Ottens
parent e08645f259
commit f81f96915f
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2

View file

@ -80,14 +80,12 @@ void ProxyAuthHandler::handleProxyAuthenticationRequired(
}
// Find the responsible QNAM if possible.
QNetworkAccessManager *sending_qnam = nullptr;
QWeakPointer<QNetworkAccessManager> qnam_alive;
QPointer<QNetworkAccessManager> sending_qnam = nullptr;
if (auto account = qobject_cast<Account *>(sender())) {
// Since we go into an event loop, it's possible for the account's qnam
// to be destroyed before we get back. We can use this to check for its
// liveness.
qnam_alive = account->sharedNetworkAccessManager();
sending_qnam = qnam_alive.data();
sending_qnam = account->sharedNetworkAccessManager().data();
}
if (!sending_qnam) {
qCWarning(lcProxy) << "Could not get the sending QNAM for" << sender();
@ -125,7 +123,6 @@ void ProxyAuthHandler::handleProxyAuthenticationRequired(
qCInfo(lcProxy) << "got creds for" << _proxy;
authenticator->setUser(_username);
authenticator->setPassword(_password);
sending_qnam = qnam_alive.data();
if (sending_qnam) {
_gaveCredentialsTo.insert(sending_qnam);
connect(sending_qnam, &QObject::destroyed,