Get rid of all instance usage of QFontDatabase

All QFontDatabase APIs are static, use them accordingly.

Task-number: QTBUG-88114
Change-Id: I0e4a7508646037e6e2812611262eed8b6d7ad3de
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

3 files changed, 16 insertions, 23 deletions

diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
index 628af91674..ad6bf900fd 100644
--- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
+++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
@@ -182,7 +182,6 @@ void tst_QFontDialog::task256466_wrongStyle()
     if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
         QSKIP("Wayland: This freezes. Figure out why.");
 
-    QFontDatabase fdb;
     FriendlyFontDialog dialog;
     dialog.setOption(QFontDialog::DontUseNativeDialog);
     QListView *familyList = reinterpret_cast<QListView*>(dialog.d_func()->familyList);
@@ -193,7 +192,7 @@ void tst_QFontDialog::task256466_wrongStyle()
         familyList->setCurrentIndex(currentFamily);
         int expectedSize = sizeList->currentIndex().data().toInt();
         const QFont current = dialog.currentFont(),
-                    expected = fdb.font(currentFamily.data().toString(),
+                    expected = QFontDatabase::font(currentFamily.data().toString(),
             styleList->currentIndex().data().toString(), expectedSize);
         QCOMPARE(current.family(), expected.family());
         QCOMPARE(current.style(), expected.style());
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 7d22a84ece..6763d3b6a6 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -367,13 +367,12 @@ void tst_QApplication::setFont_data()
     int argc = 0;
     QApplication app(argc, nullptr); // Needed for QFontDatabase
 
-    QFontDatabase fdb;
-    const QStringList &families = fdb.families();
+    const QStringList &families = QFontDatabase::families();
     for (int i = 0, count = qMin(3, families.size()); i < count; ++i) {
         const auto &family = families.at(i);
-        const QStringList &styles = fdb.styles(family);
+        const QStringList &styles = QFontDatabase::styles(family);
         if (!styles.isEmpty()) {
-            QList<int> sizes = fdb.pointSizes(family, styles.constFirst());
+            QList<int> sizes = QFontDatabase::pointSizes(family, styles.constFirst());
             if (sizes.isEmpty())
                 sizes = QFontDatabase::standardSizes();
             if (!sizes.isEmpty()) {
@@ -2515,7 +2514,6 @@ Q_GLOBAL_STATIC(QWidget, tst_qapp_widget);
 Q_GLOBAL_STATIC(QPixmap, tst_qapp_pixmap);
 Q_GLOBAL_STATIC(QFont, tst_qapp_font);
 Q_GLOBAL_STATIC(QRegion, tst_qapp_region);
-Q_GLOBAL_STATIC(QFontDatabase, tst_qapp_fontDatabase);
 #ifndef QT_NO_CURSOR
 Q_GLOBAL_STATIC(QCursor, tst_qapp_cursor);
 #endif
@@ -2540,7 +2538,6 @@ void tst_QApplication::globalStaticObjectDestruction()
     QVERIFY(tst_qapp_pixmap());
     QVERIFY(tst_qapp_font());
     QVERIFY(tst_qapp_region());
-    QVERIFY(tst_qapp_fontDatabase());
 #ifndef QT_NO_CURSOR
     QVERIFY(tst_qapp_cursor());
 #endif
diff --git a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
index bd3ea5686a..1f06c537c6 100644
--- a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
+++ b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
@@ -88,20 +88,19 @@ void tst_QFontComboBox::qfontcombobox()
 void tst_QFontComboBox::currentFont_data()
 {
     QTest::addColumn<QFont>("currentFont");
-    QFontDatabase db;
     // Normalize the names
     QFont defaultFont;
     QFontInfo fi(defaultFont);
     defaultFont = QFont(fi.family()); // make sure we have a real font name and not something like 'Sans Serif'.
-    if (!db.isPrivateFamily(defaultFont.family()))
+    if (!QFontDatabase::isPrivateFamily(defaultFont.family()))
         QTest::newRow("default") << defaultFont;
     defaultFont.setPointSize(defaultFont.pointSize() + 10);
-    if (!db.isPrivateFamily(defaultFont.family()))
+    if (!QFontDatabase::isPrivateFamily(defaultFont.family()))
         QTest::newRow("default2") << defaultFont;
-    QStringList list = db.families();
+    QStringList list = QFontDatabase::families();
     for (int i = 0; i < list.count(); ++i) {
         QFont f = QFont(QFontInfo(QFont(list.at(i))).family());
-        if (!db.isPrivateFamily(f.family()))
+        if (!QFontDatabase::isPrivateFamily(f.family()))
             QTest::newRow(qPrintable(list.at(i))) << f;
     }
 }
@@ -168,8 +167,7 @@ void tst_QFontComboBox::fontFilters()
     box.setFontFilters(fontFilters);
     QCOMPARE(box.fontFilters(), fontFilters);
 
-    QFontDatabase db;
-    QStringList list = db.families();
+    QStringList list = QFontDatabase::families();
     int c = 0;
     const int scalableMask = (QFontComboBox::ScalableFonts | QFontComboBox::NonScalableFonts);
     const int spacingMask = (QFontComboBox::ProportionalFonts | QFontComboBox::MonospacedFonts);
@@ -179,20 +177,20 @@ void tst_QFontComboBox::fontFilters()
         fontFilters &= ~spacingMask;
 
     for (int i = 0; i < list.count(); ++i) {
-        if (db.isPrivateFamily(list[i]))
+        if (QFontDatabase::isPrivateFamily(list[i]))
             continue;
         if (fontFilters & QFontComboBox::ScalableFonts) {
-            if (!db.isSmoothlyScalable(list[i]))
+            if (!QFontDatabase::isSmoothlyScalable(list[i]))
                 continue;
         } else if (fontFilters & QFontComboBox::NonScalableFonts) {
-            if (db.isSmoothlyScalable(list[i]))
+            if (QFontDatabase::isSmoothlyScalable(list[i]))
                 continue;
         }
         if (fontFilters & QFontComboBox::MonospacedFonts) {
-            if (!db.isFixedPitch(list[i]))
+            if (!QFontDatabase::isFixedPitch(list[i]))
                 continue;
         } else if (fontFilters & QFontComboBox::ProportionalFonts) {
-            if (db.isFixedPitch(list[i]))
+            if (QFontDatabase::isFixedPitch(list[i]))
                 continue;
         }
         c++;
@@ -243,11 +241,10 @@ void tst_QFontComboBox::writingSystem()
     box.setWritingSystem(writingSystem);
     QCOMPARE(box.writingSystem(), writingSystem);
 
-    QFontDatabase db;
-    QStringList list = db.families(writingSystem);
+    QStringList list = QFontDatabase::families(writingSystem);
     int c = list.count();
     for (int i = 0; i < list.count(); ++i) {
-        if (db.isPrivateFamily(list[i]))
+        if (QFontDatabase::isPrivateFamily(list[i]))
             c--;
     }
     QCOMPARE(box.model()->rowCount(), c);