diff options
Diffstat (limited to 'lib/kotext/KoTextFormatter.cpp')
| -rw-r--r-- | lib/kotext/KoTextFormatter.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp index 7bdfbc0c..552bcf27 100644 --- a/lib/kotext/KoTextFormatter.cpp +++ b/lib/kotext/KoTextFormatter.cpp @@ -131,8 +131,8 @@ int KoTextFormatterCore::leftMargin( bool firstLine, bool includeFirstLineMargin left += parag->firstLineMargin(); // Add the width of the paragraph counter - first line of parag only. if( parag->counter() && - ( parag->counter()->tqalignment() == TQt::AlignLeft || - parag->counter()->tqalignment() == TQt::AlignAuto ) ) + ( parag->counter()->alignment() == TQt::AlignLeft || + parag->counter()->alignment() == TQt::AlignAuto ) ) left += parag->counterWidth(); // in LU pixels } return left; @@ -196,7 +196,7 @@ bool KoTextFormatterCore::format() // but with counters/margins this might be different). This is why // we call determineCharWidth() again from within the loop. TQPair<int, int> widths = determineCharWidth(); - int ww = widths.first; // width in tqlayout units + int ww = widths.first; // width in layout units #ifndef REF_IS_LU int pixelww = widths.second; // width in pixels #endif @@ -251,9 +251,9 @@ bool KoTextFormatterCore::format() bool lastWasNonInlineCustom = FALSE; bool abort = false; - int align = parag->tqalignment(); - if ( align == TQt::AlignAuto && doc && doc->tqalignment() != TQt::AlignAuto ) - align = doc->tqalignment(); + int align = parag->alignment(); + if ( align == TQt::AlignAuto && doc && doc->alignment() != TQt::AlignAuto ) + align = doc->alignment(); int col = 0; @@ -516,11 +516,11 @@ bool KoTextFormatterCore::format() spaceAfterLine -= c->width; //else - if ( c->c.tqunicode() == 0xad || hyphenated ) // soft hyphen or hyphenation + if ( c->c.unicode() == 0xad || hyphenated ) // soft hyphen or hyphenation { // Recalculate its width, the hyphen will appear finally (important for the parag rect) int width = KoTextZoomHandler::ptToLayoutUnitPt( c->format()->refFontMetrics().width( TQChar(0xad) ) ); - if ( c->c.tqunicode() == 0xad ) + if ( c->c.unicode() == 0xad ) c->width = width; spaceAfterLine -= width; } @@ -810,7 +810,7 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine( if (space < 0) space = 0; - // do tqalignment Auto == Left in this case + // do alignment Auto == Left in this case if ( align & TQt::AlignHCenter || align & TQt::AlignRight ) { if ( align & TQt::AlignHCenter ) space /= 2; @@ -934,7 +934,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( str.setUnicode( 0, last - start + 1 ); // fill string with logically ordered chars. KoTextStringChar *ch = startChar; - TQChar *qch = (TQChar *)str.tqunicode(); + TQChar *qch = (TQChar *)str.unicode(); while ( ch <= lastChar ) { *qch = ch->c; qch++; @@ -949,7 +949,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( // now construct the reordered string out of the runs... int numSpaces = 0; - // set the correct tqalignment. This is a bit messy.... + // set the correct alignment. This is a bit messy.... if( align == TQt::AlignAuto ) { // align according to directionality of the paragraph... if ( text->isRightToLeft() ) |