From a50f0f045d3f749a4638bd4b46078bb86b329ad8 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
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 <eskil.abrahamsen-blomfeldt@qt.io>
---
 examples/widgets/painting/fontsampler/mainwindow.cpp      | 9 ++++-----
 examples/widgets/widgets/charactermap/characterwidget.cpp | 3 +--
 examples/widgets/widgets/charactermap/mainwindow.cpp      | 8 +++-----
 3 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'examples/widgets')

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)));
         }
     }
 }
diff --git a/examples/widgets/widgets/charactermap/characterwidget.cpp b/examples/widgets/widgets/charactermap/characterwidget.cpp
index 422177ffa8..a9d5a06164 100644
--- a/examples/widgets/widgets/charactermap/characterwidget.cpp
+++ b/examples/widgets/widgets/charactermap/characterwidget.cpp
@@ -86,9 +86,8 @@ void CharacterWidget::updateSize(const QString &fontSize)
 
 void CharacterWidget::updateStyle(const QString &fontStyle)
 {
-    QFontDatabase fontDatabase;
     const QFont::StyleStrategy oldStrategy = displayFont.styleStrategy();
-    displayFont = fontDatabase.font(displayFont.family(), fontStyle, displayFont.pointSize());
+    displayFont = QFontDatabase::font(displayFont.family(), fontStyle, displayFont.pointSize());
     displayFont.setStyleStrategy(oldStrategy);
     calculateSquareSize();
     adjustSize();
diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp
index 18dc672c37..cfe0be96ca 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/widgets/charactermap/mainwindow.cpp
@@ -178,13 +178,12 @@ MainWindow::MainWindow(QWidget *parent)
 //! [7]
 void MainWindow::findStyles(const QFont &font)
 {
-    QFontDatabase fontDatabase;
     QString currentItem = styleCombo->currentText();
     styleCombo->clear();
 //! [7]
 
 //! [8]
-    const QStringList styles = fontDatabase.styles(font.family());
+    const QStringList styles = QFontDatabase::styles(font.family());
     for (const QString &style : styles)
         styleCombo->addItem(style);
 
@@ -207,7 +206,6 @@ void MainWindow::filterChanged(int f)
 
 void MainWindow::findSizes(const QFont &font)
 {
-    QFontDatabase fontDatabase;
     QString currentSize = sizeCombo->currentText();
 
     {
@@ -215,7 +213,7 @@ void MainWindow::findSizes(const QFont &font)
         // sizeCombo signals are now blocked until end of scope
         sizeCombo->clear();
 
-        if (fontDatabase.isSmoothlyScalable(font.family(), fontDatabase.styleString(font))) {
+        if (QFontDatabase::isSmoothlyScalable(font.family(), QFontDatabase::styleString(font))) {
             const QList<int> sizes = QFontDatabase::standardSizes();
             for (const int size : sizes) {
                 sizeCombo->addItem(QVariant(size).toString());
@@ -223,7 +221,7 @@ void MainWindow::findSizes(const QFont &font)
             }
 
         } else {
-            const QList<int> sizes = fontDatabase.smoothSizes(font.family(), fontDatabase.styleString(font));
+            const QList<int> sizes = QFontDatabase::smoothSizes(font.family(), QFontDatabase::styleString(font));
             for (const int size : sizes ) {
                 sizeCombo->addItem(QVariant(size).toString());
                 sizeCombo->setEditable(false);
-- 
cgit v1.2.3