AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QWindowsFontEngine: Get rid of some dead code

Browse Source 
Q_DEAD_CODE_FROM_QT4_WINCE was never defined anywhere and there are
no other engines that do similar trick; so remove the code at all.
Consider this "feature" lost in WinCE history ;)

Change-Id: I99183a07ccb45b6b970cd33414708288bd0d7efa
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
This commit is contained in:
Konstantin Ritt 2015-12-15 07:19:22 +04:00
parent 3e5719ae7b
commit 293731cd4b
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/windows/qwindowsfontengine.cpp
View File

@ -231,17 +231,10 @@ int QWindowsFontEngine::getGlyphIndexes(const QChar *str, int numChars, QGlyphLa
} }
} else { } else {
#endif #endif
wchar_t first = tm.tmFirstChar;
wchar_t last = tm.tmLastChar;
QStringIterator it(str, str + numChars); QStringIterator it(str, str + numChars);
while (it.hasNext()) { while (it.hasNext()) {
const uint uc = it.next(); const uint uc = it.next();
if ( if (uc >= tm.tmFirstChar && uc <= tm.tmLastChar)
#ifdef Q_DEAD_CODE_FROM_QT4_WINCE
tm.tmFirstChar > 60000 ||
#endif
uc >= first && uc <= last)
glyphs->glyphs[glyph_pos] = uc; glyphs->glyphs[glyph_pos] = uc;
else else
glyphs->glyphs[glyph_pos] = 0; glyphs->glyphs[glyph_pos] = 0;
@ -351,11 +344,9 @@ glyph_t QWindowsFontEngine::glyphIndex(uint ucs4) const
glyph = getTrueTypeGlyphIndex(cmap, cmapSize, ucs4 + 0xf000); glyph = getTrueTypeGlyphIndex(cmap, cmapSize, ucs4 + 0xf000);
} else if (ttf) { } else if (ttf) {
glyph = getTrueTypeGlyphIndex(cmap, cmapSize, ucs4); glyph = getTrueTypeGlyphIndex(cmap, cmapSize, ucs4);
#else } else
if (tm.tmFirstChar > 60000) {
glyph = ucs4;
#endif #endif
} else if (ucs4 >= tm.tmFirstChar && ucs4 <= tm.tmLastChar) { if (ucs4 >= tm.tmFirstChar && ucs4 <= tm.tmLastChar) {
glyph = ucs4; glyph = ucs4;
} else { } else {
glyph = 0; glyph = 0;