Get rid of all instance usage of QFontDatabase

All QFontDatabase APIs are static, use them accordingly.

Task-number: QTBUG-88114
Change-Id: Ia31862d18aae1e4f2ad23a10af94fc47d6ec4c82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

3 files changed, 9 insertions, 12 deletions

diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp
index d3c22762a..7bd51aa54 100644
--- a/src/shared/fontpanel/fontpanel.cpp
+++ b/src/shared/fontpanel/fontpanel.cpp
@@ -64,7 +64,7 @@ FontPanel::FontPanel(QWidget *parentWidget) :
     // writing systems
     m_writingSystemComboBox->setEditable(false);
 
-    auto writingSystems = m_fontDatabase.writingSystems();
+    auto writingSystems = QFontDatabase::writingSystems();
     writingSystems.push_front(QFontDatabase::Any);
     for (QFontDatabase::WritingSystem ws : qAsConst(writingSystems))
         m_writingSystemComboBox->addItem(QFontDatabase::writingSystemName(ws), QVariant(ws));
@@ -104,8 +104,8 @@ QFont FontPanel::selectedFont() const
         rc.setStyle(QFont::StyleOblique);
     else
         rc.setStyle(QFont::StyleNormal);
-    rc.setBold(m_fontDatabase.bold(family, styleDescription));
-    rc.setWeight(QFont::Weight(m_fontDatabase.weight(family, styleDescription)));
+    rc.setBold(QFontDatabase::bold(family, styleDescription));
+    rc.setWeight(QFont::Weight(QFontDatabase::weight(family, styleDescription)));
     return rc;
 }
 
@@ -114,7 +114,7 @@ void FontPanel::setSelectedFont(const QFont &f)
     m_familyComboBox->setCurrentFont(f);
     if (m_familyComboBox->currentIndex() < 0) {
         // family not in writing system - find the corresponding one?
-        QList<QFontDatabase::WritingSystem> familyWritingSystems = m_fontDatabase.writingSystems(f.family());
+        QList<QFontDatabase::WritingSystem> familyWritingSystems = QFontDatabase::writingSystems(f.family());
         if (familyWritingSystems.isEmpty())
             return;
 
@@ -127,7 +127,7 @@ void FontPanel::setSelectedFont(const QFont &f)
     const int pointSizeIndex = closestPointSizeIndex(f.pointSize());
     m_pointSizeComboBox->setCurrentIndex( pointSizeIndex);
 
-    const QString styleString = m_fontDatabase.styleString(f);
+    const QString styleString = QFontDatabase::styleString(f);
     const int styleIndex = m_styleComboBox->findText(styleString);
     m_styleComboBox->setCurrentIndex(styleIndex);
     slotUpdatePreviewFont();
@@ -208,7 +208,7 @@ void FontPanel::updateFamily(const QString &family)
     // Try to maintain selection or select normal
     const QString &oldStyleString = styleString();
 
-    const QStringList &styles = m_fontDatabase.styles(family);
+    const QStringList &styles = QFontDatabase::styles(family);
     const bool hasStyles = !styles.isEmpty();
 
     m_styleComboBox->setCurrentIndex(-1);
@@ -265,7 +265,7 @@ void FontPanel::updatePointSizes(const QString &family, const QString &styleStri
 {
     const int oldPointSize = pointSize();
 
-    auto pointSizes =  m_fontDatabase.pointSizes(family, styleString);
+    auto pointSizes =  QFontDatabase::pointSizes(family, styleString);
     if (pointSizes.isEmpty())
         pointSizes = QFontDatabase::standardSizes();
 
diff --git a/src/shared/fontpanel/fontpanel.h b/src/shared/fontpanel/fontpanel.h
index 4b1160300..701baa7d2 100644
--- a/src/shared/fontpanel/fontpanel.h
+++ b/src/shared/fontpanel/fontpanel.h
@@ -92,7 +92,6 @@ private:
     void updatePointSizes(const QString &family, const QString &style);
     void delayedPreviewFontUpdate();
 
-    QFontDatabase m_fontDatabase;
     QLineEdit *m_previewLineEdit;
     QComboBox *m_writingSystemComboBox;
     QFontComboBox* m_familyComboBox;
diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp
index 4ff304257..728b0b1e0 100644
--- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp
+++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp
@@ -5512,8 +5512,6 @@ void QtSizePolicyPropertyManager::uninitializeProperty(QtProperty *property)
 // enumeration manager to re-set its strings and index values
 // for each property.
 
-Q_GLOBAL_STATIC(QFontDatabase, fontDatabase)
-
 class QtFontPropertyManagerPrivate
 {
     QtFontPropertyManager *q_ptr;
@@ -5656,7 +5654,7 @@ void QtFontPropertyManagerPrivate::slotFontDatabaseDelayedChange()
     typedef QMap<const QtProperty *, QtProperty *> PropertyPropertyMap;
     // rescan available font names
     const QStringList oldFamilies = m_familyNames;
-    m_familyNames = fontDatabase()->families();
+    m_familyNames = QFontDatabase::families();
 
     // Adapt all existing properties
     if (!m_propertyToFamily.isEmpty()) {
@@ -5875,7 +5873,7 @@ void QtFontPropertyManager::initializeProperty(QtProperty *property)
     QtProperty *familyProp = d_ptr->m_enumPropertyManager->addProperty();
     familyProp->setPropertyName(tr("Family"));
     if (d_ptr->m_familyNames.isEmpty())
-        d_ptr->m_familyNames = fontDatabase()->families();
+        d_ptr->m_familyNames = QFontDatabase::families();
     d_ptr->m_enumPropertyManager->setEnumNames(familyProp, d_ptr->m_familyNames);
     int idx = d_ptr->m_familyNames.indexOf(val.family());
     if (idx == -1)