diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index 07f526a4af0..78e4d57436d 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -716,12 +716,7 @@ Qt::HighDpiScaleFactorRoundingPolicy StyleHelper::defaultHighDpiScaleFactorRound QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList ¶meters) { - QFontDatabase a; - - QTC_ASSERT(a.hasFamily(fontName), {}); - - if (!a.hasFamily(fontName)) - return {}; + QTC_ASSERT(QFontDatabase::hasFamily(fontName), {}); QIcon icon; @@ -751,38 +746,31 @@ QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QListdevicePixelRatio()); + for (int dpr = 1; dpr <= maxDpr; dpr++) { + QPixmap pixmap(size * dpr); + pixmap.setDevicePixelRatio(dpr); + pixmap.fill(Qt::transparent); - QIcon icon; - QSize size(iconSize, iconSize); + QFont font(fontName); + font.setPixelSize(fontSize); - const int maxDpr = qRound(qApp->devicePixelRatio()); - for (int dpr = 1; dpr <= maxDpr; dpr++) { - QPixmap pixmap(size * dpr); - pixmap.setDevicePixelRatio(dpr); - pixmap.fill(Qt::transparent); + QPainter painter(&pixmap); + painter.save(); + painter.setPen(color); + painter.setFont(font); + painter.drawText(QRectF(QPoint(0, 0), size), Qt::AlignCenter, iconSymbol); + painter.restore(); - QFont font(fontName); - font.setPixelSize(fontSize); - - QPainter painter(&pixmap); - painter.save(); - painter.setPen(color); - painter.setFont(font); - painter.drawText(QRectF(QPoint(0, 0), size), Qt::AlignCenter, iconSymbol); - painter.restore(); - - icon.addPixmap(pixmap); - } - - return icon; + icon.addPixmap(pixmap); } - return {}; + return icon; } QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QString &iconSymbol, int fontSize, int iconSize) @@ -794,55 +782,47 @@ 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(a.hasFamily(fontName), {}); + QTC_ASSERT(QFontDatabase::hasFamily(fontName), {}); const QColor outlineColor = Qt::black; const QColor fillColor = Qt::white; - if (a.hasFamily(fontName)) { + QIcon icon; + QSize size(iconSize, iconSize); - QIcon icon; - QSize size(iconSize, iconSize); + const int maxDpr = qRound(qApp->devicePixelRatio()); + for (int dpr = 1; dpr <= maxDpr; dpr++) { + QPixmap pixmap(size * dpr); + pixmap.setDevicePixelRatio(dpr); + pixmap.fill(Qt::transparent); - const int maxDpr = qRound(qApp->devicePixelRatio()); - for (int dpr = 1; dpr <= maxDpr; dpr++) { - QPixmap pixmap(size * dpr); - pixmap.setDevicePixelRatio(dpr); - pixmap.fill(Qt::transparent); + QFont font(fontName); + font.setPixelSize(fontSize); - QFont font(fontName); - font.setPixelSize(fontSize); + QPainter painter(&pixmap); + painter.save(); + painter.setRenderHint(QPainter::Antialiasing, true); + painter.setRenderHint(QPainter::TextAntialiasing, true); + painter.setRenderHint(QPainter::LosslessImageRendering, true); + painter.setRenderHint(QPainter::SmoothPixmapTransform, true); - QPainter painter(&pixmap); - painter.save(); - painter.setRenderHint(QPainter::Antialiasing, true); - painter.setRenderHint(QPainter::TextAntialiasing, true); - painter.setRenderHint(QPainter::LosslessImageRendering, true); - painter.setRenderHint(QPainter::SmoothPixmapTransform, true); + painter.setFont(font); + painter.setPen(outlineColor); + painter.drawText(QRectF(QPointF(0.0, 0.0), size), + Qt::AlignCenter, cursorOutline); - painter.setFont(font); - painter.setPen(outlineColor); - painter.drawText(QRectF(QPointF(0.0, 0.0), size), - Qt::AlignCenter, cursorOutline); + painter.setPen(fillColor); + painter.drawText(QRectF(QPointF(0.0, 0.0), size), + Qt::AlignCenter, cursorFill); - painter.setPen(fillColor); - painter.drawText(QRectF(QPointF(0.0, 0.0), size), - Qt::AlignCenter, cursorFill); + painter.restore(); - painter.restore(); - - icon.addPixmap(pixmap); - } - - return icon; + icon.addPixmap(pixmap); } - return {}; + return icon; } - QString StyleHelper::dpiSpecificImageFile(const QString &fileName) { // See QIcon::addFile() diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index b0c22ca0f78..a87633a8408 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/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 pointSizes = m_fontDatabase.pointSizes(family, fontStyle); + QList 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 QStringList &styles = m_fontDatabase.styles(m_font.family()); + const QString &fontStyle = QFontDatabase::styleString(m_font); + const QStringList &styles = QFontDatabase::styles(m_font.family()); QSignalBlocker blocker(styleComboBox); styleComboBox->clear(); diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index 5b6dd115983..738e3337a17 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/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(); } diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp index 12da85e2c4e..1003b53049c 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp @@ -48,23 +48,19 @@ 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); + QFont font(fontName); + font.setPixelSize(fontSize); - painter->save(); - painter->setPen(penColor); - painter->setFont(font); - painter->drawText(QRectF(x, y, iconSize, iconSize), iconSymbol); + painter->save(); + painter->setPen(penColor); + painter->setFont(font); + painter->drawText(QRectF(x, y, iconSize, iconSize), iconSymbol); - painter->restore(); - } + painter->restore(); } FormEditorScene *FormEditorItem::scene() const { diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp index 591ce5a57fe..b6d119a4248 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp @@ -586,8 +586,7 @@ int PropertyEditorContextObject::devicePixelRatio() QStringList PropertyEditorContextObject::styleNamesForFamily(const QString &family) { - const QFontDatabase dataBase; - return dataBase.styles(family); + return QFontDatabase::styles(family); } QStringList PropertyEditorContextObject::allStatesForId(const QString &id) diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp index e74a37c0d37..44b179d01c8 100644 --- a/src/plugins/texteditor/fontsettings.cpp +++ b/src/plugins/texteditor/fontsettings.cpp @@ -491,8 +491,7 @@ static QString defaultFontFamily() return QLatin1String("Menlo"); const QString sourceCodePro(g_sourceCodePro); - const QFontDatabase dataBase; - if (dataBase.hasFamily(sourceCodePro)) + if (QFontDatabase::hasFamily(sourceCodePro)) return sourceCodePro; if (Utils::HostOsInfo::isAnyUnixHost()) diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index bdd899b7e04..f528496dcf0 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -458,15 +458,14 @@ void FontSettingsPageWidget::updateFontZoom(const FontSettings &fontSettings) QList FontSettingsPageWidget::pointSizesForSelectedFont() const { - QFontDatabase db; const QString familyName = m_fontComboBox->currentFont().family(); - QList sizeLst = db.pointSizes(familyName); + QList 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();