summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfont.cpp
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-11-02 19:53:51 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-11-03 20:36:34 +0100
commit5ea1f403502130ed12f6f6a2c6072f4f45e3d488 (patch)
treeda262f047ac6b51661fb63929f7caa4120baeef6 /src/gui/text/qfont.cpp
parenta50f0f045d3f749a4638bd4b46078bb86b329ad8 (diff)
Deprecate QFontDatabase constructor
Move private methods into the private class. Fixes: QTBUG-88114 Change-Id: I92fa52980ed5a0675eee310359d8875f614921e6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui/text/qfont.cpp')
-rw-r--r--src/gui/text/qfont.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 9ea6970409..b8fc8e6821 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -135,16 +135,16 @@ bool QFontDef::exactMatch(const QFontDef &other) const
QString this_family, this_foundry, other_family, other_foundry;
for (int i = 0; i < origFamilies.size(); ++i) {
- QFontDatabase::parseFontName(origFamilies.at(i), this_foundry, this_family);
- QFontDatabase::parseFontName(otherFamilies.at(i), other_foundry, other_family);
+ QFontDatabasePrivate::parseFontName(origFamilies.at(i), this_foundry, this_family);
+ QFontDatabasePrivate::parseFontName(otherFamilies.at(i), other_foundry, other_family);
if (this_family != other_family || this_foundry != other_foundry)
return false;
}
// Check family only if families is not set
if (origFamilies.size() == 0) {
- QFontDatabase::parseFontName(family, this_foundry, this_family);
- QFontDatabase::parseFontName(other.family, other_foundry, other_family);
+ QFontDatabasePrivate::parseFontName(family, this_foundry, this_family);
+ QFontDatabasePrivate::parseFontName(other.family, other_foundry, other_family);
}
return (styleHint == other.styleHint
@@ -282,7 +282,7 @@ QFontEngine *QFontPrivate::engineForScript(int script) const
engineData = nullptr;
}
if (!engineData || !QT_FONT_ENGINE_FROM_DATA(engineData, script))
- QFontDatabase::load(this, script);
+ QFontDatabasePrivate::load(this, script);
return QT_FONT_ENGINE_FROM_DATA(engineData, script);
}