diff options
Diffstat (limited to 'src/core/file_picker_controller.h')
-rw-r--r-- | src/core/file_picker_controller.h | 66 |
1 files changed, 12 insertions, 54 deletions
diff --git a/src/core/file_picker_controller.h b/src/core/file_picker_controller.h index 0b680161a..42ffd6a2d 100644 --- a/src/core/file_picker_controller.h +++ b/src/core/file_picker_controller.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 // // W A R N I N G @@ -51,20 +15,14 @@ #ifndef FILE_PICKER_CONTROLLER_H #define FILE_PICKER_CONTROLLER_H -#include "qtwebenginecoreglobal_p.h" - -#include <memory> - +#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h> #include <QObject> #include <QStringList> -namespace content { - class FileSelectListener; -} - namespace QtWebEngineCore { -class Q_WEBENGINECORE_PRIVATE_EXPORT FilePickerController : public QObject { +class FilePickerControllerPrivate; +class Q_WEBENGINECORE_EXPORT FilePickerController : public QObject { Q_OBJECT public: enum FileChooserMode { @@ -74,8 +32,9 @@ public: Save }; - FilePickerController(FileChooserMode mode, std::unique_ptr<content::FileSelectListener> listener, const QString &defaultFileName, const QStringList &acceptedMimeTypes, QObject * = 0); + FilePickerController(FilePickerControllerPrivate *priv, QObject *parent = nullptr); ~FilePickerController() override; + QStringList acceptedMimeTypes() const; QString defaultFileName() const; FileChooserMode mode() const; @@ -89,13 +48,12 @@ public Q_SLOTS: private: void filesSelectedInChooser(const QStringList &filesList); - QString m_defaultFileName; - QStringList m_acceptedMimeTypes; - std::unique_ptr<content::FileSelectListener> m_listener; - FileChooserMode m_mode; - + FilePickerControllerPrivate *d_ptr; + // Using Quick, the FileSelectListenerImpl destructor may crash in debug mode + // if the browser window is closed and the FilePicker is still open + bool m_isHandled = false; }; -} // namespace +} // namespace QtWebEngineCore #endif // FILE_PICKER_CONTROLLER_H |