1 files changed, 29 insertions, 81 deletions
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 63e6b48e4f..91a534265e 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
@@ -48,18 +12,13 @@
 QT_BEGIN_NAMESPACE
 
 
-class QStringList;
 struct QFontDef;
 class QFontEngine;
 
-class QFontDatabasePrivate;
-
 class Q_GUI_EXPORT QFontDatabase
 {
     Q_GADGET
 public:
-    // do not re-order or delete entries from this enum without updating the
-    // QPF2 format and makeqpf!!
     enum WritingSystem {
         Any,
 
@@ -114,31 +73,35 @@ 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
 
-    QList<WritingSystem> writingSystems() const;
-    QList<WritingSystem> writingSystems(const QString &family) const;
+    static QList<WritingSystem> writingSystems();
+    static QList<WritingSystem> writingSystems(const QString &family);
 
-    QStringList families(WritingSystem writingSystem = Any) const;
-    QStringList styles(const QString &family) const;
-    QList<int> pointSizes(const QString &family, const QString &style = QString());
-    QList<int> smoothSizes(const QString &family, const QString &style);
-    QString styleString(const QFont &font);
-    QString styleString(const QFontInfo &fontInfo);
+    static QStringList families(WritingSystem writingSystem = Any);
+    static QStringList styles(const QString &family);
+    static QList<int> pointSizes(const QString &family, const QString &style = QString());
+    static QList<int> smoothSizes(const QString &family, const QString &style);
+    static QString styleString(const QFont &font);
+    static QString styleString(const QFontInfo &fontInfo);
 
-    QFont font(const QString &family, const QString &style, int pointSize) const;
+    static QFont font(const QString &family, const QString &style, int pointSize);
 
-    bool isBitmapScalable(const QString &family, const QString &style = QString()) const;
-    bool isSmoothlyScalable(const QString &family, const QString &style = QString()) const;
-    bool isScalable(const QString &family, const QString &style = QString()) const;
-    bool isFixedPitch(const QString &family, const QString &style = QString()) const;
+    static bool isBitmapScalable(const QString &family, const QString &style = QString());
+    static bool isSmoothlyScalable(const QString &family, const QString &style = QString());
+    static bool isScalable(const QString &family, const QString &style = QString());
+    static bool isFixedPitch(const QString &family, const QString &style = QString());
 
-    bool italic(const QString &family, const QString &style) const;
-    bool bold(const QString &family, const QString &style) const;
-    int weight(const QString &family, const QString &style) const;
+    static bool italic(const QString &family, const QString &style);
+    static bool bold(const QString &family, const QString &style);
+    static int weight(const QString &family, const QString &style);
 
-    bool hasFamily(const QString &family) const;
-    bool isPrivateFamily(const QString &family) const;
+    static bool hasFamily(const QString &family);
+    static bool isPrivateFamily(const QString &family);
 
     static QString writingSystemName(WritingSystem writingSystem);
     static QString writingSystemSample(WritingSystem writingSystem);
@@ -149,27 +112,12 @@ public:
     static bool removeApplicationFont(int id);
     static bool removeAllApplicationFonts();
 
-#if QT_DEPRECATED_SINCE(5, 2)
-    QT_DEPRECATED static bool supportsThreadedFontRendering();
-#endif
+    static void addApplicationFallbackFontFamily(QChar::Script script, const QString &familyName);
+    static bool removeApplicationFallbackFontFamily(QChar::Script script, const QString &familyName);
+    static void setApplicationFallbackFontFamilies(QChar::Script, const QStringList &familyNames);
+    static QStringList applicationFallbackFontFamilies(QChar::Script script);
 
     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 */);
-
-    friend struct QFontDef;
-    friend class QFontPrivate;
-    friend class QFontDialog;
-    friend class QFontDialogPrivate;
-    friend class QFontEngineMulti;
-    friend class QRawFont;
-
-    QFontDatabasePrivate *d;
 };
 
 QT_END_NAMESPACE