Rename a number of old tq methods that are no longer tq specific

1 files changed, 86 insertions, 86 deletions

diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 4ec739eb..785a57de 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -119,10 +119,10 @@
 #include <tdeversion.h>
 #include <kiconloader.h>
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqapplication.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqprogressdialog.h>
 #include <tqregexp.h>
@@ -288,27 +288,27 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW
     if ( KStatusBar* sb = statusBar() ) // No statusbar in e.g. konqueror
     {
         m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter );
+        m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbPageLabel, 0 );
 
         m_sbModifiedLabel = new KStatusBarLabel( "   ", 0, sb );
-        m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter );
+        m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbModifiedLabel, 0 );
 
         m_sbFramesLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbFramesLabel->tqsetAlignment( AlignLeft | AlignVCenter );
+        m_sbFramesLabel->setAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbFramesLabel, 1 );
 
         m_sbOverwriteLabel = new KStatusBarLabel( ' ' + i18n( "INSRT" ) + ' ', 0, sb );
-        m_sbOverwriteLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
+        m_sbOverwriteLabel->setAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbOverwriteLabel, 0 );
 
         m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_doc->zoom() ) + "% ", 0, sb );
-        m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
+        m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbZoomLabel, 0 );
 
         m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_doc->unit() ) + ' ', 0, sb );
-        m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
+        m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbUnitLabel, 0 );
     }
 
@@ -339,7 +339,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW
     connect( frameViewManager(), TQT_SIGNAL(sigFrameSetRenamed()),
              TQT_TQOBJECT(this), TQT_SLOT( updateFrameStatusBarItem()));
 
-    connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
              TQT_TQOBJECT(this), TQT_SLOT( clipboardDataChanged() ) );
 
     connect( m_gui->canvasWidget(), TQT_SIGNAL(currentFrameSetEditChanged()),
@@ -404,7 +404,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW
 
     // Determine initial scroll position
     // We do this delayed, so that the GUI has been fully constructed
-    // (and e.g. the statusbar can tqrepaint).
+    // (and e.g. the statusbar can repaint).
     TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetInitialPosition() ) );
     TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) );
 }
@@ -640,7 +640,7 @@ void KWView::setupActions()
                                                   TQT_TQOBJECT(this), TQT_SLOT( viewTextMode() ),
                                                   actionCollection(), "view_textmode" );
         m_actionViewTextMode->setToolTip( i18n( "Only show the text of the document." ) );
-        m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or tqlayout. KWord will display only the text for editing." ) );
+        m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or layout. KWord will display only the text for editing." ) );
 
         m_actionViewTextMode->setExclusiveGroup( "viewmodes" );
         m_actionViewPageMode = new KToggleAction( i18n( "&Page Mode" ), 0,
@@ -1000,7 +1000,7 @@ void KWView::setupActions()
         // This approach allows to edit toolbars and extract separate actions from this menu
         KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/
                                                 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ),
-                                                actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() );
+                                                actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() );
         act->setExclusiveGroup( "counterstyle" );
         // Add to the right menu: both for "none", bullet for bullets, numbers otherwise
         if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) {
@@ -1491,7 +1491,7 @@ void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& f
                             TQString text = i18n( e2.namedItem( "Text" ).toElement().text().utf8() );
                             KAction * act = new KAction( text, 0, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ),
                                                          actionCollection(),
-                                                         TQString("expression-action_%1").tqarg(i).latin1() );
+                                                         TQString("expression-action_%1").arg(i).latin1() );
                             if ( personalShortCut.contains(text) )
                                 act->setShortcut( personalShortCut[text] );
                             i++;
@@ -1542,7 +1542,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts,
             KAction * act = new KAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ),
                                          actionCollection(), actionName );
             // Mainly for KEditToolbar
-            act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).tqarg( *it ) );
+            act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).arg( *it ) );
             m_variableDefMap.insert( act, v );
             parentMenu->insert( act );
         }
@@ -1583,7 +1583,7 @@ void KWView::refreshCustomMenu()
             if ( !lst.contains( varName) )
             {
                  lst.append( varName );
-                 TQCString name = TQString("custom-action_%1").tqarg(i).latin1();
+                 TQCString name = TQString("custom-action_%1").arg(i).latin1();
                  act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ),actionCollection(), name );
                  act->setGroup( "custom-variable-action" );
                  m_actionInsertCustom->insert( act );
@@ -1595,7 +1595,7 @@ void KWView::refreshCustomMenu()
     if(state)
         m_actionInsertCustom->popupMenu()->insertSeparator();
 
-    act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").tqarg(i).latin1());
+    act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1());
     act->setGroup( "custom-variable-action" );
 
 
@@ -1653,15 +1653,15 @@ void KWView::updatePageInfo()
         TQString oldText = m_sbPageLabel->text();
         TQString newText;
         if ( viewMode()->hasPages() )
-            newText = ' ' + i18n( "Page %1 of %2" ).tqarg(m_currentPage->pageNumber())
-                .tqarg(m_doc->pageCount()) + ' ';
+            newText = ' ' + i18n( "Page %1 of %2" ).arg(m_currentPage->pageNumber())
+                .arg(m_doc->pageCount()) + ' ';
 
         if ( newText != oldText )
         {
             m_sbPageLabel->setText( newText );
-            // Need to tqrepaint immediately. Otherwise when deleting 100 pages
+            // Need to repaint immediately. Otherwise when deleting 100 pages
             // at once, there's no feedback.
-            m_sbPageLabel->tqrepaint();
+            m_sbPageLabel->repaint();
         }
     }
     slotUpdateRuler();
@@ -1688,16 +1688,16 @@ void KWView::updateFrameStatusBarItem()
             TQString unitName = m_doc->unitName();
             KWFrame * frame = frameViewManager()->selectedFrames()[0]->frame();
             m_sbFramesLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" )
-                    .tqarg( frame->frameSet()->name() )
-                    .tqarg( KoUnit::toUserStringValue( frame->left(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage(
+                    .arg( frame->frameSet()->name() )
+                    .arg( KoUnit::toUserStringValue( frame->left(), unit ) )
+                    .arg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage(
                                 m_doc->pageManager()->pageNumber(frame->rect()) ), unit) )
-                    .tqarg( KoUnit::toUserStringValue( frame->right(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( frame->bottom(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( frame->width(), unit ) )
-                    .tqarg( KoUnit::toUserStringValue( frame->height(), unit ) ) );
+                    .arg( KoUnit::toUserStringValue( frame->right(), unit ) )
+                    .arg( KoUnit::toUserStringValue( frame->bottom(), unit ) )
+                    .arg( KoUnit::toUserStringValue( frame->width(), unit ) )
+                    .arg( KoUnit::toUserStringValue( frame->height(), unit ) ) );
         } else
-            m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).tqarg( nbFrame ) );
+            m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).arg( nbFrame ) );
     }
     else if ( sb && m_sbFramesLabel )
         m_sbFramesLabel->setText( TQString() );
@@ -1718,12 +1718,12 @@ void KWView::clipboardDataChanged()
     }
     KWFrameSetEdit * edit = m_gui->canvasWidget()->currentFrameSetEdit();
     // Is there plain text in the clipboard ?
-    if ( edit && !TQApplication::tqclipboard()->text().isEmpty() )
+    if ( edit && !TQApplication::clipboard()->text().isEmpty() )
     {
         m_actionEditPaste->setEnabled(true);
         return;
     }
-    TQMimeSource *data = TQApplication::tqclipboard()->data();
+    TQMimeSource *data = TQApplication::clipboard()->data();
     const int provides = checkClipboard( data );
     if ( provides & ( ProvidesImage | ProvidesOasis | ProvidesFormula ) )
         m_actionEditPaste->setEnabled( true );
@@ -1789,7 +1789,7 @@ void KWView::print( KPrinter &prt )
         m_doc->recalcVariables(  VT_ALL );
     }
 
-// Don't tqrepaint behind the print dialog until we're done zooming/unzooming the doc
+// Don't repaint behind the print dialog until we're done zooming/unzooming the doc
     m_gui->canvasWidget()->setUpdatesEnabled(false);
     m_gui->canvasWidget()->viewport()->setCursor( waitCursor );
 
@@ -1938,7 +1938,7 @@ void KWView::print( KPrinter &prt )
         m_doc->variableCollection()->recalcVariables(VT_MAILMERGE);
 
     painter.end(); // this is what triggers the printing
-    m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime());
+    m_doc->variableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime());
     m_doc->recalcVariables( VT_DATE );
 }
 
@@ -2365,7 +2365,7 @@ void KWView::editCut()
         edit->cut();
     else {
         TQDragObject *drag = m_doc->dragSelected( frameViewManager()->selectedFrames() );
-        TQApplication::tqclipboard()->setData( drag );
+        TQApplication::clipboard()->setData( drag );
         deleteFrame(false);
     }
 }
@@ -2377,13 +2377,13 @@ void KWView::editCopy()
         edit->copy();
     else {
         TQDragObject *drag = m_doc->dragSelected( frameViewManager()->selectedFrames() );
-        TQApplication::tqclipboard()->setData( drag );
+        TQApplication::clipboard()->setData( drag );
     }
 }
 
 void KWView::editPaste()
 {
-    TQMimeSource *data = TQApplication::tqclipboard()->data();
+    TQMimeSource *data = TQApplication::clipboard()->data();
     pasteData( data, false );
 }
 
@@ -2423,7 +2423,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop )
                 provides = ProvidesPlainText;
             }
             if ( !drop ) // get it again, to avoid crashes
-                data = TQApplication::tqclipboard()->data();
+                data = TQApplication::clipboard()->data();
         }
         KWTextFrameSetEdit * edit = currentTextEdit();
         if ( edit && ( provides & ProvidesPlainText ) ) {
@@ -2433,7 +2433,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop )
             TQCString returnedTypeMime = KoTextObject::providesOasis( data );
             if ( !returnedTypeMime.isEmpty() )
             {
-                const TQByteArray arr = data->tqencodedData( returnedTypeMime );
+                const TQByteArray arr = data->encodedData( returnedTypeMime );
                 if( !arr.isEmpty() )
                 {
                     TQBuffer buffer( arr );
@@ -2629,7 +2629,7 @@ void KWView::adjustZOrderOfSelectedFrames(MoveFrameType moveType) {
         // Calling updateFrames() on the selected frames' framesets isn't enough,
         // we also need other framesets to notice the new frames on top.
         m_doc->updateAllFrames();
-        m_doc->tqlayout();
+        m_doc->layout();
         m_doc->repaintAllViews();
     }
 
@@ -2784,7 +2784,7 @@ void KWView::deleteFrame( bool warning )
                           "Frameset '%1'. "
                           "The contents of this Frameset will not appear "
                           "anymore!\n"
-                          "Are you sure you want to do that?").tqarg(fs->name()),
+                          "Are you sure you want to do that?").arg(fs->name()),
                     i18n("Delete Frame"), KStdGuiItem::del());
 
                 if (result != KMessageBox::Continue)
@@ -2836,7 +2836,7 @@ void KWView::createLinkedFrame()
     if (selectedFrames.count() != 1)
         return; // action is disabled in such a case
     KWFrame* frame = selectedFrames[0]->frame();
-    KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->tqminimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->tqminimumSizeHint().height(), frame->width(), frame->height() );
+    KWFrame* newFrame = new KWFrame(0L, frame->x() + m_gui->getVertRuler()->minimumSizeHint().width(), frame->y() + m_gui->getHorzRuler()->minimumSizeHint().height(), frame->width(), frame->height() );
     newFrame->setZOrder( m_doc->maxZOrder( newFrame->pageNumber(m_doc) ) + 1 ); // make sure it's on top
     newFrame->setCopy(true);
     newFrame->setNewFrameBehavior( KWFrame::Copy );
@@ -3074,22 +3074,22 @@ void KWView::changeZoomMenu( int zoom )
         qHeapSort( list );
 
         for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
-            lst.append( i18n("%1%").tqarg(*it) );
+            lst.append( i18n("%1%").arg(*it) );
     }
     else
     {
-        lst << i18n("%1%").tqarg("33");
-        lst << i18n("%1%").tqarg("50");
-        lst << i18n("%1%").tqarg("75");
-        lst << i18n("%1%").tqarg("100");
-        lst << i18n("%1%").tqarg("125");
-        lst << i18n("%1%").tqarg("150");
-        lst << i18n("%1%").tqarg("200");
-        lst << i18n("%1%").tqarg("250");
-        lst << i18n("%1%").tqarg("350");
-        lst << i18n("%1%").tqarg("400");
-        lst << i18n("%1%").tqarg("450");
-        lst << i18n("%1%").tqarg("500");
+        lst << i18n("%1%").arg("33");
+        lst << i18n("%1%").arg("50");
+        lst << i18n("%1%").arg("75");
+        lst << i18n("%1%").arg("100");
+        lst << i18n("%1%").arg("125");
+        lst << i18n("%1%").arg("150");
+        lst << i18n("%1%").arg("200");
+        lst << i18n("%1%").arg("250");
+        lst << i18n("%1%").arg("350");
+        lst << i18n("%1%").arg("400");
+        lst << i18n("%1%").arg("450");
+        lst << i18n("%1%").arg("500");
     }
     m_actionViewZoom->setItems( lst );
 }
@@ -3097,7 +3097,7 @@ void KWView::changeZoomMenu( int zoom )
 void KWView::showZoom( int zoom )
 {
     TQStringList list = m_actionViewZoom->items();
-    TQString zoomStr( i18n("%1%").tqarg( zoom ) );
+    TQString zoomStr( i18n("%1%").arg( zoom ) );
     m_actionViewZoom->setCurrentItem( list.findIndex(zoomStr)  );
 }
 
@@ -3110,7 +3110,7 @@ void KWView::showZoom( const TQString& zoom )
 void KWView::slotViewFormattingChars()
 {
     m_doc->setViewFormattingChars(m_actionViewFormattingChars->isChecked());
-    m_doc->tqlayout(); // Due to the different formatting when this option is activated
+    m_doc->layout(); // Due to the different formatting when this option is activated
     m_doc->repaintAllViews();
 }
 
@@ -4112,7 +4112,7 @@ void KWView::insertFormula( TQMimeSource* source )
         KWFormulaFrameSet *frameset = new KWFormulaFrameSet( m_doc, TQString() );
         m_doc->addFrameSet( frameset, false ); // done first since the frame number is stored in the undo/redo
         if ( source ) {
-            TQByteArray data = source->tqencodedData( KFormula::MimeSource::selectionMimeType() );
+            TQByteArray data = source->encodedData( KFormula::MimeSource::selectionMimeType() );
             TQDomDocument formula;
             formula.setContent( data );
             TQDomElement formulaElem = formula.namedItem("math").toElement();
@@ -4370,7 +4370,7 @@ void KWView::tableJoinCells()
         return;
     }
     m_doc->addCommand(cmd);
-    m_doc->tqlayout();
+    m_doc->layout();
 }
 
 void KWView::tableSplitCells() {
@@ -4405,7 +4405,7 @@ void KWView::tableSplitCells(int cols, int rows)
     }
     m_doc->addCommand(cmd);
     m_doc->updateAllFrames();
-    m_doc->tqlayout();
+    m_doc->layout();
     frameViewManager()->view(cell->frame(0))->setSelected(true);
 }
 
@@ -4980,10 +4980,10 @@ void KWView::setSpacing( KoParagLayout::SpacingType spacing, const TQString& com
   KMacroCommand* macroCmd = 0L;
   for ( ; it.current() ; ++it )
   {
-    KoParagLayout tqlayout( *it.current()->currentParagLayoutFormat() );
-    tqlayout.lineSpacingType = spacing;
+    KoParagLayout layout( *it.current()->currentParagLayoutFormat() );
+    layout.lineSpacingType = spacing;
 
-    KCommand *cmd = it.current()->setParagLayoutFormatCommand( &tqlayout, KoParagLayout::LineSpacing );
+    KCommand *cmd = it.current()->setParagLayoutFormatCommand( &layout, KoParagLayout::LineSpacing );
     if (cmd)
     {
       if ( !macroCmd )
@@ -5021,7 +5021,7 @@ void KWView::textSpacingDouble()
 
 void KWView::slotCounterStyleSelected()
 {
-    TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
+    TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
     TQString styleStr = actionName.mid(13);
     //kdDebug() << "KWView::slotCounterStyleSelected styleStr=" << styleStr << endl;
     KoParagCounter::Style style = (KoParagCounter::Style)(styleStr.toInt());
@@ -5167,8 +5167,8 @@ void KWView::textIncreaseIndent()
         m_doc->addCommand(macroCmd);
     if(!lst.isEmpty())
     {
-        const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat();
-        showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
+        const KoParagLayout *layout=lst.first()->currentParagLayoutFormat();
+        showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
     }
 #if 0
 
@@ -5216,8 +5216,8 @@ void KWView::textDecreaseIndent()
         m_doc->addCommand(macroCmd);
     if(!lst.isEmpty())
     {
-        const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat();
-        showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
+        const KoParagLayout *layout=lst.first()->currentParagLayoutFormat();
+        showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
     }
 
 
@@ -5445,7 +5445,7 @@ void KWView::tabListChanged( const KoTabulatorList & tabList )
         m_doc->addCommand(macroCmd);
 }
 
-void KWView::newPageLayout( const KoPageLayout &tqlayout )
+void KWView::newPageLayout( const KoPageLayout &layout )
 {
     TQString mode = viewMode()->type();
     bool state = (mode!="ModeText");
@@ -5457,14 +5457,14 @@ void KWView::newPageLayout( const KoPageLayout &tqlayout )
     KoKWHeaderFooter hf;
     m_doc->getPageLayout( pgLayout, cl, hf );
 
-    if(tqlayout==pgLayout)
+    if(layout==pgLayout)
         return;
 
     KWPageLayoutStruct oldLayout( pgLayout, cl, hf );
 
-    m_doc->setPageLayout( tqlayout, cl, hf );
+    m_doc->setPageLayout( layout, cl, hf );
 
-    KWPageLayoutStruct newLayout( tqlayout, cl, hf );
+    KWPageLayoutStruct newLayout( layout, cl, hf );
 
     KWTextFrameSetEdit *edit = currentTextEdit();
     if (edit)
@@ -5473,12 +5473,12 @@ void KWView::newPageLayout( const KoPageLayout &tqlayout )
     m_doc->addCommand(cmd);
 }
 
-void KWView::slotPageLayoutChanged( const KoPageLayout& tqlayout )
+void KWView::slotPageLayoutChanged( const KoPageLayout& layout )
 {
     // This is connected to a signal of KWDocument, so that when the
-    // above method, or any other way of changing the page tqlayout happens,
+    // above method, or any other way of changing the page layout happens,
     // the rulers are updated in all views.
-    viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), tqlayout );
+    viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), layout );
     m_gui->canvasWidget()->repaintAll();
 }
 
@@ -5947,7 +5947,7 @@ void KWView::frameSelectedChanged()
         if(paragLayout->counter)
             counter = *(paragLayout->counter);
         showCounter( counter );
-        int align = paragLayout->tqalignment;
+        int align = paragLayout->alignment;
         if ( align == TQt::AlignAuto )
             align = TQt::AlignLeft; // ## seems hard to detect RTL here
         showAlign( align );
@@ -6038,7 +6038,7 @@ TQWidget* KWView::canvas() const
 {
     // used to be ->viewport(), but this makes no sense.
     // active embedded objects must be positioned relative to the real view,
-    // to scroll around with it, instead of being tqchildren of the fixed viewport.
+    // to scroll around with it, instead of being children of the fixed viewport.
     return m_gui->canvasWidget();
 }
 
@@ -6144,7 +6144,7 @@ void KWView::savePicture()
                             if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) )
                             {
                               KMessageBox::sorry( this, i18n(
-                                  "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ),
+                                  "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ),
                                   i18n("Save Failed") );
                             }
                         }
@@ -6155,12 +6155,12 @@ void KWView::savePicture()
                     }
                     else
                         KMessageBox::sorry( this, i18n(
-                            "Error during saving. Could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ),
+                            "Error during saving. Could not create temporary file: %1.").arg( strerror( tempFile.status() ) ),
                             i18n("Save Picture") );
                 }
             }
             else
-                KMessageBox::sorry( this, i18n("URL %1 is invalid.").tqarg( url.prettyURL() ), i18n("Save Picture") );
+                KMessageBox::sorry( this, i18n("URL %1 is invalid.").arg( url.prettyURL() ), i18n("Save Picture") );
         }
     }
 }
@@ -6586,7 +6586,7 @@ void KWView::switchModeView()
     updateZoomControls();
 
     updatePageInfo();
-    // set page tqlayout in rulers
+    // set page layout in rulers
     canvas->viewMode()->setPageLayout( m_gui->getHorzRuler(), m_gui->getVertRuler(), m_doc->pageLayout() );
 }
 
@@ -7167,7 +7167,7 @@ void KWView::updateRulerInProtectContentMode()
             hRuler->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS);
         else
             hRuler->changeFlags(0);
-        hRuler->tqrepaint();
+        hRuler->repaint();
     }
 }
 
@@ -7263,7 +7263,7 @@ void KWView::convertToTextBox()
         if ( cmd )
             macro->addCommand( cmd );
         // Auto-resize the frame from its contents
-        edit->textFrameSet()->tqlayout();
+        edit->textFrameSet()->layout();
     }
     m_doc->addCommand( macro );
 }
@@ -7618,19 +7618,19 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView )
     l << 90;
     m_panner->setSizes( l );
 
-    KoPageLayout tqlayout = doc->pageLayout();
+    KoPageLayout layout = doc->pageLayout();
 
     m_tabChooser = new KoTabChooser( m_right, KoTabChooser::TAB_ALL );
     m_tabChooser->setReadWrite(doc->isReadWrite());
     gridLayout->addWidget( m_tabChooser, 0, 0 );
 
-    m_horRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Horizontal, tqlayout,
+    m_horRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Horizontal, layout,
 			      KoRuler::F_INDENTS | KoRuler::F_TABS,
 			      doc->unit(), m_tabChooser );
     m_horRuler->setReadWrite(doc->isReadWrite());
     gridLayout->addWidget( m_horRuler, 0, 1 );
 
-    m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Vertical, tqlayout,
+    m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Vertical, layout,
 			       0, doc->unit() );
     m_vertRuler->setReadWrite(doc->isReadWrite());
     gridLayout->addWidget( m_vertRuler, 1, 0 );
@@ -7680,8 +7680,8 @@ void KWGUI::resizeEvent( TQResizeEvent *e )
 
 void KWGUI::reorganize()
 {
-    int hSpace = m_vertRuler->tqminimumSizeHint().width();
-    int vSpace = m_horRuler->tqminimumSizeHint().height();
+    int hSpace = m_vertRuler->minimumSizeHint().width();
+    int vSpace = m_horRuler->minimumSizeHint().height();
     if(m_view->kWordDocument()->showRuler())
     {
         m_vertRuler->show();