From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kate/part/katefont.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kate/part/katefont.cpp') diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp index efab0268c..361ce5cce 100644 --- a/kate/part/katefont.cpp +++ b/kate/part/katefont.cpp @@ -23,13 +23,13 @@ #include -#include +#include // // KateFontMetrics implementation // -KateFontMetrics::KateFontMetrics(const QFont& f) : QFontMetrics(f) +KateFontMetrics::KateFontMetrics(const TQFont& f) : TQFontMetrics(f) { for (int i=0; i<256; i++) warray[i]=0; } @@ -49,7 +49,7 @@ short * KateFontMetrics::createRow (short *wa, uchar row) return wa; } -int KateFontMetrics::width(QChar c) +int KateFontMetrics::width(TQChar c) { uchar cell=c.cell(); uchar row=c.row(); @@ -58,7 +58,7 @@ int KateFontMetrics::width(QChar c) if (!wa) wa = createRow (wa, row); - if (wa[cell]<0) wa[cell]=(short) QFontMetrics::width(c); + if (wa[cell]<0) wa[cell]=(short) TQFontMetrics::width(c); return (int)wa[cell]; } @@ -93,12 +93,12 @@ void KateFontStruct::updateFontData () fontHeight = maxAscent + maxDescent + 1; fontAscent = maxAscent; - m_fixedPitch = QFontInfo( myFont ).fixedPitch(); + m_fixedPitch = TQFontInfo( myFont ).fixedPitch(); } -void KateFontStruct::setFont (const QFont & font) +void KateFontStruct::setFont (const TQFont & font) { - QFontMetrics testFM (font); + TQFontMetrics testFM (font); // no valid font tried if ((testFM.ascent() + testFM.descent() + 1) < 1) @@ -106,13 +106,13 @@ void KateFontStruct::setFont (const QFont & font) myFont = font; - myFontBold = QFont (font); + myFontBold = TQFont (font); myFontBold.setBold (true); - myFontItalic = QFont (font); + myFontItalic = TQFont (font); myFontItalic.setItalic (true); - myFontBI = QFont (font); + myFontBI = TQFont (font); myFontBI.setBold (true); myFontBI.setItalic (true); -- cgit v1.2.1