diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 89582ce810..3e786935fc 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2002-06-21 John Levon + + * qfont_metrics.C: fix variable names + 2002-06-21 John Levon * QWorkArea.C: remove dead splash code diff --git a/src/frontends/qt2/qfont_metrics.C b/src/frontends/qt2/qfont_metrics.C index 2b3cf1c8aa..721f14a1bc 100644 --- a/src/frontends/qt2/qfont_metrics.C +++ b/src/frontends/qt2/qfont_metrics.C @@ -113,11 +113,11 @@ void rectText(string const & str, LyXFont const & f, int & ascent, int & descent) { - QFontMetrics const & metrics(metrics(f)); + QFontMetrics const & m(metrics(f)); w = width(str, f); - ascent = metrics.ascent(); - descent = metrics.descent(); + ascent = m.ascent(); + descent = m.descent(); } @@ -127,13 +127,13 @@ void buttonText(string const & str, LyXFont const & f, int & ascent, int & descent) { - QFontMetrics const & metrics(metrics(f)); + QFontMetrics const & m(metrics(f)); static int const d = 3; w = width(str, f) + d * 2 + 2; - ascent = metrics.ascent() + d; - descent = metrics.descent() + d; + ascent = m.ascent() + d; + descent = m.descent() + d; } } // namespace font_metrics