From 5d166accfee678335c51cd1b56e8fd473058792a Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Sat, 28 Oct 2006 16:01:12 +0000 Subject: [PATCH] * qt4/GuiFontMetrics.C: remove qt3 compatibility code git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15594 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiFontMetrics.C | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/frontends/qt4/GuiFontMetrics.C b/src/frontends/qt4/GuiFontMetrics.C index 57830f082a..fa56e421dd 100644 --- a/src/frontends/qt4/GuiFontMetrics.C +++ b/src/frontends/qt4/GuiFontMetrics.C @@ -61,28 +61,14 @@ int GuiFontMetrics::maxDescent() const int GuiFontMetrics::ascent(char_type c) const { QRect const & r = metrics_.boundingRect(ucs4_to_qchar(c)); - // Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y - // value by the height: (x, -y-height, width, height). - // Other versions return: (x, -y, width, height) -#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201) - return -r.top() - r.height(); -#else return -r.top(); -#endif } int GuiFontMetrics::descent(char_type c) const { QRect const & r = metrics_.boundingRect(ucs4_to_qchar(c)); - // Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y - // value by the height: (x, -y-height, width, height). - // Other versions return: (x, -y, width, height) -#if defined(Q_WS_WIN) && (QT_VERSION == 0x030201) - return r.bottom() + r.height() + 1; -#else return r.bottom() + 1; -#endif } -- 2.39.2