1 files changed, 15 insertions, 15 deletions

diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp
index 4682c2cf..c7cd547a 100644
--- a/kword/KWTableStyleManager.cpp
+++ b/kword/KWTableStyleManager.cpp
@@ -39,7 +39,7 @@
 #include <tqgroupbox.h>
 #include <tqpainter.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqframe.h>
 
@@ -118,19 +118,19 @@ void KWTableStylePreview::drawContents( TQPainter *p )
     {
         // For centering to work, and to even get word wrapping when the thing is too big :)
         m_textdoc->setWidth( widthLU );
-        parag->invalidate(0);
+        parag->tqinvalidate(0);
     }
 
     parag->format();
     TQRect textRect = parag->pixelRect( m_zoomHandler );
 
-    // Center vertically, but not horizontally, to keep the parag alignment working,
+    // Center vertically, but not horizontally, to keep the parag tqalignment working,
     textRect.moveTopLeft( TQPoint( fr.x(), fr.y() + ( fr.height() - textRect.height() ) / 2 ) );
 
     p->setClipRect( textRect.intersect( fr ) );
     p->translate( textRect.x(), textRect.y() );
 
-    TQColorGroup cg = TQApplication::palette().active();
+    TQColorGroup cg = TQApplication::tqpalette().active();
     cg.setBrush( TQColorGroup::Base, tableStyle->frameStyle()->backgroundColor() );
 
     m_textdoc->drawWYSIWYG( p, 1, 0, textRect.width() - 1, textRect.height(), cg, m_zoomHandler );
@@ -145,7 +145,7 @@ void KWTableStylePreview::setTableStyle( KWTableStyle *_tableStyle )
     KoTextParag * parag = m_textdoc->firstParag();
     parag->applyStyle( tableStyle->paragraphStyle() );
 
-    repaint(true);
+    tqrepaint(true);
 }
 
 /******************************************************************/
@@ -275,35 +275,35 @@ void KWTableStyleManager::setupMain()
     mainLayout->setSpacing( KDialog::spacingHint() );
 
     preview = new KWTableStylePreview( i18n("Preview"), i18n("Tablestyles preview"), main );
-    preview->resize(preview->sizeHint());
+    preview->resize(preview->tqsizeHint());
 
     mainLayout->addMultiCellWidget( preview, 1, 1, 0, 1 );
 
     m_nameString = new TQLineEdit( main );
-    m_nameString->resize(m_nameString->sizeHint() );
+    m_nameString->resize(m_nameString->tqsizeHint() );
     connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) );
 
     mainLayout->addWidget( m_nameString, 0, 1 );
 
     TQLabel *nameLabel = new TQLabel( main );
     nameLabel->setText( i18n( "Name:" ) );
-    nameLabel->resize(nameLabel->sizeHint());
-    nameLabel->setAlignment( AlignRight | AlignVCenter );
+    nameLabel->resize(nameLabel->tqsizeHint());
+    nameLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     mainLayout->addWidget( nameLabel, 0, 0 );
 
     TQGroupBox *adjustBox = new TQGroupBox( 0, Qt::Vertical, i18n("Adjust"), main);
-    adjustBox->layout()->setSpacing(KDialog::spacingHint());
-    adjustBox->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *adjustLayout = new TQGridLayout( adjustBox->layout() );
+    adjustBox->tqlayout()->setSpacing(KDialog::spacingHint());
+    adjustBox->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *adjustLayout = new TQGridLayout( adjustBox->tqlayout() );
 
     TQLabel *frameStyleLabel = new TQLabel( adjustBox );
     frameStyleLabel->setText( i18n( "Framestyle:" ) );
-    frameStyleLabel->setAlignment( AlignRight | AlignVCenter );
+    frameStyleLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     TQLabel *styleLabel = new TQLabel( adjustBox );
     styleLabel->setText( i18n( "Textstyle:" ) );
-    styleLabel->setAlignment( AlignRight | AlignVCenter );
+    styleLabel->tqsetAlignment( AlignRight | AlignVCenter );
 
     m_frameStyle = new TQComboBox( adjustBox );
     m_style = new TQComboBox( adjustBox );
@@ -412,7 +412,7 @@ void KWTableStyleManager::addStyle()
     save();
     KWTableStyleCollection* collection = m_doc->tableStyleCollection();
 
-    TQString str = i18n( "New Tablestyle Template (%1)" ).arg(numTableStyles++);
+    TQString str = i18n( "New Tablestyle Template (%1)" ).tqarg(numTableStyles++);
     if ( m_currentTableStyle )
     {
         m_currentTableStyle = new KWTableStyle( *m_currentTableStyle );