From 9f1089531d75b0a831e03c3a31ef8b4e5c0b54f4 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Wed, 5 Mar 2014 09:00:31 +0200 Subject: Make QFontEngine::type() non-virtual Change-Id: I24ece90d6d8f96dad0c41a474a491b4ea96d97c3 Reviewed-by: Lars Knoll --- src/gui/text/qfontengine_qpa.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/gui/text/qfontengine_qpa.cpp') diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp index b0bfd02448..e9252b328e 100644 --- a/src/gui/text/qfontengine_qpa.cpp +++ b/src/gui/text/qfontengine_qpa.cpp @@ -237,7 +237,8 @@ static inline unsigned int getChar(const QChar *str, int &i, const int len) } QFontEngineQPA::QFontEngineQPA(const QFontDef &def, const QByteArray &data) - : fontData(reinterpret_cast(data.constData())), dataSize(data.size()) + : QFontEngine(QPF2), + fontData(reinterpret_cast(data.constData())), dataSize(data.size()) { fontDef = def; cache_cost = 100; @@ -510,11 +511,6 @@ QFixed QFontEngineQPA::lineThickness() const return QFixed::fromReal(extractHeaderField(fontData, Tag_LineThickness).value()); } -QFontEngine::Type QFontEngineQPA::type() const -{ - return QFontEngine::QPF2; -} - bool QFontEngineQPA::isValid() const { return fontData && dataSize && (cmapOffset || externalCMap) -- cgit v1.2.3