diff options
Diffstat (limited to 'lib/kotext/KoTextFormat.cpp')
| -rw-r--r-- | lib/kotext/KoTextFormat.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 9b8e8869f..2554d4eea 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -1179,8 +1179,8 @@ TQFont KoTextFormat::smallCapsFont( const KoTextZoomHandler* zh, bool applyZoom int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const KoTextStringChar* c, const KoTextParag* parag, int i ) const { - ushort tqunicode = c->c.tqunicode(); - if ( !c->charStop || tqunicode == 0xad || tqunicode == 0x2028 ) + ushort unicode = c->c.unicode(); + if ( !c->charStop || unicode == 0xad || unicode == 0x2028 ) return 0; Q_ASSERT( !c->isCustom() ); // actually it's a bit stupid to call this for custom items if( c->isCustom() ) { @@ -1209,13 +1209,13 @@ int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const pixelww = this->screenFontMetrics( zh ).width( displayedChar( c->c ) ); } else { // Use the m_screenWidths[] array when possible, even faster - Q_ASSERT( tqunicode < 256 ); - pixelww = d->m_screenWidths[ tqunicode ]; + Q_ASSERT( unicode < 256 ); + pixelww = d->m_screenWidths[ unicode ]; // Not in cache yet -> calculate if ( pixelww == 0 ) { pixelww = this->screenFontMetrics( zh ).width( displayedChar( c->c ) ); Q_ASSERT( pixelww < 65535 ); - d->m_screenWidths[ tqunicode ] = pixelww; + d->m_screenWidths[ unicode ] = pixelww; } } } @@ -1319,7 +1319,7 @@ TQString KoTextFormat::displayedString( const TQString& str )const TQChar KoTextFormat::displayedChar( TQChar c )const { - if ( c.tqunicode() == 0xa0 ) // nbsp + if ( c.unicode() == 0xa0 ) // nbsp return ' '; switch ( m_attributeFont ) { case ATT_NONE: |