1 files changed, 5 insertions, 47 deletions

diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.h b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.h
index e78a7fc6d1..89f48d8b01 100644
--- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.h
+++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins 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 QGTK3DIALOGHELPERS_H
 #define QGTK3DIALOGHELPERS_H
@@ -47,6 +11,7 @@
 #include <QtCore/qstring.h>
 #include <qpa/qplatformdialoghelper.h>
 
+typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkDialog GtkDialog;
 typedef struct _GtkFileFilter GtkFileFilter;
 
@@ -70,9 +35,6 @@ public:
     void setCurrentColor(const QColor &color) override;
     QColor currentColor() const override;
 
-private Q_SLOTS:
-    void onAccepted();
-
 private:
     static void onColorChanged(QGtk3ColorDialogHelper *helper);
     void applyOptions();
@@ -101,13 +63,11 @@ public:
     void selectNameFilter(const QString &filter) override;
     QString selectedNameFilter() const override;
 
-private Q_SLOTS:
-    void onAccepted();
-
 private:
     static void onSelectionChanged(GtkDialog *dialog, QGtk3FileDialogHelper *helper);
     static void onCurrentFolderChanged(QGtk3FileDialogHelper *helper);
     static void onFilterChanged(QGtk3FileDialogHelper *helper);
+    static void onUpdatePreview(GtkDialog *dialog, QGtk3FileDialogHelper *helper);
     void applyOptions();
     void setNameFilters(const QStringList &filters);
     void selectFileInternal(const QUrl &filename);
@@ -118,6 +78,7 @@ private:
     QHash<QString, GtkFileFilter*> _filters;
     QHash<GtkFileFilter*, QString> _filterNames;
     QScopedPointer<QGtk3Dialog> d;
+    GtkWidget *previewWidget;
 };
 
 class QGtk3FontDialogHelper : public QPlatformFontDialogHelper
@@ -135,9 +96,6 @@ public:
     void setCurrentFont(const QFont &font) override;
     QFont currentFont() const override;
 
-private Q_SLOTS:
-    void onAccepted();
-
 private:
     static void onFontChanged(QGtk3FontDialogHelper *helper);
     void applyOptions();