diff options
Diffstat (limited to 'src/gui/text/qfontdatabase.h')
| -rw-r--r-- | src/gui/text/qfontdatabase.h | 63 |
1 files changed, 7 insertions, 56 deletions
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index 67f06b8485..c66451a164 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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 QFONTDATABASE_H #define QFONTDATABASE_H @@ -51,8 +15,6 @@ QT_BEGIN_NAMESPACE struct QFontDef; class QFontEngine; -class QFontDatabasePrivate; - class Q_GUI_EXPORT QFontDatabase { Q_GADGET @@ -111,7 +73,11 @@ public: static QList<int> standardSizes(); - QFontDatabase(); +#if QT_DEPRECATED_SINCE(6, 0) && !defined(QT_BUILD_GUI_LIB) + QT_DEPRECATED_VERSION_X_6_0("Call the static functions instead") explicit QFontDatabase() = default; +#else + QFontDatabase() = delete; +#endif static QList<WritingSystem> writingSystems(); static QList<WritingSystem> writingSystems(const QString &family); @@ -147,21 +113,6 @@ public: static bool removeAllApplicationFonts(); static QFont systemFont(SystemFont type); - -private: - static void createDatabase(); - static void parseFontName(const QString &name, QString &foundry, QString &family); - static QString resolveFontFamilyAlias(const QString &family); - static QFontEngine *findFont(const QFontDef &request, int script /* QChar::Script */); - static void load(const QFontPrivate *d, int script /* QChar::Script */); - static QFontDatabasePrivate *ensureFontDatabase(); - - friend struct QFontDef; - friend class QFontPrivate; - friend class QFontDialog; - friend class QFontDialogPrivate; - friend class QFontEngineMulti; - friend class QRawFont; }; QT_END_NAMESPACE |