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>

1 files changed, 18 insertions, 29 deletions

diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index c2b82059ec..38c423c4d6 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -113,8 +113,7 @@ void tst_QFontDatabase::styles()
 {
     QFETCH( QString, font );
 
-    QFontDatabase fdb;
-    QStringList styles = fdb.styles( font );
+    QStringList styles = QFontDatabase::styles( font );
     QStringList::Iterator it = styles.begin();
     while ( it != styles.end() ) {
         QString style = *it;
@@ -151,11 +150,10 @@ void tst_QFontDatabase::fixedPitch()
     QFETCH(QString, font);
     QFETCH(bool, fixedPitch);
 
-    QFontDatabase fdb;
-    if (!fdb.families().contains(font))
+    if (!QFontDatabase::families().contains(font))
         QSKIP("Font not installed");
 
-    QCOMPARE(fdb.isFixedPitch(font), fixedPitch);
+    QCOMPARE(QFontDatabase::isFixedPitch(font), fixedPitch);
 
     QFont qfont(font);
     QFontInfo fi(qfont);
@@ -184,8 +182,7 @@ void tst_QFontDatabase::trickyFonts()
 {
     QFETCH(QString, font);
 
-    QFontDatabase fdb;
-    if (!fdb.families().contains(font))
+    if (!QFontDatabase::families().contains(font))
         QSKIP( "Font not installed");
 
     QFont qfont(font);
@@ -232,9 +229,7 @@ void tst_QFontDatabase::addAppFont()
     QFETCH(bool, useMemoryFont);
     QSignalSpy fontDbChangedSpy(QGuiApplication::instance(), SIGNAL(fontDatabaseChanged()));
 
-    QFontDatabase db;
-
-    const QStringList oldFamilies = db.families();
+    const QStringList oldFamilies = QFontDatabase::families();
     QVERIFY(!oldFamilies.isEmpty());
 
     fontDbChangedSpy.clear();
@@ -262,7 +257,7 @@ void tst_QFontDatabase::addAppFont()
     const QStringList addedFamilies = QFontDatabase::applicationFontFamilies(id);
     QVERIFY(!addedFamilies.isEmpty());
 
-    const QStringList newFamilies = db.families();
+    const QStringList newFamilies = QFontDatabase::families();
     QVERIFY(!newFamilies.isEmpty());
     QVERIFY(newFamilies.count() >= oldFamilies.count());
 
@@ -277,7 +272,7 @@ void tst_QFontDatabase::addAppFont()
     QVERIFY(QFontDatabase::removeApplicationFont(id));
     QCOMPARE(fontDbChangedSpy.count(), 2);
 
-    QCOMPARE(db.families(), oldFamilies);
+    QCOMPARE(QFontDatabase::families(), oldFamilies);
 }
 
 void tst_QFontDatabase::addTwoAppFontsFromFamily()
@@ -306,15 +301,14 @@ void tst_QFontDatabase::addTwoAppFontsFromFamily()
 
 void tst_QFontDatabase::aliases()
 {
-    QFontDatabase db;
-    const QStringList families = db.families();
+    const QStringList families = QFontDatabase::families();
     QVERIFY(!families.isEmpty());
     const QString firstFont = families.front();
-    QVERIFY(db.hasFamily(firstFont));
+    QVERIFY(QFontDatabase::hasFamily(firstFont));
     const QString alias = QStringLiteral("AliasToFirstFont") + firstFont;
-    QVERIFY(!db.hasFamily(alias));
+    QVERIFY(!QFontDatabase::hasFamily(alias));
     QPlatformFontDatabase::registerAliasToFontFamily(firstFont, alias);
-    QVERIFY(db.hasFamily(alias));
+    QVERIFY(QFontDatabase::hasFamily(alias));
 }
 
 void tst_QFontDatabase::fallbackFonts()
@@ -368,12 +362,11 @@ void tst_QFontDatabase::condensedFontWidthNoFontMerging()
 
 void tst_QFontDatabase::condensedFontWidth()
 {
-    QFontDatabase db;
     QFontDatabase::addApplicationFont(m_testFont);
     QFontDatabase::addApplicationFont(m_testFontCondensed);
 
-    QVERIFY(db.hasFamily("QtBidiTestFont"));
-    if (!db.hasFamily("QtBidiTestFontCondensed"))
+    QVERIFY(QFontDatabase::hasFamily("QtBidiTestFont"));
+    if (!QFontDatabase::hasFamily("QtBidiTestFontCondensed"))
         QSKIP("This platform doesn't support font sub-family names (QTBUG-55625)");
 
     // Test we really get a condensed font, and a not renormalized one (QTBUG-48043):
@@ -387,10 +380,9 @@ void tst_QFontDatabase::condensedFontWidth()
 
 void tst_QFontDatabase::condensedFontMatching()
 {
-    QFontDatabase db;
     QFontDatabase::removeAllApplicationFonts();
     QFontDatabase::addApplicationFont(m_testFontCondensed);
-    if (!db.hasFamily("QtBidiTestFont"))
+    if (!QFontDatabase::hasFamily("QtBidiTestFont"))
         QSKIP("This platform doesn't support preferred font family names (QTBUG-53478)");
     QFontDatabase::addApplicationFont(m_testFont);
 
@@ -410,7 +402,7 @@ void tst_QFontDatabase::condensedFontMatching()
     QCOMPARE(QFontMetrics(tfcByStretch).horizontalAdvance(testString()),
              QFontMetrics(tfcByStyleName).horizontalAdvance(testString()));
 
-    if (!db.hasFamily("QtBidiTestFontCondensed"))
+    if (!QFontDatabase::hasFamily("QtBidiTestFontCondensed"))
         QSKIP("This platform doesn't support font sub-family names (QTBUG-55625)");
 
     QFont tfcBySubfamilyName("QtBidiTestFontCondensed");
@@ -445,25 +437,22 @@ void tst_QFontDatabase::smoothFonts()
 
 void tst_QFontDatabase::registerOpenTypePreferredNamesSystem()
 {
-    QFontDatabase db;
     // This font family was picked because it was the only one I had installed which showcased the
     // problem
-    if (!db.hasFamily(QString::fromLatin1("Source Code Pro ExtraLight")))
+    if (!QFontDatabase::hasFamily(QString::fromLatin1("Source Code Pro ExtraLight")))
         QSKIP("Source Code Pro ExtraLight is not installed");
 
-    QStringList styles = db.styles(QString::fromLatin1("Source Code Pro"));
+    QStringList styles = QFontDatabase::styles(QString::fromLatin1("Source Code Pro"));
     QVERIFY(styles.contains(QLatin1String("ExtraLight")));
 }
 
 void tst_QFontDatabase::registerOpenTypePreferredNamesApplication()
 {
-    QFontDatabase db;
-
     int id = QFontDatabase::addApplicationFont(QString::fromLatin1(":/testfont_open.otf"));
     if (id == -1)
         QSKIP("Skip the test since app fonts are not supported on this system");
 
-    QStringList styles = db.styles(QString::fromLatin1("QtBidiTestFont"));
+    QStringList styles = QFontDatabase::styles(QString::fromLatin1("QtBidiTestFont"));
     QVERIFY(styles.contains(QLatin1String("Open")));
 
     QFontDatabase::removeApplicationFont(id);