From 5ad5773f2388bfa74b16fd9108f3f00cbed06b43 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Wed, 12 Jul 2023 03:08:01 +0300 Subject: Build with QT_NO_CONTEXTLESS_CONNECT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This disables the 3-arg QObject::connect() overload: QObject::connect(sender, signal, functor) For details see: https://lists.qt-project.org/pipermail/development/2023-July/044141.html Change-Id: If6e8d202b114d053933fc1dcab5b99377c67a879 Reviewed-by: Mårten Nordheim --- src/oauth/CMakeLists.txt | 2 ++ src/oauth/qabstractoauth2.cpp | 14 +++++++------- src/oauth/qoauth1.cpp | 19 ++++++++++--------- src/oauth/qoauth2authorizationcodeflow.cpp | 4 ++-- src/oauth/qoauthhttpserverreplyhandler.cpp | 4 ++-- 5 files changed, 23 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/oauth/CMakeLists.txt b/src/oauth/CMakeLists.txt index 4a47aed..caa892b 100644 --- a/src/oauth/CMakeLists.txt +++ b/src/oauth/CMakeLists.txt @@ -25,6 +25,8 @@ qt_internal_add_module(NetworkAuth Qt::Network PRIVATE_MODULE_INTERFACE Qt::CorePrivate + DEFINES + QT_NO_CONTEXTLESS_CONNECT ) #### Keys ignored in scope 1:.:.:oauth.pro:: diff --git a/src/oauth/qabstractoauth2.cpp b/src/oauth/qabstractoauth2.cpp index b7eb57f..024a32a 100644 --- a/src/oauth/qabstractoauth2.cpp +++ b/src/oauth/qabstractoauth2.cpp @@ -236,7 +236,7 @@ QNetworkReply *QAbstractOAuth2::head(const QUrl &url, const QVariantMap ¶met { Q_D(QAbstractOAuth2); QNetworkReply *reply = d->networkAccessManager()->head(d->createRequest(url, ¶meters)); - connect(reply, &QNetworkReply::finished, [this, reply]() { emit finished(reply); }); + connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit finished(reply); }); return reply; } @@ -252,7 +252,7 @@ QNetworkReply *QAbstractOAuth2::get(const QUrl &url, const QVariantMap ¶mete { Q_D(QAbstractOAuth2); QNetworkReply *reply = d->networkAccessManager()->get(d->createRequest(url, ¶meters)); - connect(reply, &QNetworkReply::finished, [this, reply]() { emit finished(reply); }); + connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit finished(reply); }); return reply; } @@ -287,7 +287,7 @@ QNetworkReply *QAbstractOAuth2::post(const QUrl &url, const QByteArray &data) { Q_D(QAbstractOAuth2); QNetworkReply *reply = d->networkAccessManager()->post(d->createRequest(url), data); - connect(reply, &QNetworkReply::finished, [this, reply]() { emit finished(reply); }); + connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit finished(reply); }); return reply; } @@ -307,7 +307,7 @@ QNetworkReply *QAbstractOAuth2::post(const QUrl &url, QHttpMultiPart *multiPart) { Q_D(QAbstractOAuth2); QNetworkReply *reply = d->networkAccessManager()->post(d->createRequest(url), multiPart); - connect(reply, &QNetworkReply::finished, [this, reply]() { emit finished(reply); }); + connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit finished(reply); }); return reply; } @@ -342,7 +342,7 @@ QNetworkReply *QAbstractOAuth2::put(const QUrl &url, const QByteArray &data) { Q_D(QAbstractOAuth2); QNetworkReply *reply = d->networkAccessManager()->put(d->createRequest(url), data); - connect(reply, &QNetworkReply::finished, std::bind(&QAbstractOAuth::finished, this, reply)); + connect(reply, &QNetworkReply::finished, this, std::bind(&QAbstractOAuth::finished, this, reply)); return reply; } @@ -362,7 +362,7 @@ QNetworkReply *QAbstractOAuth2::put(const QUrl &url, QHttpMultiPart *multiPart) { Q_D(QAbstractOAuth2); QNetworkReply *reply = d->networkAccessManager()->put(d->createRequest(url), multiPart); - connect(reply, &QNetworkReply::finished, std::bind(&QAbstractOAuth::finished, this, reply)); + connect(reply, &QNetworkReply::finished, this, std::bind(&QAbstractOAuth::finished, this, reply)); return reply; } @@ -379,7 +379,7 @@ QNetworkReply *QAbstractOAuth2::deleteResource(const QUrl &url, const QVariantMa Q_D(QAbstractOAuth2); QNetworkReply *reply = d->networkAccessManager()->deleteResource( d->createRequest(url, ¶meters)); - connect(reply, &QNetworkReply::finished, [this, reply]() { emit finished(reply); }); + connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit finished(reply); }); return reply; } diff --git a/src/oauth/qoauth1.cpp b/src/oauth/qoauth1.cpp index ff0c993..e9def68 100644 --- a/src/oauth/qoauth1.cpp +++ b/src/oauth/qoauth1.cpp @@ -192,7 +192,7 @@ QNetworkReply *QOAuth1Private::requestToken(QNetworkAccessManager::Operation ope QAbstractOAuthReplyHandler *handler = replyHandler ? replyHandler.data() : defaultReplyHandler.data(); - QObject::connect(reply, &QNetworkReply::finished, + QObject::connect(reply, &QNetworkReply::finished, handler, [handler, reply]() { handler->networkReplyFinished(reply); }); connect(handler, &QAbstractOAuthReplyHandler::tokensReceived, this, &QOAuth1Private::_q_tokensReceived); @@ -609,7 +609,7 @@ QNetworkReply *QOAuth1::get(const QUrl &url, const QVariantMap ¶meters) QNetworkRequest request(url); setup(&request, parameters, QNetworkAccessManager::GetOperation); QNetworkReply *reply = d->networkAccessManager()->get(request); - connect(reply, &QNetworkReply::finished, [this, reply]() { emit finished(reply); }); + connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit finished(reply); }); return reply; } @@ -634,7 +634,7 @@ QNetworkReply *QOAuth1::post(const QUrl &url, const QVariantMap ¶meters) const QByteArray data = d->convertParameters(parameters); QNetworkReply *reply = d->networkAccessManager()->post(request, data); - connect(reply, &QNetworkReply::finished, [this, reply]() { emit finished(reply); }); + connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit finished(reply); }); return reply; } @@ -659,7 +659,7 @@ QNetworkReply *QOAuth1::put(const QUrl &url, const QVariantMap ¶meters) const QByteArray data = d->convertParameters(parameters); QNetworkReply *reply = d->networkAccessManager()->put(request, data); - connect(reply, &QNetworkReply::finished, std::bind(&QAbstractOAuth::finished, this, reply)); + connect(reply, &QNetworkReply::finished, this, std::bind(&QAbstractOAuth::finished, this, reply)); return reply; } @@ -681,7 +681,7 @@ QNetworkReply *QOAuth1::deleteResource(const QUrl &url, const QVariantMap ¶m QNetworkRequest request(url); setup(&request, parameters, QNetworkAccessManager::DeleteOperation); QNetworkReply *reply = d->networkAccessManager()->deleteResource(request); - connect(reply, &QNetworkReply::finished, [this, reply]() { emit finished(reply); }); + connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit finished(reply); }); return reply; } @@ -855,7 +855,7 @@ void QOAuth1::grant() } QMetaObject::Connection connection; - connection = connect(this, &QAbstractOAuth::statusChanged, [&](Status status) { + connection = connect(this, &QAbstractOAuth::statusChanged, this, [&](Status status) { Q_D(QOAuth1); if (status == Status::TemporaryCredentialsReceived) { @@ -883,8 +883,8 @@ void QOAuth1::grant() auto httpReplyHandler = qobject_cast(replyHandler()); if (httpReplyHandler) { - connect(httpReplyHandler, &QOAuthHttpServerReplyHandler::callbackReceived, [&]( - const QVariantMap &values) { + auto func = [this](const QVariantMap &values) { + Q_D(QOAuth1); QString verifier = values.value(OAuth1::oauthVerifier).toString(); if (verifier.isEmpty()) { qCWarning(d->loggingCategory, "%s not found in the callback", @@ -892,7 +892,8 @@ void QOAuth1::grant() return; } continueGrantWithVerifier(verifier); - }); + }; + connect(httpReplyHandler, &QOAuthHttpServerReplyHandler::callbackReceived, this, func); } // requesting temporary credentials diff --git a/src/oauth/qoauth2authorizationcodeflow.cpp b/src/oauth/qoauth2authorizationcodeflow.cpp index aeae061..5738473 100644 --- a/src/oauth/qoauth2authorizationcodeflow.cpp +++ b/src/oauth/qoauth2authorizationcodeflow.cpp @@ -349,7 +349,7 @@ void QOAuth2AuthorizationCodeFlow::refreshAccessToken() QNetworkReply *reply = d->currentReply.data(); QAbstractOAuthReplyHandler *handler = replyHandler(); - connect(reply, &QNetworkReply::finished, + connect(reply, &QNetworkReply::finished, handler, [handler, reply]() { handler->networkReplyFinished(reply); }); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); QObjectPrivate::connect(d->replyHandler.data(), &QAbstractOAuthReplyHandler::tokensReceived, d, @@ -430,7 +430,7 @@ void QOAuth2AuthorizationCodeFlow::requestAccessToken(const QString &code) QNetworkReply *reply = d->networkAccessManager()->post(request, data.toUtf8()); d->currentReply = reply; QAbstractOAuthReplyHandler *handler = replyHandler(); - QObject::connect(reply, &QNetworkReply::finished, + QObject::connect(reply, &QNetworkReply::finished, handler, [handler, reply] { handler->networkReplyFinished(reply); }); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); QObjectPrivate::connect(d->replyHandler.data(), &QAbstractOAuthReplyHandler::tokensReceived, d, diff --git a/src/oauth/qoauthhttpserverreplyhandler.cpp b/src/oauth/qoauthhttpserverreplyhandler.cpp index 5dbcf4b..7a63e5f 100644 --- a/src/oauth/qoauthhttpserverreplyhandler.cpp +++ b/src/oauth/qoauthhttpserverreplyhandler.cpp @@ -29,7 +29,7 @@ QOAuthHttpServerReplyHandlerPrivate::QOAuthHttpServerReplyHandlerPrivate( QOAuthHttpServerReplyHandler *p) : text(QObject::tr("Callback received. Feel free to close this page.")), q_ptr(p) { - QObject::connect(&httpServer, &QTcpServer::newConnection, + QObject::connect(&httpServer, &QTcpServer::newConnection, q_ptr, [this]() { _q_clientConnected(); }); } @@ -44,7 +44,7 @@ void QOAuthHttpServerReplyHandlerPrivate::_q_clientConnected() QTcpSocket *socket = httpServer.nextPendingConnection(); QObject::connect(socket, &QTcpSocket::disconnected, socket, &QTcpSocket::deleteLater); - QObject::connect(socket, &QTcpSocket::readyRead, + QObject::connect(socket, &QTcpSocket::readyRead, q_ptr, [this, socket]() { _q_readData(socket); }); } -- cgit v1.2.3