1 files changed, 48 insertions, 48 deletions

diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp
index 2d9cb423..ec5578ee 100644
--- a/kword/KWFrameDia.cpp
+++ b/kword/KWFrameDia.cpp
@@ -50,7 +50,7 @@
 #include <tqbuttongroup.h>
 #include <tqhbox.h>
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <stdlib.h>
 #include <limits.h>
@@ -67,7 +67,7 @@ void KWBrushStylePreview::drawContents( TQPainter* painter )
 {
     painter->save();
     painter->translate( contentsRect().x(), contentsRect().y() );
-    painter->fillRect( contentsRect(), tqcolorGroup().base() ); // in case of a transparent brush
+    painter->fillRect( contentsRect(), colorGroup().base() ); // in case of a transparent brush
     painter->fillRect( contentsRect(), brush );
     painter->restore();
 }
@@ -102,7 +102,7 @@ KWFrameDia::KWFrameDia( TQWidget* parent, KWFrame *frame)
         kdDebug() << "ERROR: KWFrameDia::constructor no frame.."<<endl;
         return;
     }
-    setCaption( i18n( "Frame Properties for %1" ).tqarg( m_frame->frameSet()->name() ) );
+    setCaption( i18n( "Frame Properties for %1" ).arg( m_frame->frameSet()->name() ) );
     KWFrameSet *fs = m_frame->frameSet()->groupmanager();
     if(fs==0L) fs=m_frame->frameSet();
     m_frameType = fs->type();
@@ -149,7 +149,7 @@ KWFrameDia::KWFrameDia( TQWidget *parent, TQPtrList<KWFrame> listOfFrames) : KDi
         return;
     }
     if ( listOfFrames.count() == 1 )
-        setCaption( i18n( "Frame Settings for %1" ).tqarg( f->frameSet()->name() ) );
+        setCaption( i18n( "Frame Settings for %1" ).arg( f->frameSet()->name() ) );
 
     KWFrameSet *fs = f->frameSet()->groupmanager();
     if(fs==0L) fs=f->frameSet();
@@ -518,14 +518,14 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options
         m_grid1->addWidget(m_sideHeads, row, 0);
 
         m_sideGrid = new TQGridLayout( m_sideHeads, 4, 2, KDialog::marginHint(), KDialog::spacingHint() );
-        sideTitle1 = new TQLabel ( i18n("Size (%1):").tqarg(m_doc->unitName()),m_sideHeads);
-        sideTitle1->resize(sideTitle1->tqsizeHint());
+        sideTitle1 = new TQLabel ( i18n("Size (%1):").arg(m_doc->unitName()),m_sideHeads);
+        sideTitle1->resize(sideTitle1->sizeHint());
         m_sideGrid->addWidget(sideTitle1,1,0);
         m_sideWidth= new TQLineEdit(m_sideHeads,"");
         m_sideWidth->setMaxLength(6);
         m_sideGrid->addWidget(m_sideWidth,1,1);
-        sideTitle2 = new TQLabel( i18n("Gap size (%1):").tqarg(m_doc->unitName()),m_sideHeads);
-        sideTitle2->resize(sideTitle2->tqsizeHint());
+        sideTitle2 = new TQLabel( i18n("Gap size (%1):").arg(m_doc->unitName()),m_sideHeads);
+        sideTitle2->resize(sideTitle2->sizeHint());
         m_sideGrid->addWidget(sideTitle2,2,0);
         m_sideGap = new TQLineEdit(m_sideHeads,"");
         m_sideGap->setMaxLength(6);
@@ -536,7 +536,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options
         m_sideAlign->insertItem ( i18n("Right"));
         m_sideAlign->insertItem ( i18n("Closest to Binding"));
         m_sideAlign->insertItem ( i18n("Closest to Page Edge"));
-        m_sideAlign->resize(m_sideAlign->tqsizeHint());
+        m_sideAlign->resize(m_sideAlign->sizeHint());
         m_sideGrid->addMultiCellWidget(m_sideAlign,3,3,0,1);
         m_sideGrid->addRowSpacing( 0, KDialog::marginHint() + 5 );
 
@@ -614,9 +614,9 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround
     // First groupbox
     m_runGroup = new TQButtonGroup(  i18n( "Layout of Text in Other Frames" ), m_tab2);
     m_runGroup->setColumnLayout( 0, Qt::Vertical );
-    m_runGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
-    TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->tqlayout() );
-    groupBox1Layout->tqsetAlignment( TQt::AlignTop );
+    m_runGroup->layout()->setSpacing( KDialog::spacingHint() );
+    TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->layout() );
+    groupBox1Layout->setAlignment( TQt::AlignTop );
 
     m_rRunNo = new TQRadioButton( i18n( "Text will run &through this frame" ), m_runGroup );
     groupBox1Layout->addWidget( m_rRunNo, 0, 1 );
@@ -650,10 +650,10 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround
     // Second groupbox
     m_runSideGroup = new TQButtonGroup(  i18n( "Run Around Side" ), m_tab2);
     m_runSideGroup->setColumnLayout( 0, Qt::Vertical );
-    m_runSideGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
-    m_runSideGroup->tqlayout()->setMargin( KDialog::marginHint() );
-    TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->tqlayout() );
-    runSideLayout->tqsetAlignment( TQt::AlignTop );
+    m_runSideGroup->layout()->setSpacing( KDialog::spacingHint() );
+    m_runSideGroup->layout()->setMargin( KDialog::marginHint() );
+    TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->layout() );
+    runSideLayout->setAlignment( TQt::AlignTop );
 
     m_rRunLeft = new TQRadioButton( i18n( "Run Around", "&Left" ), m_runSideGroup );
     runSideLayout->addWidget( m_rRunLeft, 0, 0 /*1*/ );
@@ -803,9 +803,9 @@ void KWFrameDia::setupTab3(){ // TAB Frameset
     myGroup->insert(m_rExistingFrameset,1);
     connect (m_rExistingFrameset, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(ensureValidFramesetSelected()));
 
-    TQHBoxLayout *tqlayout2 = new TQHBoxLayout( 0, 0, 6);
+    TQHBoxLayout *layout2 = new TQHBoxLayout( 0, 0, 6);
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    tqlayout2->addItem( spacer );
+    layout2->addItem( spacer );
 
     m_lFrameSList = new TQListView( m_tab3, "m_lFrameSList" );
     m_lFrameSList->addColumn( i18n("No.") );
@@ -815,8 +815,8 @@ void KWFrameDia::setupTab3(){ // TAB Frameset
     connect( m_lFrameSList, TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(selectExistingFrameset ()) );
     connect (m_lFrameSList, TQT_SIGNAL( selectionChanged()), this, TQT_SLOT(ensureValidFramesetSelected()));
 
-    tqlayout2->addWidget( m_lFrameSList );
-    tabLayout->addLayout( tqlayout2 );
+    layout2->addWidget( m_lFrameSList );
+    tabLayout->addLayout( layout2 );
 
     m_rNewFrameset = new TQRadioButton( m_tab3);
     m_rNewFrameset->setText( i18n( "Create a new frameset" ) );
@@ -829,14 +829,14 @@ void KWFrameDia::setupTab3(){ // TAB Frameset
     line1->setFrameShape( TQFrame::HLine );
     tabLayout->addWidget( line1 );
 
-    TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 );
+    TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6 );
     TQLabel *textLabel1 = new TQLabel( m_tab3 );
     textLabel1->setText( i18n( "Name of frameset:" ) );
-    tqlayout1->addWidget( textLabel1 );
+    layout1->addWidget( textLabel1 );
 
     m_eFrameSetName = new TQLineEdit( m_tab3 );
-    tqlayout1->addWidget( m_eFrameSetName );
-    tabLayout->addLayout( tqlayout1 );
+    layout1->addWidget( m_eFrameSetName );
+    tabLayout->addLayout( layout1 );
 
     int amount=0;
     // now fill the gui.
@@ -853,7 +853,7 @@ void KWFrameDia::setupTab3(){ // TAB Frameset
         if ( fs->isDeleted() )
             continue;
         TQListViewItem *item = new TQListViewItem( m_lFrameSList );
-        item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) );
+        item->setText( 0, TQString( "%1" ).arg( i + 1 ) );
         item->setText( 1, fs->name() );
         amount++;
         if( m_frame && m_frame->frameSet() == fs ) {
@@ -961,43 +961,43 @@ void KWFrameDia::setupTab4() { // TAB Geometry
     TQGridLayout* pGrid = new TQGridLayout( m_grp1, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
     m_lx = new TQLabel( i18n( "Left:" ), m_grp1 );
-    m_lx->resize( m_lx->tqsizeHint() );
+    m_lx->resize( m_lx->sizeHint() );
     pGrid->addWidget( m_lx, 1, 0 );
 
     m_sx = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    m_sx->resize( m_sx->tqsizeHint() );
+    m_sx->resize( m_sx->sizeHint() );
     pGrid->addWidget( m_sx, 1, 1 );
 
     m_ly = new TQLabel( i18n( "Top:" ), m_grp1 );
-    m_ly->resize( m_ly->tqsizeHint() );
+    m_ly->resize( m_ly->sizeHint() );
     pGrid->addWidget( m_ly, 1, 2 );
 
     m_sy = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() );
-    m_sy->resize( m_sy->tqsizeHint() );
+    m_sy->resize( m_sy->sizeHint() );
     pGrid->addWidget( m_sy, 1, 3 );
 
     m_lw = new TQLabel( i18n( "Width:" ), m_grp1 );
-    m_lw->resize( m_lw->tqsizeHint() );
+    m_lw->resize( m_lw->sizeHint() );
     pGrid->addWidget( m_lw, 2, 0 );
 
     m_sw = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    m_sw->resize( m_sw->tqsizeHint() );
+    m_sw->resize( m_sw->sizeHint() );
     connect( m_sw, TQT_SIGNAL(valueChanged(double)),
              this, TQT_SLOT(slotUpdateHeightForWidth(double)) );
 
     pGrid->addWidget( m_sw, 2, 1 );
 
     m_lh = new TQLabel( i18n( "Height:" ), m_grp1 );
-    m_lh->resize( m_lh->tqsizeHint() );
+    m_lh->resize( m_lh->sizeHint() );
     pGrid->addWidget( m_lh, 2, 2 );
 
     m_sh = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() );
     connect( m_sh, TQT_SIGNAL(valueChanged(double)),
              this, TQT_SLOT(slotUpdateWidthForHeight(double)) );
 
-    m_sh->resize( m_sh->tqsizeHint() );
+    m_sh->resize( m_sh->sizeHint() );
 
     pGrid->addWidget( m_sh, 2, 3 );
 
@@ -1290,10 +1290,10 @@ void KWFrameDia::setupTab6() // Border style
 
     TQGroupBox *grp=new TQGroupBox( 0, Qt::Vertical, i18n( "Preview" ), m_tab6, "previewgrp" );
     grid->addMultiCellWidget( grp , 0, 7, 1, 1 );
-    grp->tqlayout()->setSpacing(KDialog::spacingHint());
-    grp->tqlayout()->setMargin(KDialog::marginHint());
+    grp->layout()->setSpacing(KDialog::spacingHint());
+    grp->layout()->setMargin(KDialog::marginHint());
     m_prev3 = new KoBorderPreview( grp );
-    TQVBoxLayout *lay1 = new TQVBoxLayout( grp->tqlayout() );
+    TQVBoxLayout *lay1 = new TQVBoxLayout( grp->layout() );
     lay1->addWidget(m_prev3);
 
     connect( m_prev3, TQT_SIGNAL( choosearea(TQMouseEvent * ) ),
@@ -1627,7 +1627,7 @@ void KWFrameDia::updateBrushPreview()
     } else {
         brushPreview->show();
         brushPreview->setBrush(frameBrushStyle());
-        brushPreview->tqrepaint(true);
+        brushPreview->repaint(true);
     }
 }
 #endif
@@ -1857,11 +1857,11 @@ bool KWFrameDia::applyChanges()
                                             i18n( "A new frameset with the name '%1' "
                                                   "can not be made because a frameset with that name "
                                                   "already exists. Please enter another name or select "
-                                                  "an existing frameset from the list.").tqarg(name));
+                                                  "an existing frameset from the list.").arg(name));
                     else
                         KMessageBox::sorry( this,
                                             i18n( "A frameset with the name '%1' "
-                                                  "already exists. Please enter another name." ).tqarg(name) );
+                                                  "already exists. Please enter another name." ).arg(name) );
                     m_eFrameSetName->setText(m_oldFrameSetName);
                     return false;
                 }
@@ -2330,7 +2330,7 @@ bool KWFrameDia::applyChanges()
 void KWFrameDia::updateFrames()
 {
     m_doc->updateAllFrames();
-    m_doc->tqlayout();
+    m_doc->layout();
     m_doc->repaintAllViews();
 }
 
@@ -2374,7 +2374,7 @@ bool KWFrameDia::mayDeleteFrameSet(KWTextFrameSet *fs) {
            i18n( "You are about to reconnect the last frame of the "
            "frameset '%1'. "
            "The contents of this frameset will be deleted.\n"
-           "Are you sure you want to do that?").tqarg(fs->name()),
+           "Are you sure you want to do that?").arg(fs->name()),
            i18n("Reconnect Frame"), i18n("&Reconnect"));
         if (result != KMessageBox::Continue)
             return false;
@@ -2397,7 +2397,7 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString&
     mGrid->addMultiCellWidget( m_synchronize, 1, 1, 0, 1 );
 
     TQLabel* lml = new TQLabel( i18n( "Left:" ), grp2 );
-    //lml->resize( lml->tqsizeHint() );
+    //lml->resize( lml->sizeHint() );
     mGrid->addWidget( lml, 2, 0 );
 
     m_inputLeft = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() );
@@ -2405,31 +2405,31 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString&
     mGrid->addWidget( m_inputLeft, 2, 1 );
 
     TQLabel* lmt = new TQLabel( i18n( "Top:" ), grp2 );
-    //lmt->resize( lmt->tqsizeHint() );
+    //lmt->resize( lmt->sizeHint() );
     mGrid->addWidget( lmt, 2, 2 );
 
     m_inputTop = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    //m_inputTop->resize( m_inputTop->tqsizeHint() );
+    //m_inputTop->resize( m_inputTop->sizeHint() );
 
     mGrid->addWidget( m_inputTop, 2, 3 );
 
     TQLabel* lmr = new TQLabel( i18n( "Right:" ), grp2 );
-    //lmr->resize( lmr->tqsizeHint() );
+    //lmr->resize( lmr->sizeHint() );
     mGrid->addWidget( lmr, 3, 0 );
 
     m_inputRight = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    //m_inputRight->resize( m_inputRight->tqsizeHint() );
+    //m_inputRight->resize( m_inputRight->sizeHint() );
     mGrid->addWidget( m_inputRight, 3, 1 );
 
     TQLabel* lmb = new TQLabel( i18n( "Bottom:" ), grp2 );
-    //lmb->resize( lmb->tqsizeHint() );
+    //lmb->resize( lmb->sizeHint() );
     mGrid->addWidget( lmb, 3, 2 );
 
     m_inputBottom = new KoUnitDoubleSpinBox( grp2, 0, 9999, 1, 0.0, m_doc->unit() );
 
-    //m_inputBottom->resize( m_inputBottom->tqsizeHint() );
+    //m_inputBottom->resize( m_inputBottom->sizeHint() );
     mGrid->addWidget( m_inputBottom, 3, 3 );
     mGrid->setRowSpacing( 0, KDialog::spacingHint() + 5 );