1 files changed, 17 insertions, 25 deletions

diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp
index fa72265dc..035c98342 100644
--- a/src/core/api/qwebenginecookiestore.cpp
+++ b/src/core/api/qwebenginecookiestore.cpp
@@ -94,7 +94,7 @@ void QWebEngineCookieStorePrivate::processPendingUserCookies()
     if (m_pendingUserCookies.isEmpty())
         return;
 
-    Q_FOREACH (const auto &cookieData, m_pendingUserCookies) {
+    for (const CookieData &cookieData : qAsConst(m_pendingUserCookies)) {
         if (cookieData.callbackId == CallbackDirectory::DeleteCookieCallbackId)
             delegate->deleteCookie(cookieData.cookie, cookieData.origin);
         else
@@ -184,14 +184,13 @@ void QWebEngineCookieStorePrivate::onDeleteCallbackResult(qint64 callbackId, int
 
 void QWebEngineCookieStorePrivate::onCookieChanged(const QNetworkCookie &cookie, bool removed)
 {
-    Q_Q(QWebEngineCookieStore);
     if (removed)
-        Q_EMIT q->cookieRemoved(cookie);
+        Q_EMIT q_ptr->cookieRemoved(cookie);
     else
-        Q_EMIT q->cookieAdded(cookie);
+        Q_EMIT q_ptr->cookieAdded(cookie);
 }
 
-bool QWebEngineCookieStorePrivate::canAccessCookies(const QUrl &firstPartyUrl, const QUrl &url)
+bool QWebEngineCookieStorePrivate::canAccessCookies(const QUrl &firstPartyUrl, const QUrl &url) const
 {
     if (!filterCallback)
         return true;
@@ -269,8 +268,7 @@ QWebEngineCookieStore::~QWebEngineCookieStore()
 void QWebEngineCookieStore::setCookie(const QNetworkCookie &cookie, const QUrl &origin)
 {
     //TODO: use callbacks or delete dummy ones
-    Q_D(QWebEngineCookieStore);
-    d->setCookie(QWebEngineCallback<bool>(), cookie, origin);
+    d_ptr->setCookie(QWebEngineCallback<bool>(), cookie, origin);
 }
 
 /*!
@@ -283,8 +281,7 @@ void QWebEngineCookieStore::setCookie(const QNetworkCookie &cookie, const QUrl &
 
 void QWebEngineCookieStore::deleteCookie(const QNetworkCookie &cookie, const QUrl &origin)
 {
-    Q_D(QWebEngineCookieStore);
-    d->deleteCookie(cookie, origin);
+    d_ptr->deleteCookie(cookie, origin);
 }
 
 /*!
@@ -299,12 +296,11 @@ void QWebEngineCookieStore::deleteCookie(const QNetworkCookie &cookie, const QUr
 void QWebEngineCookieStore::loadAllCookies()
 {
     //TODO: use callbacks or delete dummy ones
-    Q_D(QWebEngineCookieStore);
-    if (d->m_getAllCookiesPending)
+    if (d_ptr->m_getAllCookiesPending)
         return;
-    d->callbackDirectory.registerCallback(CallbackDirectory::GetAllCookiesCallbackId, QWebEngineCallback<const QByteArray&>());
+    d_ptr->callbackDirectory.registerCallback(CallbackDirectory::GetAllCookiesCallbackId, QWebEngineCallback<const QByteArray&>());
     //this will trigger cookieAdded signal
-    d->getAllCookies();
+    d_ptr->getAllCookies();
 }
 
 /*!
@@ -318,11 +314,10 @@ void QWebEngineCookieStore::loadAllCookies()
 void QWebEngineCookieStore::deleteSessionCookies()
 {
     //TODO: use callbacks or delete dummy ones
-    Q_D(QWebEngineCookieStore);
-    if (d->m_deleteAllCookiesPending || d->m_deleteSessionCookiesPending)
+    if (d_ptr->m_deleteAllCookiesPending || d_ptr->m_deleteSessionCookiesPending)
         return;
-    d->callbackDirectory.registerCallback(CallbackDirectory::DeleteSessionCookiesCallbackId, QWebEngineCallback<int>());
-    d->deleteSessionCookies();
+    d_ptr->callbackDirectory.registerCallback(CallbackDirectory::DeleteSessionCookiesCallbackId, QWebEngineCallback<int>());
+    d_ptr->deleteSessionCookies();
 }
 
 /*!
@@ -334,11 +329,10 @@ void QWebEngineCookieStore::deleteSessionCookies()
 void QWebEngineCookieStore::deleteAllCookies()
 {
     //TODO: use callbacks or delete dummy ones
-    Q_D(QWebEngineCookieStore);
-    if (d->m_deleteAllCookiesPending)
+    if (d_ptr->m_deleteAllCookiesPending)
         return;
-    d->callbackDirectory.registerCallback(CallbackDirectory::DeleteAllCookiesCallbackId, QWebEngineCallback<int>());
-    d->deleteAllCookies();
+    d_ptr->callbackDirectory.registerCallback(CallbackDirectory::DeleteAllCookiesCallbackId, QWebEngineCallback<int>());
+    d_ptr->deleteAllCookies();
 }
 
 /*!
@@ -371,8 +365,7 @@ void QWebEngineCookieStore::deleteAllCookies()
 */
 void QWebEngineCookieStore::setCookieFilter(const std::function<bool(const FilterRequest &)> &filterCallback)
 {
-    Q_D(QWebEngineCookieStore);
-    d->filterCallback = filterCallback;
+    d_ptr->filterCallback = filterCallback;
 }
 
 /*!
@@ -381,8 +374,7 @@ void QWebEngineCookieStore::setCookieFilter(const std::function<bool(const Filte
 */
 void QWebEngineCookieStore::setCookieFilter(std::function<bool(const FilterRequest &)> &&filterCallback)
 {
-    Q_D(QWebEngineCookieStore);
-    d->filterCallback = std::move(filterCallback);
+    d_ptr->filterCallback = std::move(filterCallback);
 }
 
 /*!