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 --- examples/widgets/painting/fontsampler/mainwindow.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'examples/widgets/painting/fontsampler/mainwindow.cpp') diff --git a/examples/widgets/painting/fontsampler/mainwindow.cpp b/examples/widgets/painting/fontsampler/mainwindow.cpp index 65a186099d..33f6f9a927 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.cpp +++ b/examples/widgets/painting/fontsampler/mainwindow.cpp @@ -84,13 +84,12 @@ MainWindow::MainWindow(QWidget *parent) void MainWindow::setupFontTree() { - QFontDatabase database; fontTree->setColumnCount(1); fontTree->setHeaderLabels({ tr("Font") }); - const QStringList fontFamilies = database.families(); + const QStringList fontFamilies = QFontDatabase::families(); for (const QString &family : fontFamilies) { - const QStringList styles = database.styles(family); + const QStringList styles = QFontDatabase::styles(family); if (styles.isEmpty()) continue; @@ -103,8 +102,8 @@ void MainWindow::setupFontTree() QTreeWidgetItem *styleItem = new QTreeWidgetItem(familyItem); styleItem->setText(0, style); styleItem->setCheckState(0, Qt::Unchecked); - styleItem->setData(0, Qt::UserRole, QVariant(database.weight(family, style))); - styleItem->setData(0, Qt::UserRole + 1, QVariant(database.italic(family, style))); + styleItem->setData(0, Qt::UserRole, QVariant(QFontDatabase::weight(family, style))); + styleItem->setData(0, Qt::UserRole + 1, QVariant(QFontDatabase::italic(family, style))); } } } -- cgit v1.2.3