diff options
Diffstat (limited to 'src/core/api/qwebenginecookiestore_p.h')
-rw-r--r-- | src/core/api/qwebenginecookiestore_p.h | 59 |
1 files changed, 9 insertions, 50 deletions
diff --git a/src/core/api/qwebenginecookiestore_p.h b/src/core/api/qwebenginecookiestore_p.h index a79e2b095..51200436d 100644 --- a/src/core/api/qwebenginecookiestore_p.h +++ b/src/core/api/qwebenginecookiestore_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QWEBENGINECOOKIESTORE_P_H #define QWEBENGINECOOKIESTORE_P_H @@ -53,10 +17,9 @@ #include "qtwebenginecoreglobal_p.h" -#include "qwebenginecallback_p.h" #include "qwebenginecookiestore.h" -#include <QVector> +#include <QList> #include <QNetworkCookie> #include <QUrl> @@ -66,10 +29,11 @@ class CookieMonsterDelegateQt; QT_BEGIN_NAMESPACE -class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineCookieStorePrivate { +class Q_WEBENGINECORE_EXPORT QWebEngineCookieStorePrivate +{ Q_DECLARE_PUBLIC(QWebEngineCookieStore) struct CookieData { - quint64 callbackId; + bool wasDelete; QNetworkCookie cookie; QUrl origin; }; @@ -77,10 +41,8 @@ class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineCookieStorePrivate { QWebEngineCookieStore *q_ptr; public: - QtWebEngineCore::CallbackDirectory callbackDirectory; std::function<bool(const QWebEngineCookieStore::FilterRequest &)> filterCallback; - QVector<CookieData> m_pendingUserCookies; - quint64 m_nextCallbackId; + QList<CookieData> m_pendingUserCookies; bool m_deleteSessionCookiesPending; bool m_deleteAllCookiesPending; bool m_getAllCookiesPending; @@ -91,7 +53,7 @@ public: void processPendingUserCookies(); void rejectPendingUserCookies(); - void setCookie(const QWebEngineCallback<bool> &callback, const QNetworkCookie &cookie, const QUrl &origin); + void setCookie(const QNetworkCookie &cookie, const QUrl &origin); void deleteCookie(const QNetworkCookie &cookie, const QUrl &url); void deleteSessionCookies(); void deleteAllCookies(); @@ -99,13 +61,10 @@ public: bool canAccessCookies(const QUrl &firstPartyUrl, const QUrl &url) const; - void onGetAllCallbackResult(qint64 callbackId, const QByteArray &cookieList); - void onSetCallbackResult(qint64 callbackId, bool success); - void onDeleteCallbackResult(qint64 callbackId, int numCookies); void onCookieChanged(const QNetworkCookie &cookie, bool removed); }; -Q_DECLARE_TYPEINFO(QWebEngineCookieStorePrivate::CookieData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QWebEngineCookieStorePrivate::CookieData, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE |