From fa06a1662b80160eb9bf475775345e8af49a9554 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Thu, 22 Oct 2015 15:50:33 +0200
Subject: Remove const from QWebEngineCookieStoreClient::FilterRequest in
 setCookieFilter callback

FilterRequest can be rejected by changing FilterRequest::accepted to false,
so it should not be const.

Change-Id: I87cd0f97dd442c6676aeeda9e1cbeb582eb06741
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 src/core/api/qwebenginecookiestoreclient.cpp | 4 ++--
 src/core/api/qwebenginecookiestoreclient.h   | 2 +-
 src/core/api/qwebenginecookiestoreclient_p.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/api/qwebenginecookiestoreclient.cpp b/src/core/api/qwebenginecookiestoreclient.cpp
index 167b3f68c..bd43b871d 100644
--- a/src/core/api/qwebenginecookiestoreclient.cpp
+++ b/src/core/api/qwebenginecookiestoreclient.cpp
@@ -181,7 +181,7 @@ bool QWebEngineCookieStoreClientPrivate::canSetCookie(const QUrl &firstPartyUrl,
         request.firstPartyUrl = firstPartyUrl;
         request.cookieLine = cookieLine;
         request.cookieSource = url;
-        callbackDirectory.invokeDirectly<const QWebEngineCookieStoreClient::FilterRequest&>(filterCallback, request);
+        callbackDirectory.invokeDirectly<QWebEngineCookieStoreClient::FilterRequest&>(filterCallback, request);
         return request.accepted;
     }
     return true;
@@ -394,7 +394,7 @@ void QWebEngineCookieStoreClient::deleteAllCookies()
 
     \sa deleteAllCookiesWithCallback(), getAllCookies()
 */
-void QWebEngineCookieStoreClient::setCookieFilter(const QWebEngineCallback<const QWebEngineCookieStoreClient::FilterRequest&> &filter)
+void QWebEngineCookieStoreClient::setCookieFilter(const QWebEngineCallback<QWebEngineCookieStoreClient::FilterRequest&> &filter)
 {
     Q_D(QWebEngineCookieStoreClient);
     d->filterCallback = filter;
diff --git a/src/core/api/qwebenginecookiestoreclient.h b/src/core/api/qwebenginecookiestoreclient.h
index 8bdb988e2..4664a8459 100644
--- a/src/core/api/qwebenginecookiestoreclient.h
+++ b/src/core/api/qwebenginecookiestoreclient.h
@@ -77,7 +77,7 @@ public:
     void deleteSessionCookiesWithCallback(const QWebEngineCallback<int> &resultCallback);
     void deleteAllCookiesWithCallback(const QWebEngineCallback<int> &resultCallback);
     void getAllCookies(const QWebEngineCallback<const QByteArray&> &resultCallback);
-    void setCookieFilter(const QWebEngineCallback<const FilterRequest&> &filterCallback);
+    void setCookieFilter(const QWebEngineCallback<FilterRequest&> &filterCallback);
 #endif
     void setCookie(const QNetworkCookie &cookie, const QUrl &origin = QUrl());
     void deleteCookie(const QNetworkCookie &cookie, const QUrl &origin = QUrl());
diff --git a/src/core/api/qwebenginecookiestoreclient_p.h b/src/core/api/qwebenginecookiestoreclient_p.h
index 43652fba6..68ab6549f 100644
--- a/src/core/api/qwebenginecookiestoreclient_p.h
+++ b/src/core/api/qwebenginecookiestoreclient_p.h
@@ -74,7 +74,7 @@ class QWEBENGINE_PRIVATE_EXPORT QWebEngineCookieStoreClientPrivate {
 public:
     Q_DECLARE_PUBLIC(QWebEngineCookieStoreClient)
     QtWebEngineCore::CallbackDirectory callbackDirectory;
-    QWebEngineCallback<const QWebEngineCookieStoreClient::FilterRequest&> filterCallback;
+    QWebEngineCallback<QWebEngineCookieStoreClient::FilterRequest&> filterCallback;
     QList<CookieData> m_pendingUserCookies;
     quint64 m_nextCallbackId;
     bool m_deleteSessionCookiesPending;
-- 
cgit v1.2.3