1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[QBasicFontDatabase] Minor code clean-up

Browse Source 
We do not use supportedWritingSystems anymore -> simply remove.

Change-Id: I8c8b4b0614bf396c943d810c396d18e2d0201eff
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This commit is contained in:
Konstantin Ritt 2015-05-18 09:33:10 +04:00
parent 839af2268e
commit 073f4f9bb2
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
View File

@ -179,7 +179,7 @@ QFontEngine *QBasicFontDatabase::fontEngine(const QByteArray &fontData, qreal pi
QStringList QBasicFontDatabase::addApplicationFont(const QByteArray &fontData, const QString &fileName) 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) void QBasicFontDatabase::releaseHandle(void *handle)
@ -190,7 +190,7 @@ void QBasicFontDatabase::releaseHandle(void *handle)
extern FT_Library qt_getFreetype(); 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(); FT_Library library = qt_getFreetype();
@ -229,8 +229,6 @@ QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByt
if (cm->encoding == FT_ENCODING_ADOBE_CUSTOM if (cm->encoding == FT_ENCODING_ADOBE_CUSTOM
|| cm->encoding == FT_ENCODING_MS_SYMBOL) { || cm->encoding == FT_ENCODING_MS_SYMBOL) {
writingSystems.setSupported(QFontDatabase::Symbol); writingSystems.setSupported(QFontDatabase::Symbol);
if (supportedWritingSystems)
supportedWritingSystems->setSupported(QFontDatabase::Symbol);
break; break;
} }
} }
@ -249,8 +247,6 @@ QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByt
}; };
writingSystems = QPlatformFontDatabase::writingSystemsFromTrueTypeBits(unicodeRange, codePageRange); writingSystems = QPlatformFontDatabase::writingSystemsFromTrueTypeBits(unicodeRange, codePageRange);
if (supportedWritingSystems)
*supportedWritingSystems = writingSystems;
if (os2->usWeightClass) { if (os2->usWeightClass) {
weight = QPlatformFontDatabase::weightFromInteger(os2->usWeightClass); weight = QPlatformFontDatabase::weightFromInteger(os2->usWeightClass);

2
src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h
View File

@ -66,7 +66,7 @@ public:
QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE; QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE;
void releaseHandle(void *handle) Q_DECL_OVERRIDE; void releaseHandle(void *handle) Q_DECL_OVERRIDE;
static QStringList addTTFile(const QByteArray &fontData, const QByteArray &file, QSupportedWritingSystems *supportedWritingSystems = 0); static QStringList addTTFile(const QByteArray &fontData, const QByteArray &file);
}; };
QT_END_NAMESPACE QT_END_NAMESPACE