diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-24 06:51:41 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-02-02 21:36:28 +0000 |
| commit | baaf8f0156c9b02f6091460e53f2793c3502d3a5 (patch) | |
| tree | e0e6e11ddfa236435c3e6197dceb77409f197c43 /src/plugins/platforms/windows/qwindowsfontdatabase.cpp | |
| parent | df8e8797602ae2ce65a092310970254947d8f571 (diff) | |
[QWindowsFontDatabase] Drop some dead code
Change-Id: I95b6c95bf0be875b3fcb66150a13bd3b5df9830a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index 4abb53ca36..c5fd910fb0 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp @@ -1081,7 +1081,7 @@ QFontEngineMulti *QWindowsFontDatabase::fontEngineMulti(QFontEngine *fontEngine, QFontEngine * QWindowsFontDatabase::fontEngine(const QFontDef &fontDef, void *handle) { - QFontEngine *fe = QWindowsFontDatabase::createEngine(fontDef, 0, + QFontEngine *fe = QWindowsFontDatabase::createEngine(fontDef, QWindowsContext::instance()->defaultDPI(), sharedFontData()); qCDebug(lcQpaFonts) << __FUNCTION__ << "FONTDEF" << fontDef << fe << handle; @@ -1131,7 +1131,7 @@ QFontEngine *QWindowsFontDatabase::fontEngine(const QByteArray &fontData, qreal request.styleStrategy = QFont::PreferMatch; request.hintingPreference = hintingPreference; - fontEngine = QWindowsFontDatabase::createEngine(request, 0, + fontEngine = QWindowsFontDatabase::createEngine(request, QWindowsContext::instance()->defaultDPI(), sharedFontData()); @@ -1669,16 +1669,12 @@ QStringList QWindowsFontDatabase::fallbacksForFamily(const QString &family, QFon QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, - HDC fontHdc, int dpi, + int dpi, const QSharedPointer<QWindowsFontEngineData> &data) { LOGFONT lf; memset(&lf, 0, sizeof(LOGFONT)); - const bool useDevice = (request.styleStrategy & QFont::PreferDevice) && fontHdc; - - const HDC hdc = useDevice ? fontHdc : data->hdc; - bool stockFont = false; bool preferClearTypeAA = false; @@ -1704,13 +1700,13 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, bool ttf = false; int avWidth = 0; BOOL res; - HGDIOBJ oldObj = SelectObject(hdc, hfont); + HGDIOBJ oldObj = SelectObject(data->hdc, hfont); TEXTMETRIC tm; - res = GetTextMetrics(hdc, &tm); + res = GetTextMetrics(data->hdc, &tm); avWidth = tm.tmAveCharWidth; ttf = tm.tmPitchAndFamily & TMPF_TRUETYPE; - SelectObject(hdc, oldObj); + SelectObject(data->hdc, oldObj); if (!useDirectWrite) { if (hfont && (!ttf || request.stretch != 100)) { @@ -1769,7 +1765,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, QWindowsFontEngine *few = new QWindowsFontEngine(request.family, hfont, stockFont, lf, data); if (preferClearTypeAA) few->glyphFormat = QFontEngine::Format_A32; - few->initFontInfo(request, fontHdc, dpi); + few->initFontInfo(request, dpi); fe = few; } |