From 1582407fc782c0befd0760633324dd5c206524a1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 13 Oct 2011 14:25:18 +0200 Subject: Remove Q_WS_ and Q_OS_SYMBIAN from QtGui. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc Reviewed-on: http://codereview.qt-project.org/6607 Reviewed-by: Samuel Rødal --- src/gui/text/qfontengine.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/gui/text/qfontengine.cpp') diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 1960b1e9b2..3f008064e2 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -796,7 +796,6 @@ QFontEngineGlyphCache *QFontEngine::glyphCache(void *key, QFontEngineGlyphCache: return 0; } -#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_WS_QPA) || defined(Q_OS_SYMBIAN) static inline QFixed kerning(int left, int right, const QFontEngine::KernPair *pairs, int numPairs) { uint left_right = (left << 16) + right; @@ -895,11 +894,6 @@ end: // qDebug() << 'i' << i << "left_right" << hex << kerning_pairs.at(i).left_right; } -#else -void QFontEngine::doKerning(QGlyphLayout *, QTextEngine::ShaperFlags) const -{ -} -#endif int QFontEngine::glyphCount() const { @@ -1249,7 +1243,6 @@ glyph_metrics_t QFontEngineBox::boundingBox(const QGlyphLayout &glyphs) return overall; } -#if defined(Q_WS_QWS) || defined(Q_WS_QPA) void QFontEngineBox::draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &ti) { if (!ti.glyphs.numGlyphs) @@ -1276,7 +1269,6 @@ void QFontEngineBox::draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt painter->drawRect(QRectF(positions[k].toPointF(), s)); painter->restore(); } -#endif glyph_metrics_t QFontEngineBox::boundingBox(glyph_t) { @@ -1310,12 +1302,6 @@ qreal QFontEngineBox::maxCharWidth() const return _size; } -#ifdef Q_WS_X11 -int QFontEngineBox::cmap() const -{ - return -1; -} -#endif const char *QFontEngineBox::name() const { -- cgit v1.2.3