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

1 files changed, 14 insertions, 14 deletions

diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index f0e6f664..6e89e2cf 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -37,7 +37,7 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhgroupbox.h>
 
 #include <kapplication.h>
@@ -48,11 +48,11 @@
 using namespace KSpread;
 
 PaperLayout::PaperLayout( TQWidget * parent, const char * name,
-                                        const KoPageLayout & tqlayout,
+                                        const KoPageLayout & layout,
                                         const KoHeadFoot & headfoot,
                                         int tabs, KoUnit::Unit unit,
                                         Sheet * sheet, View * view)
-  : KoPageLayoutDia( parent, name, tqlayout, headfoot, tabs, unit, false /*no modal*/),
+  : KoPageLayoutDia( parent, name, layout, headfoot, tabs, unit, false /*no modal*/),
     m_pSheet( sheet ),
     m_pView( view )
 {
@@ -130,7 +130,7 @@ void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox )
     rangeGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( rangeGroup );
 
-    TQGridLayout *grid = new TQGridLayout( rangeGroup->tqlayout(), 3, 2, KDialog::spacingHint() );
+    TQGridLayout *grid = new TQGridLayout( rangeGroup->layout(), 3, 2, KDialog::spacingHint() );
 
     TQLabel *pPrintRange = new TQLabel ( i18n("Print range:"), rangeGroup );
     grid->addWidget( pPrintRange, 0, 0 );
@@ -182,7 +182,7 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     zoomGroup->setMargin( KDialog::marginHint() );
     vbox->addWidget( zoomGroup );
 
-    TQGridLayout *grid = new TQGridLayout( zoomGroup->tqlayout(), 2, 6,
+    TQGridLayout *grid = new TQGridLayout( zoomGroup->layout(), 2, 6,
                                          KDialog::spacingHint() );
 
     m_rScalingZoom = new TQRadioButton ( i18n("Zoom:"), zoomGroup );
@@ -194,17 +194,17 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     TQStringList lst;
     for( int i = 5; i < 500; i += 5 )
     {
-        lst.append( TQString( i18n( "%1%" ) ).tqarg( i ) );
+        lst.append( TQString( i18n( "%1%" ) ).arg( i ) );
         if( tqRound( print->zoom() * 100 ) > i &&
             tqRound( print->zoom() * 100 ) < i + 5 )
         {
-            lst.append( TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ) );
+            lst.append( TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) ) );
         }
     }
     m_cZoom->insertStringList( lst );
 
     int number_of_entries = m_cZoom->count();
-    TQString string = TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) );
+    TQString string = TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) );
     for (int i = 0; i < number_of_entries ; i++)
     {
         if ( string == (TQString) m_cZoom->text(i) )
@@ -227,11 +227,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     lstX.append( i18n( "No Limit" ) );
     for( int i = 1; i <= 20; i += 1 )
     {
-        lstX.append( TQString( "%1" ).tqarg( i ) );
+        lstX.append( TQString( "%1" ).arg( i ) );
     }
     if( print->pageLimitX() > 20 )
     {
-      lstX.append( TQString( "%1" ).tqarg( print->pageLimitX() ) );
+      lstX.append( TQString( "%1" ).arg( print->pageLimitX() ) );
     }
     m_cLimitPagesX->insertStringList( lstX );
 
@@ -250,11 +250,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox )
     lstY.append( i18n( "No Limit" ) );
     for( int i = 1; i <= 20; i += 1 )
     {
-        lstY.append( TQString( "%1" ).tqarg( i ) );
+        lstY.append( TQString( "%1" ).arg( i ) );
     }
     if( print->pageLimitY() > 20 )
     {
-      lstY.append( TQString( "%1" ).tqarg( print->pageLimitY() ) );
+      lstY.append( TQString( "%1" ).arg( print->pageLimitY() ) );
     }
     m_cLimitPagesY->insertStringList( lstY );
 
@@ -312,7 +312,7 @@ void PaperLayout::slotOk()
     {
       SheetPrint *print = sheet->print();
 
-      KoPageLayout pl = tqlayout();
+      KoPageLayout pl = layout();
       KoHeadFoot hf = headFoot();
       KoUnit::Unit unit = sheet->doc()->unit();
       print->setPrintGrid( pPrintGrid->isChecked() );
@@ -407,7 +407,7 @@ void PaperLayout::slotOk()
       if ( m_rScalingZoom->isChecked() )
       {
         kdDebug() << "Zoom is selected" << endl;
-        if( TQString( "%1%" ).tqarg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() )
+        if( TQString( "%1%" ).arg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() )
         {
           kdDebug() << "New zoom is different than original: " << m_cZoom->currentText() << endl;
           TQString zoomtext = m_cZoom->currentText();