1 files changed, 19 insertions, 19 deletions

diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index 13c48350..1d424b27 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -129,7 +129,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp
     grid->addWidget( spnStart, 2, 2);
 
     lAlignment = new TQLabel( gStyle, "lAlignment" );
-    lAlignment->setText( i18n( "Counter tqalignment:" ) );
+    lAlignment->setText( i18n( "Counter alignment:" ) );
     grid->addWidget( lAlignment, 2, 3 );
 
     cbAlignment = new KComboBox( gStyle, "cbAlignment" );
@@ -296,11 +296,11 @@ void KoCounterStyleWidget::displayStyle( KoParagCounter::Style style )
     spnStart->setValue( m_counter.startNumber() );
 
     cbRestart->setChecked( m_counter.restartCounter() );
-    if(m_counter.tqalignment()==TQt::AlignLeft)
+    if(m_counter.alignment()==TQt::AlignLeft)
         cbAlignment->setCurrentText(i18n("Align Left"));
-    else if(m_counter.tqalignment()==TQt::AlignRight)
+    else if(m_counter.alignment()==TQt::AlignRight)
         cbAlignment->setCurrentText(i18n("Align Right"));
-    else if(m_counter.tqalignment()==TQt::AlignAuto)
+    else if(m_counter.alignment()==TQt::AlignAuto)
         cbAlignment->setCurrentText(i18n("Align Auto"));
     else
         kdError()<<"Not Implemented"<<endl;
@@ -812,14 +812,14 @@ void KoStylePreview::setCounter( const KoParagCounter & counter )
 {
     KoTextParag * parag = m_textdoc->firstParag();
     parag->setCounter( counter );
-    tqrepaint( true );
+    repaint( true );
 }
 
 void KoStylePreview::setStyle( KoParagStyle * style )
 {
     KoTextParag * parag = m_textdoc->firstParag();
     parag->applyStyle( style );
-    tqrepaint(true);
+    repaint(true);
 }
 
 void KoStylePreview::drawContents( TQPainter *painter )
@@ -839,13 +839,13 @@ void KoStylePreview::drawContents( TQPainter *painter )
     {
         // For centering to work, and to even get word wrapping when the thing is too big :)
         m_textdoc->setWidth( widthLU );
-        parag->tqinvalidate(0);
+        parag->invalidate(0);
     }
 
     parag->format();
     TQRect textRect = parag->pixelRect( m_zoomHandler );
 
-    // Center vertically, but not horizontally, to keep the parag tqalignment working,
+    // Center vertically, but not horizontally, to keep the parag alignment working,
     textRect.moveTopLeft( TQPoint( whiteRect.x(),
                                   whiteRect.y() + ( whiteRect.height() - textRect.height() ) / 2 ) );
     // Move it from the left border a little
@@ -879,8 +879,8 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
         frameWidth=9999;
     } else {
         length=i18n("Frame width: %1 %2")
-		.tqarg(KoUnit::toUserStringValue(frameWidth,m_unit))
-		.tqarg(KoUnit::unitName(m_unit));
+		.arg(KoUnit::toUserStringValue(frameWidth,m_unit))
+		.arg(KoUnit::unitName(m_unit));
         frameWidth=KoUnit::toUserValue(frameWidth,m_unit);
     }
 
@@ -938,9 +938,9 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     cSpacing->insertItem( i18n( "Line spacing value", "1.5 Lines" ) );
     cSpacing->insertItem( i18n( "Line spacing value", "Double" ) );
     cSpacing->insertItem( i18n( "Proportional") ); // LS_MULTIPLE, called Proportional like in OO
-    cSpacing->insertItem( i18n( "Line Distance (%1)" ).tqarg(unitName) ); // LS_CUSTOM
-    cSpacing->insertItem( i18n( "At Least (%1)" ).tqarg(unitName) );
-    cSpacing->insertItem( i18n( "Fixed (%1)").tqarg(unitName) ); // LS_FIXED
+    cSpacing->insertItem( i18n( "Line Distance (%1)" ).arg(unitName) ); // LS_CUSTOM
+    cSpacing->insertItem( i18n( "At Least (%1)" ).arg(unitName) );
+    cSpacing->insertItem( i18n( "Fixed (%1)").arg(unitName) ); // LS_FIXED
 
     connect( cSpacing, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( spacingActivated( int ) ) );
     spacingGrid->addWidget( cSpacing, 1, 0 );
@@ -1273,7 +1273,7 @@ int KoParagAlignWidget::pageBreaking() const
 
 void KoParagAlignWidget::display( const KoParagLayout & lay )
 {
-    int align = lay.tqalignment;
+    int align = lay.alignment;
     prev2->setAlign( align );
 
     clearAligns();
@@ -1302,7 +1302,7 @@ void KoParagAlignWidget::display( const KoParagLayout & lay )
 
 void KoParagAlignWidget::save( KoParagLayout & lay )
 {
-    lay.tqalignment = align();
+    lay.alignment = align();
     lay.pageBreaking = pageBreaking();
 }
 
@@ -1705,7 +1705,7 @@ void KoParagCounterWidget::display( const KoParagLayout & lay ) {
 
 void KoParagCounterWidget::updatePreview() {
     preview->setCounter(m_counter);
-    preview->tqrepaint(true);
+    preview->repaint(true);
 }
 
 void KoParagCounterWidget::save( KoParagLayout & lay ) {
@@ -1746,8 +1746,8 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     } else {
         m_toplimit=frameWidth;
         length=i18n("Frame width: %1 %2")
-		.tqarg(KoUnit::toUserStringValue(frameWidth,m_unit))
-		.tqarg(KoUnit::unitName(m_unit));
+		.arg(KoUnit::toUserStringValue(frameWidth,m_unit))
+		.arg(KoUnit::unitName(m_unit));
         frameWidth=KoUnit::toUserValue(frameWidth,m_unit);
     }
     TQVBoxLayout* Form1Layout = new TQVBoxLayout( this );
@@ -2272,7 +2272,7 @@ KoParagLayout KoParagDia::paragLayout() const
     newLayout.setLineSpacingValue( lineSpacing() );
     newLayout.lineSpacingType = lineSpacingType();
     newLayout.setTabList( tabListTabulator() );
-    newLayout.tqalignment = align();
+    newLayout.alignment = align();
     newLayout.margins[TQStyleSheetItem::MarginFirstLine] = firstLineIndent();
     newLayout.margins[TQStyleSheetItem::MarginLeft] = leftIndent();
     newLayout.margins[TQStyleSheetItem::MarginRight] = rightIndent();