Handle QFontDatabase related deprecation warnings

QFontDatabase is 'all static' nowadays.

Change-Id: I1e20a7b8452961b8051d0299b89d161ded95d8fa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

src/libs/utils/stylehelper.cpp

@@ -716,12 +716,7 @@ Qt::HighDpiScaleFactorRoundingPolicy StyleHelper::defaultHighDpiScaleFactorRound
 
 QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<IconFontHelper> &parameters)
 {
-    QFontDatabase a;
+    QTC_ASSERT(QFontDatabase::hasFamily(fontName), {});
-
-    QTC_ASSERT(a.hasFamily(fontName), {});
-
-    if (!a.hasFamily(fontName))
-        return {};
 
     QIcon icon;
 
@@ -751,11 +746,7 @@ QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<Icon
 
 QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize, QColor color)
 {
-    QFontDatabase a;
+    QTC_ASSERT(QFontDatabase::hasFamily(fontName), {});
-
-    QTC_ASSERT(a.hasFamily(fontName), {});
-
-    if (a.hasFamily(fontName)) {
 
     QIcon icon;
     QSize size(iconSize, iconSize);
@@ -782,9 +773,6 @@ QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &i
     return icon;
 }
 
-    return {};
-}
-
 QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize)
 {
     QColor penColor = QApplication::palette("QWidget").color(QPalette::Normal, QPalette::ButtonText);
@@ -794,15 +782,11 @@ QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &i
 QIcon StyleHelper::getCursorFromIconFont(const QString &fontName, const QString &cursorFill, const QString &cursorOutline,
                                          int fontSize, int iconSize)
 {
-    QFontDatabase a;
+    QTC_ASSERT(QFontDatabase::hasFamily(fontName), {});
-
-    QTC_ASSERT(a.hasFamily(fontName), {});
 
     const QColor outlineColor = Qt::black;
     const QColor fillColor = Qt::white;
 
-    if (a.hasFamily(fontName)) {
-
     QIcon icon;
     QSize size(iconSize, iconSize);
 
@@ -839,10 +823,6 @@ QIcon StyleHelper::getCursorFromIconFont(const QString &fontName, const QString
     return icon;
 }
 
-    return {};
-}
-
-
 QString StyleHelper::dpiSpecificImageFile(const QString &fileName)
 {
     // See QIcon::addFile()

src/plugins/help/generalsettingspage.cpp

@@ -63,7 +63,6 @@ private:
 
     QFont m_font;
     int m_fontZoom = 100;
-    QFontDatabase m_fontDatabase;
 
     QString m_homePage;
     int m_contextOption;
@@ -400,9 +399,9 @@ void GeneralSettingsPageWidget::exportBookmarks()
 void GeneralSettingsPageWidget::updateFontSizeSelector()
 {
     const QString &family = m_font.family();
-    const QString &fontStyle = m_fontDatabase.styleString(m_font);
+    const QString &fontStyle = QFontDatabase::styleString(m_font);
 
-    QList<int> pointSizes = m_fontDatabase.pointSizes(family, fontStyle);
+    QList<int> pointSizes = QFontDatabase::pointSizes(family, fontStyle);
     if (pointSizes.empty())
         pointSizes = QFontDatabase::standardSizes();
 
@@ -424,8 +423,8 @@ void GeneralSettingsPageWidget::updateFontSizeSelector()
 
 void GeneralSettingsPageWidget::updateFontStyleSelector()
 {
-    const QString &fontStyle = m_fontDatabase.styleString(m_font);
+    const QString &fontStyle = QFontDatabase::styleString(m_font);
-    const QStringList &styles = m_fontDatabase.styles(m_font.family());
+    const QStringList &styles = QFontDatabase::styles(m_font.family());
 
     QSignalBlocker blocker(styleComboBox);
     styleComboBox->clear();

src/plugins/help/localhelpmanager.cpp

@@ -88,7 +88,7 @@ static QString defaultFallbackFontFamily()
 
 static QString defaultFallbackFontStyleName(const QString &fontFamily)
 {
-    const QStringList styles = QFontDatabase().styles(fontFamily);
+    const QStringList styles = QFontDatabase::styles(fontFamily);
     QTC_ASSERT(!styles.isEmpty(), return QString("Regular"));
     return styles.first();
 }

src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp

@@ -48,13 +48,10 @@ void drawIcon(QPainter *painter,
               int iconSize,
               const QColor &penColor)
 {
-    static QFontDatabase a;
-
     const QString fontName = "qtds_propertyIconFont.ttf";
 
-    Q_ASSERT(a.hasFamily(fontName));
+    QTC_ASSERT(QFontDatabase::hasFamily(fontName), return);
 
-    if (a.hasFamily(fontName)) {
     QFont font(fontName);
     font.setPixelSize(fontSize);
 
@@ -65,7 +62,6 @@ void drawIcon(QPainter *painter,
 
     painter->restore();
 }
-}
 
 FormEditorScene *FormEditorItem::scene() const {
     return qobject_cast<FormEditorScene*>(QGraphicsItem::scene());

src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp

@@ -586,8 +586,7 @@ int PropertyEditorContextObject::devicePixelRatio()
 
 QStringList PropertyEditorContextObject::styleNamesForFamily(const QString &family)
 {
-    const QFontDatabase dataBase;
+    return QFontDatabase::styles(family);
-    return dataBase.styles(family);
 }
 
 QStringList PropertyEditorContextObject::allStatesForId(const QString &id)

src/plugins/texteditor/fontsettings.cpp

@@ -491,8 +491,7 @@ static QString defaultFontFamily()
         return QLatin1String("Menlo");
 
     const QString sourceCodePro(g_sourceCodePro);
-    const QFontDatabase dataBase;
+    if (QFontDatabase::hasFamily(sourceCodePro))
-    if (dataBase.hasFamily(sourceCodePro))
         return sourceCodePro;
 
     if (Utils::HostOsInfo::isAnyUnixHost())

src/plugins/texteditor/fontsettingspage.cpp

@@ -458,15 +458,14 @@ void FontSettingsPageWidget::updateFontZoom(const FontSettings &fontSettings)
 
 QList<int> FontSettingsPageWidget::pointSizesForSelectedFont() const
 {
-    QFontDatabase db;
     const QString familyName = m_fontComboBox->currentFont().family();
-    QList<int> sizeLst = db.pointSizes(familyName);
+    QList<int> sizeLst = QFontDatabase::pointSizes(familyName);
     if (!sizeLst.isEmpty())
         return sizeLst;
 
-    QStringList styles = db.styles(familyName);
+    QStringList styles = QFontDatabase::styles(familyName);
     if (!styles.isEmpty())
-        sizeLst = db.pointSizes(familyName, styles.first());
+        sizeLst = QFontDatabase::pointSizes(familyName, styles.first());
     if (sizeLst.isEmpty())
         sizeLst = QFontDatabase::standardSizes();