diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-02 19:48:25 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-03 20:36:34 +0100 |
commit | a50f0f045d3f749a4638bd4b46078bb86b329ad8 (patch) | |
tree | 9846948577cd97029096f0b8872a4f8568e7425c /src | |
parent | 488e72cce841c5caeed2c27052be146baf579c3e (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/doc/snippets/qfontdatabase/qfontdatabase_snippets.cpp | 7 | ||||
-rw-r--r-- | src/gui/text/windows/qwindowsfontdatabasebase.cpp | 8 | ||||
-rw-r--r-- | src/plugins/platforms/wasm/qwasmtheme.cpp | 5 | ||||
-rw-r--r-- | src/widgets/dialogs/qfontdialog.cpp | 20 | ||||
-rw-r--r-- | src/widgets/dialogs/qfontdialog_p.h | 1 | ||||
-rw-r--r-- | src/widgets/widgets/qfontcombobox.cpp | 9 |
6 files changed, 21 insertions, 29 deletions
diff --git a/src/gui/doc/snippets/qfontdatabase/qfontdatabase_snippets.cpp b/src/gui/doc/snippets/qfontdatabase/qfontdatabase_snippets.cpp index 3200ac94b1..abcff4211a 100644 --- a/src/gui/doc/snippets/qfontdatabase/qfontdatabase_snippets.cpp +++ b/src/gui/doc/snippets/qfontdatabase/qfontdatabase_snippets.cpp @@ -54,23 +54,22 @@ namespace qfontdatabase_snippets { void wrapper() { //! [0] -QFontDatabase database; QTreeWidget fontTree; fontTree.setColumnCount(2); fontTree.setHeaderLabels(QStringList() << "Font" << "Smooth Sizes"); -const QStringList fontFamilies = database.families(); +const QStringList fontFamilies = QFontDatabase::families(); for (const QString &family : fontFamilies) { QTreeWidgetItem *familyItem = new QTreeWidgetItem(&fontTree); familyItem->setText(0, family); - const QStringList fontStyles = database.styles(family); + const QStringList fontStyles = QFontDatabase::styles(family); for (const QString &style : fontStyles) { QTreeWidgetItem *styleItem = new QTreeWidgetItem(familyItem); styleItem->setText(0, style); QString sizes; - const QList<int> smoothSizes = database.smoothSizes(family, style); + const QList<int> smoothSizes = QFontDatabase::smoothSizes(family, style); for (const auto &points : smoothSizes) sizes += QString::number(points) + ' '; diff --git a/src/gui/text/windows/qwindowsfontdatabasebase.cpp b/src/gui/text/windows/qwindowsfontdatabasebase.cpp index 9a7c1c3578..b84fe20c93 100644 --- a/src/gui/text/windows/qwindowsfontdatabasebase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabasebase.cpp @@ -927,8 +927,7 @@ static const char **tryFonts = nullptr; QStringList QWindowsFontDatabaseBase::extraTryFontsForFamily(const QString &family) { QStringList result; - QFontDatabase db; - if (!db.writingSystems(family).contains(QFontDatabase::Symbol)) { + if (!QFontDatabase::writingSystems(family).contains(QFontDatabase::Symbol)) { if (!tryFonts) { LANGID lid = GetUserDefaultLangID(); switch (lid&0xff) { @@ -949,13 +948,12 @@ QStringList QWindowsFontDatabaseBase::extraTryFontsForFamily(const QString &fami break; } } - QFontDatabase db; - const QStringList families = db.families(); + const QStringList families = QFontDatabase::families(); const char **tf = tryFonts; while (tf && *tf) { // QTBUG-31689, family might be an English alias for a localized font name. const QString family = QString::fromLatin1(*tf); - if (families.contains(family) || db.hasFamily(family)) + if (families.contains(family) || QFontDatabase::hasFamily(family)) result << family; ++tf; } diff --git a/src/plugins/platforms/wasm/qwasmtheme.cpp b/src/plugins/platforms/wasm/qwasmtheme.cpp index 4b99f90591..438e3e1119 100644 --- a/src/plugins/platforms/wasm/qwasmtheme.cpp +++ b/src/plugins/platforms/wasm/qwasmtheme.cpp @@ -35,9 +35,8 @@ QT_BEGIN_NAMESPACE QWasmTheme::QWasmTheme() { - QFontDatabase fdb; - for (auto family : fdb.families()) - if (fdb.isFixedPitch(family)) + for (auto family : QFontDatabase::families()) + if (QFontDatabase::isFixedPitch(family)) fixedFont = new QFont(family); } diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index 8e42804943..7dc5566b70 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -486,20 +486,18 @@ void QFontDialogPrivate::updateFamilies() const QFontDialog::FontDialogOptions spacingMask = (QFontDialog::ProportionalFonts | QFontDialog::MonospacedFonts); const QFontDialog::FontDialogOptions options = q->options(); - QFontDatabase fdb; - QStringList familyNames; - const auto families = fdb.families(writingSystem); + const auto families = QFontDatabase::families(writingSystem); for (const QString &family : families) { - if (fdb.isPrivateFamily(family)) + if (QFontDatabase::isPrivateFamily(family)) continue; if ((options & scalableMask) && (options & scalableMask) != scalableMask) { - if (bool(options & QFontDialog::ScalableFonts) != fdb.isSmoothlyScalable(family)) + if (bool(options & QFontDialog::ScalableFonts) != QFontDatabase::isSmoothlyScalable(family)) continue; } if ((options & spacingMask) && (options & spacingMask) != spacingMask) { - if (bool(options & QFontDialog::MonospacedFonts) != fdb.isFixedPitch(family)) + if (bool(options & QFontDialog::MonospacedFonts) != QFontDatabase::isFixedPitch(family)) continue; } familyNames << family; @@ -564,7 +562,7 @@ void QFontDialogPrivate::updateFamilies() void QFontDialogPrivate::updateStyles() { Q_Q(QFontDialog); - QStringList styles = fdb.styles(familyList->currentText()); + QStringList styles = QFontDatabase::styles(familyList->currentText()); styleList->model()->setStringList(styles); if (styles.isEmpty()) { @@ -606,7 +604,7 @@ void QFontDialogPrivate::updateStyles() && styleList->hasFocus()) styleEdit->selectAll(); - smoothScalable = fdb.isSmoothlyScalable(familyList->currentText(), styleList->currentText()); + smoothScalable = QFontDatabase::isSmoothlyScalable(familyList->currentText(), styleList->currentText()); } updateSizes(); @@ -623,7 +621,7 @@ void QFontDialogPrivate::updateSizes() Q_Q(QFontDialog); if (!familyList->currentText().isEmpty()) { - QList<int> sizes = fdb.pointSizes(familyList->currentText(), styleList->currentText()); + QList<int> sizes = QFontDatabase::pointSizes(familyList->currentText(), styleList->currentText()); int i = 0; int current = -1; @@ -655,7 +653,7 @@ void QFontDialogPrivate::_q_updateSample() { // compute new font int pSize = sizeEdit->text().toInt(); - QFont newFont(fdb.font(familyList->currentText(), style, pSize)); + QFont newFont(QFontDatabase::font(familyList->currentText(), style, pSize)); newFont.setStrikeOut(strikeout->isChecked()); newFont.setUnderline(underline->isChecked()); @@ -807,7 +805,7 @@ void QFontDialog::setCurrentFont(const QFont &font) { Q_D(QFontDialog); d->family = font.family(); - d->style = d->fdb.styleString(font); + d->style = QFontDatabase::styleString(font); d->size = font.pointSize(); if (d->size == -1) { QFontInfo fi(font); diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index 202247a3b4..73c17c3708 100644 --- a/src/widgets/dialogs/qfontdialog_p.h +++ b/src/widgets/dialogs/qfontdialog_p.h @@ -130,7 +130,6 @@ public: QDialogButtonBox *buttonBox; - QFontDatabase fdb; QString family; QFontDatabase::WritingSystem writingSystem; QString style; diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index 4b3003a6f3..bd96aa2768 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -320,23 +320,22 @@ void QFontComboBoxPrivate::_q_updateModel() QFontFamilyDelegate *delegate = qobject_cast<QFontFamilyDelegate *>(q->view()->itemDelegate()); QFontDatabase::WritingSystem system = delegate ? delegate->writingSystem : QFontDatabase::Any; - QFontDatabase fdb; - QStringList list = fdb.families(system); + QStringList list = QFontDatabase::families(system); QStringList result; int offset = 0; QFontInfo fi(currentFont); for (int i = 0; i < list.size(); ++i) { - if (fdb.isPrivateFamily(list.at(i))) + if (QFontDatabase::isPrivateFamily(list.at(i))) continue; if ((filters & scalableMask) && (filters & scalableMask) != scalableMask) { - if (bool(filters & QFontComboBox::ScalableFonts) != fdb.isSmoothlyScalable(list.at(i))) + if (bool(filters & QFontComboBox::ScalableFonts) != QFontDatabase::isSmoothlyScalable(list.at(i))) continue; } if ((filters & spacingMask) && (filters & spacingMask) != spacingMask) { - if (bool(filters & QFontComboBox::MonospacedFonts) != fdb.isFixedPitch(list.at(i))) + if (bool(filters & QFontComboBox::MonospacedFonts) != QFontDatabase::isFixedPitch(list.at(i))) continue; } result += list.at(i); |