diff options
Diffstat (limited to 'lib/kotext/KoTextFormat.cpp')
| -rw-r--r-- | lib/kotext/KoTextFormat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 7395a050..5a1570ac 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -1094,7 +1094,7 @@ float KoTextFormat::screenPointSize( const KoTextZoomHandler* zh ) const int pointSizeLU = KoTextZoomHandler::ptToLayoutUnitPt( pointSize() ); if ( vAlign() != KoTextFormat::AlignNormal ) pointSizeLU = (int)( pointSizeLU *relativeTextSize() ); - return zh->tqlayoutUnitToFontSize( pointSizeLU, false /* forPrint */ ); + return zh->layoutUnitToFontSize( pointSizeLU, false /* forPrint */ ); } float KoTextFormat::refPointSize() const @@ -1145,7 +1145,7 @@ const TQFontMetrics& KoTextFormat::screenFontMetrics( const KoTextZoomHandler* z { TQFont f = screenFont(zh); // don't move inside the if! - if ( !d->m_screenFontMetrics ) // not calculated, or tqinvalidated by screenFont above + if ( !d->m_screenFontMetrics ) // not calculated, or invalidated by screenFont above { //kdDebug(32500) << this << " KoTextFormat::screenFontMetrics pointSize=" << pointSize << " d->m_screenFont->pointSizeFloat()=" << d->m_screenFont->pointSizeFloat() << endl; d->m_screenFontMetrics = new TQFontMetrics( f ); @@ -1186,7 +1186,7 @@ int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const if( c->isCustom() ) { if( c->customItem()->placement() == KoTextCustomItem::PlaceInline ) { // customitem width is in LU pixels. Convert to 100%-zoom-pixels (pt2pt==pix2pix) - double w = KoTextZoomHandler::tqlayoutUnitPtToPt( c->customItem()->width ); + double w = KoTextZoomHandler::layoutUnitPtToPt( c->customItem()->width ); return tqRound( applyZoom ? ( w * zh->zoomFactorX() ) : w ); } else |