diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-05-18 09:33:10 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-07-31 09:53:20 +0000 |
| commit | 073f4f9bb21817d76d55324a74899d2f40118042 (patch) | |
| tree | 5488815ed190830932c010865aaa46c7fad2476c /src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | |
| parent | 839af2268e2b0b8079d1f107db71dcf0390c11ee (diff) | |
[QBasicFontDatabase] Minor code clean-up
We do not use supportedWritingSystems anymore -> simply remove.
Change-Id: I8c8b4b0614bf396c943d810c396d18e2d0201eff
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp')
| -rw-r--r-- | src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index abadede2620..c41061a9fd5 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -179,7 +179,7 @@ QFontEngine *QBasicFontDatabase::fontEngine(const QByteArray &fontData, qreal pi QStringList QBasicFontDatabase::addApplicationFont(const QByteArray &fontData, const QString &fileName) { - return addTTFile(fontData,fileName.toLocal8Bit()); + return QBasicFontDatabase::addTTFile(fontData, fileName.toLocal8Bit()); } void QBasicFontDatabase::releaseHandle(void *handle) @@ -190,7 +190,7 @@ void QBasicFontDatabase::releaseHandle(void *handle) extern FT_Library qt_getFreetype(); -QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByteArray &file, QSupportedWritingSystems *supportedWritingSystems) +QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByteArray &file) { FT_Library library = qt_getFreetype(); @@ -229,8 +229,6 @@ QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByt if (cm->encoding == FT_ENCODING_ADOBE_CUSTOM || cm->encoding == FT_ENCODING_MS_SYMBOL) { writingSystems.setSupported(QFontDatabase::Symbol); - if (supportedWritingSystems) - supportedWritingSystems->setSupported(QFontDatabase::Symbol); break; } } @@ -249,8 +247,6 @@ QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByt }; writingSystems = QPlatformFontDatabase::writingSystemsFromTrueTypeBits(unicodeRange, codePageRange); - if (supportedWritingSystems) - *supportedWritingSystems = writingSystems; if (os2->usWeightClass) { weight = QPlatformFontDatabase::weightFromInteger(os2->usWeightClass); |