[QWindowsFontDatabase] Drop some dead code

Change-Id: I95b6c95bf0be875b3fcb66150a13bd3b5df9830a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

4 files changed, 11 insertions, 16 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;
     }
 
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.h b/src/plugins/platforms/windows/qwindowsfontdatabase.h
index 34312bd301..aa48fb2b08 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.h
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.h
@@ -86,7 +86,7 @@ public:
     static QFont systemDefaultFont();
 
     static QFontEngine *createEngine(const QFontDef &request,
-                                     HDC fontHdc, int dpi,
+                                     int dpi,
                                      const QSharedPointer<QWindowsFontEngineData> &data);
 
     static HFONT systemFont();
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp
index be154d359a..33600766d8 100644
--- a/src/plugins/platforms/windows/qwindowsfontengine.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp
@@ -1259,7 +1259,7 @@ QFontEngine *QWindowsFontEngine::cloneWithSize(qreal pixelSize) const
     request.pixelSize = pixelSize;
 
     QFontEngine *fontEngine =
-        QWindowsFontDatabase::createEngine(request, 0,
+        QWindowsFontDatabase::createEngine(request,
                                            QWindowsContext::instance()->defaultDPI(),
                                            m_fontEngineData);
     if (fontEngine) {
@@ -1274,11 +1274,10 @@ QFontEngine *QWindowsFontEngine::cloneWithSize(qreal pixelSize) const
 }
 
 void QWindowsFontEngine::initFontInfo(const QFontDef &request,
-                                      HDC fontHdc,
                                       int dpi)
 {
     fontDef = request; // most settings are equal
-    HDC dc = ((request.styleStrategy & QFont::PreferDevice) && fontHdc) ? fontHdc : m_fontEngineData->hdc;
+    HDC dc = m_fontEngineData->hdc;
     SelectObject(dc, hfont);
     wchar_t n[64];
     GetTextFace(dc, 64, n);
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.h b/src/plugins/platforms/windows/qwindowsfontengine.h
index fdcb74d67d..cb496a59f1 100644
--- a/src/plugins/platforms/windows/qwindowsfontengine.h
+++ b/src/plugins/platforms/windows/qwindowsfontengine.h
@@ -68,7 +68,7 @@ public:
 
     ~QWindowsFontEngine();
     void initFontInfo(const QFontDef &request,
-                      HDC fontHdc,  int dpi);
+                      int dpi);
 
     QFixed lineThickness() const Q_DECL_OVERRIDE;
     Properties properties() const Q_DECL_OVERRIDE;