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/qfontmetrics/tst_qfontmetrics.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp') 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(), -- cgit v1.2.3