1 files changed, 0 insertions, 114 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp
index 2a41209225..d1d11883c1 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp
@@ -1199,120 +1199,6 @@ void QWindowsFontEngine::initFontInfo(const QFontDef &request,
     }
 }
 
-/*!
-    \class QWindowsMultiFontEngine
-    \brief Standard Windows Multi font engine.
-    \internal
-    \ingroup qt-lighthouse-win
-
-    "Merges" several font engines that have gaps in the
-    supported writing systems.
-
-    Will probably be superseded by a common Free Type font engine in Qt 5.X.
-*/
-QWindowsMultiFontEngine::QWindowsMultiFontEngine(QFontEngine *fe, int script)
-    : QFontEngineMulti(fe, script)
-{
-}
-
-#ifndef QT_NO_DIRECTWRITE
-static QString msgDirectWriteFunctionFailed(HRESULT hr, const char *function,
-                                            const QString &fam, const QString &substitute)
-{
-    _com_error error(hr);
-    QString result;
-    QTextStream str(&result);
-    str << function << " failed for \"" << fam << '"';
-    if (substitute != fam)
-        str << " (substitute: \"" <<  substitute << "\")";
-    str << ": error " << hex << showbase << ulong(hr) << ' ' << noshowbase << dec
-        << ": " << QString::fromWCharArray(error.ErrorMessage());
-    return result;
-}
-#endif // !QT_NO_DIRECTWRITE
-
-QFontEngine *QWindowsMultiFontEngine::loadEngine(int at)
-{
-    QFontEngine *fontEngine = engine(0);
-    QSharedPointer<QWindowsFontEngineData> data;
-    LOGFONT lf;
-
-#ifndef QT_NO_DIRECTWRITE
-    if (fontEngine->type() == QFontEngine::DirectWrite) {
-        QWindowsFontEngineDirectWrite *fe = static_cast<QWindowsFontEngineDirectWrite *>(fontEngine);
-        lf = QWindowsFontDatabase::fontDefToLOGFONT(fe->fontDef, QString());
-
-        data = fe->fontEngineData();
-    } else
-#endif
-    {
-        QWindowsFontEngine *fe = static_cast<QWindowsFontEngine*>(fontEngine);
-        lf = fe->m_logfont;
-
-        data = fe->fontEngineData();
-    }
-
-    const QString fam = fallbackFamilyAt(at - 1);
-    const int faceNameLength = qMin(fam.length(), LF_FACESIZE - 1);
-    memcpy(lf.lfFaceName, fam.utf16(), faceNameLength * sizeof(wchar_t));
-    lf.lfFaceName[faceNameLength] = 0;
-
-#ifndef QT_NO_DIRECTWRITE
-    if (fontEngine->type() == QFontEngine::DirectWrite) {
-        const QString nameSubstitute = QWindowsFontEngineDirectWrite::fontNameSubstitute(fam);
-        if (nameSubstitute != fam) {
-            const int nameSubstituteLength = qMin(nameSubstitute.length(), LF_FACESIZE - 1);
-            memcpy(lf.lfFaceName, nameSubstitute.utf16(), nameSubstituteLength * sizeof(wchar_t));
-            lf.lfFaceName[nameSubstituteLength] = 0;
-        }
-
-        HFONT hfont = CreateFontIndirect(&lf);
-        if (hfont == nullptr) {
-            qErrnoWarning("%s: CreateFontIndirect failed", __FUNCTION__);
-        } else {
-            HGDIOBJ oldFont = SelectObject(data->hdc, hfont);
-
-            IDWriteFontFace *directWriteFontFace = nullptr;
-            QWindowsFontEngineDirectWrite *fedw = nullptr;
-            HRESULT hr = data->directWriteGdiInterop->CreateFontFaceFromHdc(data->hdc, &directWriteFontFace);
-            if (SUCCEEDED(hr)) {
-                Q_ASSERT(directWriteFontFace);
-                fedw = new QWindowsFontEngineDirectWrite(directWriteFontFace,
-                                                         fontEngine->fontDef.pixelSize,
-                                                         data);
-                fedw->fontDef.weight = fontEngine->fontDef.weight;
-                if (fontEngine->fontDef.style > QFont::StyleNormal)
-                    fedw->fontDef.style = fontEngine->fontDef.style;
-                fedw->fontDef.family = fam;
-                fedw->fontDef.hintingPreference = fontEngine->fontDef.hintingPreference;
-                fedw->fontDef.stretch = fontEngine->fontDef.stretch;
-            } else {
-                qWarning("%s: %s", __FUNCTION__,
-                         qPrintable(msgDirectWriteFunctionFailed(hr, "CreateFontFace", fam, nameSubstitute)));
-            }
-
-            SelectObject(data->hdc, oldFont);
-            DeleteObject(hfont);
-
-            if (fedw != nullptr)
-                return fedw;
-        }
-    }
-#endif
-
-    // Get here if original font is not DirectWrite or DirectWrite creation failed for some
-    // reason
-
-    QFontEngine *fe = new QWindowsFontEngine(fam, lf, data);
-    fe->fontDef.weight = fontEngine->fontDef.weight;
-    if (fontEngine->fontDef.style > QFont::StyleNormal)
-        fe->fontDef.style = fontEngine->fontDef.style;
-    fe->fontDef.family = fam;
-    fe->fontDef.hintingPreference = fontEngine->fontDef.hintingPreference;
-    fe->fontDef.stretch = fontEngine->fontDef.stretch;
-    return fe;
-}
-
 bool QWindowsFontEngine::supportsTransformation(const QTransform &transform) const
 {
     // Support all transformations for ttf files, and translations for raster fonts