From 7ef5a8528eea1419ef62dafa90b5174b48a04e6a Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Fri, 7 Mar 2014 01:51:21 +0200 Subject: Improve code readability Since we were requesting a multi font engine, the returned font engine must be a multi one or nothing at all. Change-Id: I1ee4e1b7c68f54c83a8c7292082d015ebfa0a8cb Reviewed-by: Pierre Rossi --- src/gui/text/qfontengine_qpa.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp index e9252b328e..90c9cbb1bb 100644 --- a/src/gui/text/qfontengine_qpa.cpp +++ b/src/gui/text/qfontengine_qpa.cpp @@ -731,10 +731,9 @@ QFontEngine* QFontEngineMultiQPA::createMultiFontEngine(QFontEngine *fe, int scr QFontCache::EngineCache::Iterator it = fc->engineCache.find(key), end = fc->engineCache.end(); while (it != end && it.key() == key) { - QFontEngineMulti *cachedEngine = 0; - if (it.value().data->type() == QFontEngine::Multi) - cachedEngine = static_cast(it.value().data); - if (faceIsLocal || (cachedEngine && fe == cachedEngine->engine(0))) { + Q_ASSERT(it.value().data->type() == QFontEngine::Multi); + QFontEngineMulti *cachedEngine = static_cast(it.value().data); + if (faceIsLocal || fe == cachedEngine->engine(0)) { engine = cachedEngine; fc->updateHitCountAndTimeStamp(it.value()); break; -- cgit v1.2.3