diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-02 19:32:39 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-02 19:52:11 +0100 |
| commit | 5375e3521015381f920f61f6d93f53cd0a9bcf28 (patch) | |
| tree | a7021fd783bb1296b4343398428cc390fedeabb8 | |
| parent | e645dd72df3e7b8083a1969ac3fdef111eb3123d (diff) | |
Get rid of all instance usage of QFontDatabase
All QFontDatabase APIs are static, use them accordingly.
Task-number: QTBUG-88114
Change-Id: Iaa6be07e47adcdb5115e475cc5228f403e9a2b27
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 3 | ||||
| -rw-r--r-- | src/quick/util/qquickglobal.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlqt/tst_qqmlqt.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qquickfontmetrics/tst_quickfontmetrics.cpp | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 0e024bea8a..87d308d243 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -311,8 +311,7 @@ static QStringList qExtractFontFamiliesFromString(QStringView fontFamiliesString static bool qSetFontFamilyFromTokens(QFont &font, const QStringList &fontFamilyTokens) { for (const QString &fontFamilyToken : fontFamilyTokens) { - QFontDatabase fontDatabase; - if (fontDatabase.hasFamily(fontFamilyToken)) { + if (QFontDatabase::hasFamily(fontFamilyToken)) { font.setFamily(fontFamilyToken); return true; } else { diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index ab6cb24bfb..0639533bac 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -311,8 +311,7 @@ public: QStringList fontFamilies() override { - QFontDatabase database; - return database.families(); + return QFontDatabase::families(); } bool openUrlExternally(QUrl &url) override diff --git a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp index 9dd53b78e7..a6d8a52e0e 100644 --- a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp +++ b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp @@ -1108,8 +1108,7 @@ void tst_qqmlqt::fontFamilies() QScopedPointer<QObject> object(component.create()); QVERIFY(object != nullptr); - QFontDatabase database; - QCOMPARE(object->property("test2"), QVariant::fromValue(database.families())); + QCOMPARE(object->property("test2"), QVariant::fromValue(QFontDatabase::families())); } void tst_qqmlqt::quit() diff --git a/tests/auto/quick/qquickfontmetrics/tst_quickfontmetrics.cpp b/tests/auto/quick/qquickfontmetrics/tst_quickfontmetrics.cpp index ef61c45225..f760890e3c 100644 --- a/tests/auto/quick/qquickfontmetrics/tst_quickfontmetrics.cpp +++ b/tests/auto/quick/qquickfontmetrics/tst_quickfontmetrics.cpp @@ -55,7 +55,7 @@ tst_QuickFontMetrics::tst_QuickFontMetrics() void tst_QuickFontMetrics::properties() { - QStringList families = QFontDatabase().families().mid(0, 10); + QStringList families = QFontDatabase::families().mid(0, 10); QQuickFontMetrics metrics; foreach (const QString &family, families) { |