diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /khtml/rendering/font.cpp | |
parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
download | tdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/font.cpp')
-rw-r--r-- | khtml/rendering/font.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp index a33f0e082..18e0e57f0 100644 --- a/khtml/rendering/font.cpp +++ b/khtml/rendering/font.cpp @@ -170,7 +170,7 @@ void Font::drawText( TQPainter *p, int x, int y, TQChar *str, int slen, int pos, // and stored. In the second, the actual characters are drawn. // For each letter in the text box, save the width of the character. - // When word-wise, only the first letter contains the width, but of the + // When word-wise, only the first letter tqcontains the width, but of the // whole word. short* const widthList = (short *)alloca(to*sizeof(short)); @@ -293,7 +293,7 @@ int Font::width( TQChar *chs, int, int pos, int len, int start, int end, int toA const TQString qstr = cstr.string(); if ( scFont ) { const TQString upper = qstr.upper(); - const TQChar *uc = qstr.unicode(); + const TQChar *uc = qstr.tqunicode(); const TQFontMetrics sc_fm( *scFont ); for ( int i = 0; i < len; ++i ) { if ( (uc+i)->category() == TQChar::Letter_Lowercase ) @@ -431,7 +431,7 @@ void Font::update( TQPaintDeviceMetrics* devMetrics ) const if( !isFontScalable(db, f) ) { const TQValueList<int>& pointSizes = (*scalSizesCache)[ScalKey(f)]; - // lets see if we find a nice looking font, which is not too far away + // lets see if we tqfind a nice looking font, which is not too far away // from the requested one. // kdDebug(6080) << "khtml::setFontSize family = " << f.family() << " size requested=" << size << endl; |