diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
| commit | 7c71ab86d1f7e387fc3df63b48df07231f111862 (patch) | |
| tree | 30ba2d2f840ff5fd458b6113e9c3f2e8a71d510d /lib/kotext/KoTextFormat.cpp | |
| parent | afbfdc507bfaafc8824a9808311d57a9ece87510 (diff) | |
| download | koffice-7c71ab86d1f7e387fc3df63b48df07231f111862.tar.gz koffice-7c71ab86d1f7e387fc3df63b48df07231f111862.zip | |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
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 |