diff options
Diffstat (limited to 'src/core/find_text_helper.h')
| -rw-r--r-- | src/core/find_text_helper.h | 57 |
1 files changed, 13 insertions, 44 deletions
diff --git a/src/core/find_text_helper.h b/src/core/find_text_helper.h index 9843dc8b5..6d2e48b63 100644 --- a/src/core/find_text_helper.h +++ b/src/core/find_text_helper.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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) 2021 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 // // W A R N I N G @@ -51,10 +15,13 @@ #ifndef FIND_TEXT_HELPER_H #define FIND_TEXT_HELPER_H -#include "qtwebenginecoreglobal_p.h" +#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h> -#include "qwebenginecallback_p.h" #include <QJSValue> +#include <QMap> +#include <QString> + +#include <functional> namespace content { class WebContents; @@ -64,16 +31,18 @@ namespace gfx { class Rect; } +QT_FORWARD_DECLARE_CLASS(QWebEngineFindTextResult) + namespace QtWebEngineCore { class WebContentsAdapterClient; -class Q_WEBENGINECORE_PRIVATE_EXPORT FindTextHelper { +class Q_WEBENGINECORE_EXPORT FindTextHelper { public: FindTextHelper(content::WebContents *webContents, WebContentsAdapterClient *viewClient); ~FindTextHelper(); - void startFinding(const QString &findText, bool caseSensitively, bool findBackward, const QWebEngineCallback<bool> resultCallback); + void startFinding(const QString &findText, bool caseSensitively, bool findBackward, const std::function<void(const QWebEngineFindTextResult &)> &resultCallback); void startFinding(const QString &findText, bool caseSensitively, bool findBackward, const QJSValue &resultCallback); void startFinding(const QString &findText, bool caseSensitively, bool findBackward); void stopFinding(); @@ -82,7 +51,7 @@ public: void handleLoadCommitted(); private: - void invokeResultCallback(int requestId, int numberOfMatches); + void invokeResultCallback(int requestId, int numberOfMatches, int activeMatch); content::WebContents *m_webContents; WebContentsAdapterClient *m_viewClient; @@ -94,7 +63,7 @@ private: QString m_previousFindText; QMap<int, QJSValue> m_quickCallbacks; - CallbackDirectory m_widgetCallbacks; + QMap<int, std::function<void(const QWebEngineFindTextResult &)>> m_widgetCallbacks; }; } // namespace QtWebEngineCore |