diff options
Diffstat (limited to 'src/widgets/dialogs/qfontdialog_p.h')
-rw-r--r-- | src/widgets/dialogs/qfontdialog_p.h | 55 |
1 files changed, 11 insertions, 44 deletions
diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index 73c17c3708..89b795f35e 100644 --- a/src/widgets/dialogs/qfontdialog_p.h +++ b/src/widgets/dialogs/qfontdialog_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 QtWidgets 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 QFONTDIALOG_P_H #define QFONTDIALOG_P_H @@ -57,6 +21,8 @@ #include "qfontdatabase.h" #include "qfontdialog.h" #include <qpa/qplatformdialoghelper.h> + +#include <QtCore/qpointer.h> #include "qsharedpointer.h" QT_REQUIRE_CONFIG(fontdialog); @@ -91,12 +57,12 @@ public: const QString &title, QFontDialog::FontDialogOptions options); void init(); - void _q_sizeChanged(const QString &); - void _q_familyHighlighted(int); - void _q_writingSystemHighlighted(int); - void _q_styleHighlighted(int); - void _q_sizeHighlighted(int); - void _q_updateSample(); + void sizeChanged(const QString &); + void familyHighlighted(int); + void writingSystemHighlighted(int); + void styleHighlighted(int); + void sizeHighlighted(int); + void updateSample(); void updateSampleFont(const QFont &newFont); void retranslateStrings(); @@ -141,6 +107,7 @@ public: QByteArray memberToDisconnectOnClose; bool canBeNativeDialog() const override; + void setVisible(bool visible) override; void _q_runNativeAppModalPanel(); private: |