From d0ce9886f15b2dedcc485545eb4e746b0778b821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 25 Mar 2022 11:38:53 +0100 Subject: QFontDatabase: Remove un-needed load() function The function didn't take any of the arguments into account, and was just initializing the font database, which all but one of the call sites were already doing. Change-Id: I83cab0059014dd256ec4b453e15fc2fe4bebcbdf Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Konstantin Ritt --- src/gui/text/qfontdatabase.cpp | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) (limited to 'src/gui/text/qfontdatabase.cpp') diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index a2cdd1e498..5d1a337a72 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -707,12 +707,6 @@ QStringList qt_fallbacksForFamily(const QString &family, QFont::Style style, QFo static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt); -static inline void load(const QString & = QString(), int = -1) -{ - QMutexLocker locker(fontDatabaseMutex()); - QFontDatabasePrivate::ensureFontDatabase(); -} - static QFontEngine *loadSingleEngine(int script, const QFontDef &request, @@ -1071,7 +1065,8 @@ static int match(int script, unsigned int score = ~0u; - load(family_name, script); + QMutexLocker locker(fontDatabaseMutex()); + QFontDatabasePrivate::ensureFontDatabase(); auto writingSystem = qt_writing_system_for_script(script); if (writingSystem >= QFontDatabase::WritingSystemsCount) @@ -1323,8 +1318,6 @@ QList QFontDatabase::writingSystems() QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(); - quint64 writingSystemsFound = 0; static_assert(WritingSystemsCount < 64); @@ -1367,8 +1360,6 @@ QList QFontDatabase::writingSystems(const QString QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(); - QList list; QtFontFamily *f = d->family(familyName); if (!f || f->count == 0) @@ -1398,8 +1389,6 @@ QStringList QFontDatabase::families(WritingSystem writingSystem) QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(); - QStringList flist; for (int i = 0; i < d->count; i++) { QtFontFamily *f = d->families[i]; @@ -1443,8 +1432,6 @@ QStringList QFontDatabase::styles(const QString &family) QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QStringList l; QtFontFamily *f = d->family(familyName); if (!f) @@ -1488,8 +1475,6 @@ bool QFontDatabase::isFixedPitch(const QString &family, QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QtFontFamily *f = d->family(familyName); return (f && f->fixedPitch); } @@ -1514,8 +1499,6 @@ bool QFontDatabase::isBitmapScalable(const QString &family, QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QtFontFamily *f = d->family(familyName); if (!f) return bitmapScalable; @@ -1555,8 +1538,6 @@ bool QFontDatabase::isSmoothlyScalable(const QString &family, const QString &sty QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QtFontFamily *f = d->family(familyName); if (!f) { for (int i = 0; i < d->count; i++) { @@ -1627,8 +1608,6 @@ QList QFontDatabase::pointSizes(const QString &family, QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QList sizes; QtFontFamily *fam = d->family(familyName); @@ -1681,8 +1660,6 @@ QFont QFontDatabase::font(const QString &family, const QString &style, QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QtFontFoundry allStyles(foundryName); QtFontFamily *f = d->family(familyName); if (!f) return QGuiApplication::font(); @@ -1730,8 +1707,6 @@ QList QFontDatabase::smoothSizes(const QString &family, QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QList sizes; QtFontFamily *fam = d->family(familyName); @@ -1796,8 +1771,6 @@ bool QFontDatabase::italic(const QString &family, const QString &style) QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QtFontFoundry allStyles(foundryName); QtFontFamily *f = d->family(familyName); if (!f) return false; @@ -1831,8 +1804,6 @@ bool QFontDatabase::bold(const QString &family, QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QtFontFoundry allStyles(foundryName); QtFontFamily *f = d->family(familyName); if (!f) return false; @@ -1868,8 +1839,6 @@ int QFontDatabase::weight(const QString &family, QMutexLocker locker(fontDatabaseMutex()); QFontDatabasePrivate *d = QFontDatabasePrivate::ensureFontDatabase(); - QT_PREPEND_NAMESPACE(load)(familyName); - QtFontFoundry allStyles(foundryName); QtFontFamily *f = d->family(familyName); if (!f) return -1; -- cgit v1.2.3