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/gui/text/windows | |
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/gui/text/windows')
-rw-r--r-- | src/gui/text/windows/qwindowsfontdatabasebase.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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; } |