Windows QPA: Remove Windows CE.

Task-number: QTBUG-51673
Change-Id: I5b58a7d1651fce7f868a4d3fdd8fa46f35e67695
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

1 files changed, 6 insertions, 116 deletions

diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp
index a3e3870d90..a160086326 100644
--- a/src/plugins/platforms/windows/qwindowsfontengine.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp
@@ -65,10 +65,6 @@
 
 #include <limits.h>
 
-#ifdef Q_OS_WINCE
-#  include "qplatformfunctions_wince.h"
-#endif
-
 #if !defined(QT_NO_DIRECTWRITE)
 #  include <dwrite.h>
 #endif
@@ -205,9 +201,6 @@ int QWindowsFontEngine::getGlyphIndexes(const QChar *str, int numChars, QGlyphLa
 {
     int glyph_pos = 0;
     {
-#if defined(Q_OS_WINCE)
-        {
-#else
         if (symbol) {
             QStringIterator it(str, str + numChars);
             while (it.hasNext()) {
@@ -225,7 +218,6 @@ int QWindowsFontEngine::getGlyphIndexes(const QChar *str, int numChars, QGlyphLa
                 ++glyph_pos;
             }
         } else {
-#endif
             QStringIterator it(str, str + numChars);
             while (it.hasNext()) {
                 const uint uc = it.next();
@@ -329,21 +321,16 @@ QWindowsFontEngine::~QWindowsFontEngine()
 
 glyph_t QWindowsFontEngine::glyphIndex(uint ucs4) const
 {
-    glyph_t glyph;
+    glyph_t glyph = 0;
 
-#if !defined(Q_OS_WINCE)
     if (symbol) {
         glyph = getTrueTypeGlyphIndex(cmap, cmapSize, ucs4);
         if (glyph == 0 && ucs4 < 0x100)
             glyph = getTrueTypeGlyphIndex(cmap, cmapSize, ucs4 + 0xf000);
     } else if (ttf) {
         glyph = getTrueTypeGlyphIndex(cmap, cmapSize, ucs4);
-    } else
-#endif
-    if (ucs4 >= tm.tmFirstChar && ucs4 <= tm.tmLastChar) {
+    } else if (ucs4 >= tm.tmFirstChar && ucs4 <= tm.tmLastChar) {
         glyph = ucs4;
-    } else {
-        glyph = 0;
     }
 
     return glyph;
@@ -377,12 +364,8 @@ bool QWindowsFontEngine::stringToCMap(const QChar *str, int len, QGlyphLayout *g
 
 inline void calculateTTFGlyphWidth(HDC hdc, UINT glyph, int &width)
 {
-#if defined(Q_OS_WINCE)
-    GetCharWidth32(hdc, glyph, glyph, &width);
-#else
     if (ptrGetCharWidthI)
         ptrGetCharWidthI(hdc, glyph, 1, 0, &width);
-#endif
 }
 
 void QWindowsFontEngine::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::ShaperFlags flags) const
@@ -467,7 +450,7 @@ glyph_metrics_t QWindowsFontEngine::boundingBox(const QGlyphLayout &glyphs)
 
     return glyph_metrics_t(0, -tm.tmAscent, w - lastRightBearing(glyphs), tm.tmHeight, w, 0);
 }
-#ifndef Q_OS_WINCE
+
 bool QWindowsFontEngine::getOutlineMetrics(glyph_t glyph, const QTransform &t, glyph_metrics_t *metrics) const
 {
     Q_ASSERT(metrics != 0);
@@ -520,11 +503,9 @@ bool QWindowsFontEngine::getOutlineMetrics(glyph_t glyph, const QTransform &t, g
         return false;
     }
 }
-#endif
 
 glyph_metrics_t QWindowsFontEngine::boundingBox(glyph_t glyph, const QTransform &t)
 {
-#ifndef Q_OS_WINCE
     HDC hdc = m_fontEngineData->hdc;
     SelectObject(hdc, hfont);
 
@@ -542,34 +523,6 @@ glyph_metrics_t QWindowsFontEngine::boundingBox(glyph_t glyph, const QTransform
     }
 
     return glyphMetrics;
-#else
-    HDC hdc = m_fontEngineData->hdc;
-    HGDIOBJ oldFont = SelectObject(hdc, hfont);
-
-    ABC abc;
-    int width;
-    int advance;
-#ifdef GWES_MGTT    // true type fonts
-    if (GetCharABCWidths(hdc, glyph, glyph, &abc)) {
-        width = qAbs(abc.abcA) + abc.abcB + qAbs(abc.abcC);
-        advance = abc.abcA + abc.abcB + abc.abcC;
-    }
-    else
-#endif
-#if defined(GWES_MGRAST) || defined(GWES_MGRAST2)   // raster fonts
-    if (GetCharWidth32(hdc, glyph, glyph, &width)) {
-        advance = width;
-    }
-    else
-#endif
-    {   // fallback
-        width = tm.tmMaxCharWidth;
-        advance = width;
-    }
-
-    SelectObject(hdc, oldFont);
-    return glyph_metrics_t(0, -tm.tmAscent, width, tm.tmHeight, advance, 0).transformed(t);
-#endif
 }
 
 QFixed QWindowsFontEngine::ascent() const
@@ -636,22 +589,16 @@ void QWindowsFontEngine::getGlyphBearings(glyph_t glyph, qreal *leftBearing, qre
     HDC hdc = m_fontEngineData->hdc;
     SelectObject(hdc, hfont);
 
-#ifndef Q_OS_WINCE
-    if (ttf)
-#endif
-    {
+    if (ttf) {
         ABC abcWidths;
         GetCharABCWidthsI(hdc, glyph, 1, 0, &abcWidths);
         if (leftBearing)
             *leftBearing = abcWidths.abcA;
         if (rightBearing)
             *rightBearing = abcWidths.abcC;
-    }
-#ifndef Q_OS_WINCE
-    else {
+    } else {
         QFontEngine::getGlyphBearings(glyph, leftBearing, rightBearing);
     }
-#endif
 }
 #endif // Q_CC_MINGW
 
@@ -670,7 +617,6 @@ qreal QWindowsFontEngine::minLeftBearing() const
 
 qreal QWindowsFontEngine::minRightBearing() const
 {
-#ifndef Q_OS_WINCE
     if (rbearing == SHRT_MIN) {
         int ml = 0;
         int mr = 0;
@@ -726,40 +672,6 @@ qreal QWindowsFontEngine::minRightBearing() const
     }
 
     return rbearing;
-#else // !Q_OS_WINCE
-    if (rbearing == SHRT_MIN) {
-        int ml = 0;
-        int mr = 0;
-        HDC hdc = m_fontEngineData->hdc;
-        SelectObject(hdc, hfont);
-        if (ttf) {
-            ABC *abc = 0;
-            int n = tm.tmLastChar - tm.tmFirstChar;
-            if (n <= max_font_count) {
-                abc = new ABC[n+1];
-                GetCharABCWidths(hdc, tm.tmFirstChar, tm.tmLastChar, abc);
-            } else {
-                abc = new ABC[char_table_entries+1];
-                for (int i = 0; i < char_table_entries; i++)
-                    GetCharABCWidths(hdc, char_table[i], char_table[i], abc+i);
-                n = char_table_entries;
-            }
-            ml = abc[0].abcA;
-            mr = abc[0].abcC;
-            for (int i = 1; i < n; i++) {
-                if (abc[i].abcA + abc[i].abcB + abc[i].abcC != 0) {
-                    ml = qMin(ml,abc[i].abcA);
-                    mr = qMin(mr,abc[i].abcC);
-                }
-            }
-            delete [] abc;
-        }
-        lbearing = ml;
-        rbearing = mr;
-    }
-
-    return rbearing;
-#endif // Q_OS_WINCE
 }
 
 static inline double qt_fixed_to_double(const FIXED &p) {
@@ -786,7 +698,6 @@ static bool addGlyphToPath(glyph_t glyph, const QFixedPoint &position, HDC hdc,
     GLYPHMETRICS gMetric;
     memset(&gMetric, 0, sizeof(GLYPHMETRICS));
 
-#ifndef Q_OS_WINCE
     if (metric) {
         // If metrics requested, retrieve first using GGO_METRICS, because the returned
         // values are incorrect for OpenType PS fonts if obtained at the same time as the
@@ -801,7 +712,6 @@ static bool addGlyphToPath(glyph_t glyph, const QFixedPoint &position, HDC hdc,
                                   int(gMetric.gmBlackBoxX), int(gMetric.gmBlackBoxY),
                                   gMetric.gmCellIncX, gMetric.gmCellIncY);
     }
-#endif
 
     uint glyphFormat = GGO_NATIVE;
 
@@ -820,15 +730,6 @@ static bool addGlyphToPath(glyph_t glyph, const QFixedPoint &position, HDC hdc,
         return false;
     }
 
-#ifdef Q_OS_WINCE
-    if (metric) {
-        // #### obey scale
-        *metric = glyph_metrics_t(gMetric.gmptGlyphOrigin.x, -gMetric.gmptGlyphOrigin.y,
-                                  (int)gMetric.gmBlackBoxX, (int)gMetric.gmBlackBoxY,
-                                  gMetric.gmCellIncX, gMetric.gmCellIncY);
-    }
-#endif
-
     DWORD offset = 0;
     DWORD headerOffset = 0;
 
@@ -1052,7 +953,6 @@ QWindowsNativeImage *QWindowsFontEngine::drawGDIGlyph(HFONT font, glyph_t glyph,
 
     bool has_transformation = t.type() > QTransform::TxTranslate;
 
-#ifndef Q_OS_WINCE
     unsigned int options = ttf ? ETO_GLYPH_INDEX : 0;
     XFORM xform;
 
@@ -1095,13 +995,6 @@ QWindowsNativeImage *QWindowsFontEngine::drawGDIGlyph(HFONT font, glyph_t glyph,
         xform.eDx -= tgm.gmptGlyphOrigin.x;
         xform.eDy += tgm.gmptGlyphOrigin.y;
     }
-#else // else wince
-    unsigned int options = 0;
-    if (has_transformation) {
-        qWarning() << "QWindowsFontEngine is unable to apply transformations other than translations for fonts on Windows CE."
-                   << "If you need them anyway, start your application with -platform windows:fontengine=freetype.";
-   }
-#endif // wince
 
     // The padding here needs to be kept in sync with the values in alphaMapBoundingBox.
     QWindowsNativeImage *ni = new QWindowsNativeImage(iw + 2 * margin,
@@ -1123,14 +1016,11 @@ QWindowsNativeImage *QWindowsFontEngine::drawGDIGlyph(HFONT font, glyph_t glyph,
 
     HGDIOBJ old_font = SelectObject(hdc, font);
 
-#ifndef Q_OS_WINCE
     if (has_transformation) {
         SetGraphicsMode(hdc, GM_ADVANCED);
         SetWorldTransform(hdc, &xform);
         ExtTextOut(hdc, 0, 0, options, 0, reinterpret_cast<LPCWSTR>(&glyph), 1, 0);
-    } else
-#endif // !Q_OS_WINCE
-    {
+    } else {
         ExtTextOut(hdc, -gx + margin, -gy + margin, options, 0, reinterpret_cast<LPCWSTR>(&glyph), 1, 0);
     }