Rename obsolete tq methods to standard names

1 files changed, 31 insertions, 31 deletions

diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index b39cac7f0..832711d10 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -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()),
@@ -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,
@@ -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 );
@@ -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 ) ) {
@@ -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();
     }
 
@@ -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();
 }
 
@@ -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 )
@@ -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();
 }
 
@@ -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() );
 }
 
@@ -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 );