From a50f0f045d3f749a4638bd4b46078bb86b329ad8 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 2 Nov 2020 19:48:25 +0100 Subject: 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 --- tests/auto/gui/text/qfont/tst_qfont.cpp | 29 ++++++------- tests/auto/gui/text/qfontcache/tst_qfontcache.cpp | 4 +- .../gui/text/qfontdatabase/tst_qfontdatabase.cpp | 47 +++++++++------------- .../gui/text/qfontmetrics/tst_qfontmetrics.cpp | 13 +++--- tests/auto/gui/text/qrawfont/tst_qrawfont.cpp | 23 +++++------ .../qtextscriptengine/tst_qtextscriptengine.cpp | 9 ++--- 6 files changed, 49 insertions(+), 76 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index d651ffe7c7..4cc5a81329 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -131,14 +131,13 @@ void tst_QFont::exactMatch() QVERIFY(!QFont("monospace").exactMatch()); // Confirm that exactMatch is true for a valid font - QFontDatabase db; - const QString family = db.families().first(); - const QString style = db.styles(family).first(); - const int pointSize = db.pointSizes(family, style).first(); - font = db.font(family, style, pointSize); + const QString family = QFontDatabase::families().first(); + const QString style = QFontDatabase::styles(family).first(); + const int pointSize = QFontDatabase::pointSizes(family, style).first(); + font = QFontDatabase::font(family, style, pointSize); QVERIFY(font.exactMatch()); - if (db.families().contains("Arial")) { + if (QFontDatabase::families().contains("Arial")) { font = QFont("Arial"); QVERIFY(font.exactMatch()); font = QFont(QString()); @@ -149,9 +148,7 @@ void tst_QFont::exactMatch() void tst_QFont::italicOblique() { - QFontDatabase fdb; - - QStringList families = fdb.families(); + QStringList families = QFontDatabase::families(); if (families.isEmpty()) return; @@ -159,12 +156,12 @@ void tst_QFont::italicOblique() for (f_it = families.begin(); f_it != f_end; ++f_it) { QString family = *f_it; - QStringList styles = fdb.styles(family); + QStringList styles = QFontDatabase::styles(family); QStringList::ConstIterator s_it, s_end = styles.end(); for (s_it = styles.begin(); s_it != s_end; ++s_it) { QString style = *s_it; - if (fdb.isSmoothlyScalable(family, style)) { + if (QFontDatabase::isSmoothlyScalable(family, style)) { if (style.contains("Oblique")) { style.replace("Oblique", "Italic"); } else if (style.contains("Italic")) { @@ -172,7 +169,7 @@ void tst_QFont::italicOblique() } else { continue; } - QFont f = fdb.font(family, style, 12); + QFont f = QFontDatabase::font(family, style, 12); QVERIFY(f.italic()); } } @@ -564,12 +561,11 @@ void tst_QFont::defaultFamily() QFETCH(QStringList, acceptableFamilies); QFont f; - QFontDatabase db; f.setStyleHint(styleHint); const QString familyForHint(f.defaultFamily()); // it should at least return a family that is available. - QVERIFY(db.hasFamily(familyForHint)); + QVERIFY(QFontDatabase::hasFamily(familyForHint)); bool isAcceptable = false; Q_FOREACH (const QString& family, acceptableFamilies) { @@ -590,14 +586,13 @@ void tst_QFont::toAndFromString() QFont defaultFont = QGuiApplication::font(); QString family = defaultFont.family(); - QFontDatabase fdb; - const QStringList stylesList = fdb.styles(family); + const QStringList stylesList = QFontDatabase::styles(family); if (stylesList.size() == 0) QSKIP("Default font doesn't have any styles"); for (const QString &style : stylesList) { QFont result; - QFont initial = fdb.font(family, style, defaultFont.pointSize()); + QFont initial = QFontDatabase::font(family, style, defaultFont.pointSize()); result.fromString(initial.toString()); diff --git a/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp index 3d3211c7a2..5c5bdf06ea 100644 --- a/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp +++ b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp @@ -176,14 +176,12 @@ void tst_QFontCache::clear() } #endif { - QFontDatabase db; - QFont f; f.setStyleHint(QFont::Serif); const QString familyForHint(f.defaultFamily()); // it should at least return a family that is available - QVERIFY(db.hasFamily(familyForHint)); + QVERIFY(QFontDatabase::hasFamily(familyForHint)); f.exactMatch(); // loads engine fontEngine = QFontPrivate::get(f)->engineForScript(QChar::Script_Common); 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); diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp index e1db231a20..93d9950492 100644 --- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp @@ -91,11 +91,10 @@ void tst_QFontMetrics::same() void tst_QFontMetrics::metrics() { QFont font; - QFontDatabase fdb; // Query the QFontDatabase for a specific font, store the // result in family, style and size. - QStringList families = fdb.families(); + QStringList families = QFontDatabase::families(); if (families.isEmpty()) return; @@ -103,14 +102,14 @@ void tst_QFontMetrics::metrics() for (f_it = families.begin(); f_it != f_end; ++f_it) { const QString &family = *f_it; - QStringList styles = fdb.styles(family); + QStringList styles = QFontDatabase::styles(family); QStringList::ConstIterator s_it, s_end = styles.end(); for (s_it = styles.begin(); s_it != s_end; ++s_it) { const QString &style = *s_it; - if (fdb.isSmoothlyScalable(family, style)) { + if (QFontDatabase::isSmoothlyScalable(family, style)) { // smoothly scalable font... don't need to load every pointsize - font = fdb.font(family, style, 12); + font = QFontDatabase::font(family, style, 12); QFontMetrics fontmetrics(font); QCOMPARE(fontmetrics.ascent() + fontmetrics.descent(), @@ -119,14 +118,14 @@ void tst_QFontMetrics::metrics() QCOMPARE(fontmetrics.height() + fontmetrics.leading(), fontmetrics.lineSpacing()); } else { - QList sizes = fdb.pointSizes(family, style); + QList sizes = QFontDatabase::pointSizes(family, style); QVERIFY(!sizes.isEmpty()); QList::ConstIterator z_it, z_end = sizes.end(); for (z_it = sizes.begin(); z_it != z_end; ++z_it) { const int size = *z_it; // Initialize the font, and check if it is an exact match - font = fdb.font(family, style, size); + font = QFontDatabase::font(family, style, size); QFontMetrics fontmetrics(font); QCOMPARE(fontmetrics.ascent() + fontmetrics.descent(), diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp index 8ed9ad6a9a..9eb6eff1b3 100644 --- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp +++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp @@ -121,8 +121,7 @@ void tst_QRawFont::initTestCase() if (testFont.isEmpty() || testFontBoldItalic.isEmpty()) QFAIL("qrawfont unittest font files not found!"); - QFontDatabase database; - if (database.families().count() == 0) + if (QFontDatabase::families().count() == 0) QSKIP("No fonts available!!!"); } @@ -389,8 +388,7 @@ void tst_QRawFont::advances() void tst_QRawFont::textLayout() { - QFontDatabase fontDatabase; - int id = fontDatabase.addApplicationFont(testFont); + int id = QFontDatabase::addApplicationFont(testFont); QVERIFY(id >= 0); QString familyName = QString::fromLatin1("QtBidiTestFont"); @@ -420,7 +418,7 @@ void tst_QRawFont::textLayout() QCOMPARE(glyphs.glyphIndexes(), expectedGlyphIndices); - QVERIFY(fontDatabase.removeApplicationFont(id)); + QVERIFY(QFontDatabase::removeApplicationFont(id)); } void tst_QRawFont::fontTable_data() @@ -703,8 +701,7 @@ void tst_QRawFont::fromFont() QFETCH(QString, familyName); QFETCH(QFontDatabase::WritingSystem, writingSystem); - QFontDatabase fontDatabase; - int id = fontDatabase.addApplicationFont(fileName); + int id = QFontDatabase::addApplicationFont(fileName); QVERIFY(id >= 0); QFont font(familyName); @@ -717,7 +714,7 @@ void tst_QRawFont::fromFont() QCOMPARE(rawFont.familyName(), familyName); QCOMPARE(rawFont.pixelSize(), 26.0); - QVERIFY(fontDatabase.removeApplicationFont(id)); + QVERIFY(QFontDatabase::removeApplicationFont(id)); } void tst_QRawFont::copyConstructor_data() @@ -878,8 +875,7 @@ void tst_QRawFont::unsupportedWritingSystem() { QFETCH(QFont::HintingPreference, hintingPreference); - QFontDatabase fontDatabase; - int id = fontDatabase.addApplicationFont(testFont); + int id = QFontDatabase::addApplicationFont(testFont); QFont font("QtBidiTestFont"); font.setHintingPreference(hintingPreference); @@ -915,7 +911,7 @@ void tst_QRawFont::unsupportedWritingSystem() QCOMPARE(rawFont.familyName(), layoutFont.familyName()); QCOMPARE(rawFont.pixelSize(), 12.0); - fontDatabase.removeApplicationFont(id); + QFontDatabase::removeApplicationFont(id); } void tst_QRawFont::rawFontSetPixelSize_data() @@ -1017,8 +1013,7 @@ void tst_QRawFont::kernedAdvances() void tst_QRawFont::fallbackFontsOrder() { - QFontDatabase fontDatabase; - int id = fontDatabase.addApplicationFont(testFont); + int id = QFontDatabase::addApplicationFont(testFont); QFont font("QtBidiTestFont"); font.setPixelSize(12.0); @@ -1047,7 +1042,7 @@ void tst_QRawFont::fallbackFontsOrder() // is not sorted by writing system support. QCOMPARE(glyphRuns.size(), 1); - fontDatabase.removeApplicationFont(id); + QFontDatabase::removeApplicationFont(id); } void tst_QRawFont::qtbug65923_partal_clone_data() diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp index 04e6282ca9..c85bb737bf 100644 --- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp @@ -1078,8 +1078,7 @@ void tst_QTextScriptEngine::mirroredChars() void tst_QTextScriptEngine::controlInSyllable_qtbug14204() { - QFontDatabase db; - if (!db.families().contains(QStringLiteral("Aparajita"))) + if (!QFontDatabase::families().contains(QStringLiteral("Aparajita"))) QSKIP("couldn't find 'Aparajita' font"); QFont font(QStringLiteral("Aparajita")); @@ -1181,8 +1180,7 @@ void tst_QTextScriptEngine::combiningMarks_qtbug15675() void tst_QTextScriptEngine::thaiIsolatedSaraAm() { - QFontDatabase db; - if (!db.families().contains("Waree")) + if (!QFontDatabase::families().contains("Waree")) QSKIP("couldn't find 'Waree' font"); QFont font(QStringLiteral("Waree")); @@ -1214,8 +1212,7 @@ void tst_QTextScriptEngine::thaiWithZWJ() QSKIP("Requires up-to-date Harfbuzz"); #endif - QFontDatabase db; - if (!db.families().contains("Waree")) + if (!QFontDatabase::families().contains("Waree")) QSKIP("couldn't find 'Waree' font"); QFont font(QStringLiteral("Waree")); -- cgit v1.2.3