Rename obsolete tq methods to standard names

(cherry picked from commit 997675270178b76237986d845de2f258cf7bff89)

16 files changed, 82 insertions, 82 deletions

diff --git a/krename/batchrenamer.cpp b/krename/batchrenamer.cpp
index 880b3cf..bbf7322 100644
--- a/krename/batchrenamer.cpp
+++ b/krename/batchrenamer.cpp
@@ -140,7 +140,7 @@ TQString BatchRenamer::processString( TQString text, TQString oldname, int i )
      *
      * Krename will have problems with files
      * which contain one of the following
-     * tqunicode characters: 60000, 60001, 60002
+     * unicode characters: 60000, 60001, 60002
      * 60003, 60004, 60005, 60006.
      *
      * This is not a good solution, if you have a
diff --git a/krename/confdialog.cpp b/krename/confdialog.cpp
index 985cc43..5529dcc 100644
--- a/krename/confdialog.cpp
+++ b/krename/confdialog.cpp
@@ -48,12 +48,12 @@ void ConfDialog::setupTab1()
 {
     const TQString caption = i18n("Look and Feel");
     TQFrame* box = addPage( caption, caption, BarIcon("looknfeel") );
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( box );
+    TQVBoxLayout* layout = new TQVBoxLayout( box );
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
     TQButtonGroup* group = new TQButtonGroup( box );
     group->setColumnLayout(0, Qt::Vertical );
-    TQVBoxLayout* lgroup = new TQVBoxLayout( group->tqlayout() );
+    TQVBoxLayout* lgroup = new TQVBoxLayout( group->layout() );
 
     optionWizard = new TQRadioButton( group );
     optionWizard->setText( i18n("Use &wizard style GUI (beginners)") );
@@ -65,15 +65,15 @@ void ConfDialog::setupTab1()
     lgroup->addWidget( optionTabs );
     lgroup->addItem( spacer );
         
-    tqlayout->addWidget( group );
-    tqlayout->addItem( spacer );
+    layout->addWidget( group );
+    layout->addItem( spacer );
 }
 
 void ConfDialog::setupTab2()
 {
     const TQString caption = i18n("KRename");
     TQFrame* box = addPage( caption, caption, BarIcon("krename") );
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( box );
+    TQVBoxLayout* layout = new TQVBoxLayout( box );
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
     checkPlugins = new TQCheckBox( i18n("&Load file plugins on start"), box );
@@ -87,12 +87,12 @@ void ConfDialog::setupTab2()
     spinHistory->setRange( 2, 500, 1, false );
     spinHistory->setLabel( i18n( "&Number of template history items:" ), AlignLeft | AlignVCenter );
 
-    tqlayout->addWidget( checkPlugins );
-    tqlayout->addWidget( checkAutosize );
-    tqlayout->addItem( spacer );
-    tqlayout->addWidget( spinSize );
-    tqlayout->addWidget( spinHistory );
-    tqlayout->addItem( spacer );
+    layout->addWidget( checkPlugins );
+    layout->addWidget( checkAutosize );
+    layout->addItem( spacer );
+    layout->addWidget( spinSize );
+    layout->addWidget( spinHistory );
+    layout->addItem( spacer );
 
     TQToolTip::add( checkPlugins, i18n("Disabling this option decreases KRename's startup time, because no KFilePlugins are loaded.") );
 }
diff --git a/krename/coorddialog.cpp b/krename/coorddialog.cpp
index d25addc..ed7e412 100644
--- a/krename/coorddialog.cpp
+++ b/krename/coorddialog.cpp
@@ -52,7 +52,7 @@ CoordDialog::CoordDialog( const TQString & file, TQWidget *_parent, const char *
       KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, _parent, name, true, true ), m_file( file )
 {
     TQFrame* parent = plainPage();
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( parent );
+    TQVBoxLayout* layout = new TQVBoxLayout( parent );
 
     filename = new DSLineEdit( parent );
     filename->setText( file );
@@ -63,10 +63,10 @@ CoordDialog::CoordDialog( const TQString & file, TQWidget *_parent, const char *
     checkInvert = new TQCheckBox( i18n("&Invert selection"), plainPage() );
     checkInvert->setChecked( m_inversion );
     
-    tqlayout->addWidget( new TQLabel( i18n("Please select the text you want to insert:"), plainPage() ) );
-    tqlayout->addWidget( filename );
-    tqlayout->addWidget( checkInvert );
-    tqlayout->addWidget( preview );
+    layout->addWidget( new TQLabel( i18n("Please select the text you want to insert:"), plainPage() ) );
+    layout->addWidget( filename );
+    layout->addWidget( checkInvert );
+    layout->addWidget( preview );
 
     updateCommand();
     connect( filename, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( updateCommand() ) );
diff --git a/krename/dsdirselectdialog.cpp b/krename/dsdirselectdialog.cpp
index 621003e..70fc81f 100644
--- a/krename/dsdirselectdialog.cpp
+++ b/krename/dsdirselectdialog.cpp
@@ -38,10 +38,10 @@ DSDirSelectDialog::DSDirSelectDialog( TQWidget* parent )
     
     TQVBox* vbox = new TQVBox( this );
 
-    if( tqlayout() )
-        tqlayout()->add( vbox );
+    if( layout() )
+        layout()->add( vbox );
     else
-        qDebug("KFileDialog does not have a tqlayout!!!");
+        qDebug("KFileDialog does not have a layout!!!");
 
     checkDir = new TQCheckBox( i18n("Add directory names &with filenames"), vbox );
     check = new TQCheckBox( i18n("Add subdirectories &recursively"), vbox );
diff --git a/krename/dsdirselectdialog.h b/krename/dsdirselectdialog.h
index 1bb9aad..2ccdb4f 100644
--- a/krename/dsdirselectdialog.h
+++ b/krename/dsdirselectdialog.h
@@ -24,7 +24,7 @@ class TQCheckBox;
 class TQLabel;
 class KComboBox;
 
-/* A small helper class to allow tqlayout changes in KDirSelectDialog */
+/* A small helper class to allow layout changes in KDirSelectDialog */
 class DSDirSelectDialog : public KFileDialog {
     Q_OBJECT
   TQ_OBJECT
diff --git a/krename/encodingplugin.cpp b/krename/encodingplugin.cpp
index 6c421d7..3345b9c 100644
--- a/krename/encodingplugin.cpp
+++ b/krename/encodingplugin.cpp
@@ -106,13 +106,13 @@ bool EncodingPlugin::checkError()
 TQString EncodingPlugin::processFile( BatchRenamer*, int, TQString token, int )
 {
     TQString input   = token;
-    TQString tqunicode = TQString();
+    TQString unicode = TQString();
 
     TQTextCodec* toUnicode = TQTextCodec::codecForName(m_input_codec); // get the codec for KOI8-R
     TQTextCodec* fromUnicode = TQTextCodec::codecForName(m_output_codec);
 
-    tqunicode = toUnicode->toUnicode( input );
-    return fromUnicode->fromUnicode( tqunicode );
+    unicode = toUnicode->toUnicode( input );
+    return fromUnicode->fromUnicode( unicode );
 }
 
 void EncodingPlugin::finished()
diff --git a/krename/guimodeselector.cpp b/krename/guimodeselector.cpp
index bdd8603..75b72ff 100644
--- a/krename/guimodeselector.cpp
+++ b/krename/guimodeselector.cpp
@@ -54,12 +54,12 @@ const TQString GUIModeSelector::guiModeCaption() const
 
 void GUIModeSelector::createFrame( TQFrame* frame )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( frame );
+    TQVBoxLayout* layout = new TQVBoxLayout( frame );
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
     TQButtonGroup* group = new TQButtonGroup( frame );
     group->setColumnLayout(0, Qt::Vertical );
-    TQVBoxLayout* lgroup = new TQVBoxLayout( group->tqlayout() );
+    TQVBoxLayout* lgroup = new TQVBoxLayout( group->layout() );
 
     optionWizard = new TQRadioButton( group );
     optionWizard->setText( i18n("Use &wizard style GUI (beginners)") );
@@ -71,8 +71,8 @@ void GUIModeSelector::createFrame( TQFrame* frame )
     lgroup->addWidget( optionTabs );
     lgroup->addItem( spacer );
 
-    tqlayout->addWidget( group );
-    tqlayout->addItem( spacer );   
+    layout->addWidget( group );
+    layout->addItem( spacer );   
 }
 
 
diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp
index d4aa5f8..457b6c6 100644
--- a/krename/krenameimpl.cpp
+++ b/krename/krenameimpl.cpp
@@ -423,9 +423,9 @@ void KRenameImpl::setupPage2()
     groupOptions = new TQButtonGroup( page_2 );
     groupOptions->setTitle( i18n( "O&ptions" ) );
     groupOptions->setColumnLayout(0, Qt::Vertical );
-    groupOptions->tqlayout()->setSpacing( 6 );
-    groupOptions->tqlayout()->setMargin( 11 );
-    groupOptionsLayout = new TQVBoxLayout( groupOptions->tqlayout() );
+    groupOptions->layout()->setSpacing( 6 );
+    groupOptions->layout()->setMargin( 11 );
+    groupOptionsLayout = new TQVBoxLayout( groupOptions->layout() );
     groupOptionsLayout->setAlignment( TQt::AlignTop );
 
     optionRename = new TQRadioButton( groupOptions );
@@ -619,7 +619,7 @@ void KRenameImpl::setupFileTab1()
 
     TQSpacerItem* spacer_9 = new TQSpacerItem( 200, 20, TQSizePolicy::Maximum, TQSizePolicy::Maximum );
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( tab );
+    TQVBoxLayout* layout = new TQVBoxLayout( tab );
     TQHBoxLayout* Layout1 = new TQHBoxLayout( 0, 6, 6 );
     TQHBoxLayout* Layout2 = new TQHBoxLayout( 0, 6, 6 );
     TQHBoxLayout* ExtensionLayout = new TQHBoxLayout( 0, 6, 6 );
@@ -641,10 +641,10 @@ void KRenameImpl::setupFileTab1()
     ExtensionLayout->addWidget( new TQLabel( i18n("File extension starts at:"), tab ) );
     ExtensionLayout->addWidget( comboExtension );
     
-    tqlayout->addLayout( Layout1 );
-    tqlayout->addLayout( ExtensionLayout );
-    tqlayout->addLayout( Layout2 );
-    tqlayout->addItem( spacer_9 );
+    layout->addLayout( Layout1 );
+    layout->addLayout( ExtensionLayout );
+    layout->addLayout( Layout2 );
+    layout->addItem( spacer_9 );
     
     fileTab->addWidget( tab, ID_TAB );
 }
@@ -653,7 +653,7 @@ void KRenameImpl::setupFileTab2()
 {
     TQWidget* tab = new TQWidget( page_4 );
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout( tab, 6, 6 );
+    TQHBoxLayout* layout = new TQHBoxLayout( tab, 6, 6 );
     
     TQVGroupBox* vgroup1 = new TQVGroupBox( i18n("&Filename"), tab );
     TQGrid* grid = new TQGrid( 4, vgroup1 );
@@ -708,8 +708,8 @@ void KRenameImpl::setupFileTab2()
     buttonEasyReplace = new KPushButton( i18n("&Find and Replace..."), rightBox );
     buttonEasyReplace->setIconSet( SmallIconSet("find") );
     
-    tqlayout->addWidget( vgroup1 );
-    tqlayout->addWidget( rightBox );
+    layout->addWidget( vgroup1 );
+    layout->addWidget( rightBox );
     
     comboKRenamePrefix->insertItem( "" );
     comboKRenamePrefix->insertItem( i18n("Number") );
diff --git a/krename/krenameimpl.h b/krename/krenameimpl.h
index aa8850f..b51e86d 100644
--- a/krename/krenameimpl.h
+++ b/krename/krenameimpl.h
@@ -187,7 +187,7 @@ class KRenameImpl : public TQObject, public KRenameDCOP {
         void setupPages();
         void updateHist();
         void parseCommandline();
-        void addTitle( TQWidget* p, TQVBoxLayout* tqlayout, TQString title );
+        void addTitle( TQWidget* p, TQVBoxLayout* layout, TQString title );
 
         TQValueList<manualchanges> changes;
         void refreshColumnMode();
diff --git a/krename/mydirplugin.cpp b/krename/mydirplugin.cpp
index e6119a7..1e5587a 100644
--- a/krename/mydirplugin.cpp
+++ b/krename/mydirplugin.cpp
@@ -74,9 +74,9 @@ void MyDirPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     groupNumber = new TQGroupBox( w );
     groupNumber->setTitle( i18n( "&Options" ) );
     groupNumber->setColumnLayout(0, Qt::Vertical );
-    groupNumber->tqlayout()->setSpacing( 6 );
-    groupNumber->tqlayout()->setMargin( 11 );
-    groupNumberLayout = new TQHBoxLayout( groupNumber->tqlayout() );
+    groupNumber->layout()->setSpacing( 6 );
+    groupNumber->layout()->setMargin( 11 );
+    groupNumberLayout = new TQHBoxLayout( groupNumber->layout() );
     groupNumberLayout->setAlignment( TQt::AlignTop );
 
     TQLabel* la2 = new TQLabel( groupNumber );
@@ -104,9 +104,9 @@ void MyDirPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     groupOutput = new TQGroupBox( w );
     groupOutput->setTitle( i18n( "Output &Directory" ) );
     groupOutput->setColumnLayout(0, Qt::Vertical );
-    groupOutput->tqlayout()->setSpacing( 6 );
-    groupOutput->tqlayout()->setMargin( 11 );
-    groupOutputLayout = new TQHBoxLayout( groupOutput->tqlayout() );
+    groupOutput->layout()->setSpacing( 6 );
+    groupOutput->layout()->setMargin( 11 );
+    groupOutputLayout = new TQHBoxLayout( groupOutput->layout() );
     groupOutputLayout->setAlignment( TQt::AlignTop );
 
     outputdir = new TQLineEdit( groupOutput );
diff --git a/krename/numberdialog.cpp b/krename/numberdialog.cpp
index e219dd6..4daea4d 100644
--- a/krename/numberdialog.cpp
+++ b/krename/numberdialog.cpp
@@ -42,14 +42,14 @@ NumberDialog::NumberDialog(TQValueList<int> & n,TQWidget *parent )
 {
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 6, 6 );
 
     TQGroupBox* group1 = new TQGroupBox( plainPage() );
     group1->setTitle( i18n("&Numbering") );
     group1->setColumnLayout(0, Qt::Vertical );
-    group1->tqlayout()->setSpacing( 6 );
-    group1->tqlayout()->setMargin( 11 );
-    TQVBoxLayout* group1Layout = new TQVBoxLayout( group1->tqlayout() );
+    group1->layout()->setSpacing( 6 );
+    group1->layout()->setMargin( 11 );
+    TQVBoxLayout* group1Layout = new TQVBoxLayout( group1->layout() );
     group1Layout->setAlignment( TQt::AlignTop );
     
     spinIndex = new KIntNumInput( group1 );
@@ -66,9 +66,9 @@ NumberDialog::NumberDialog(TQValueList<int> & n,TQWidget *parent )
     TQGroupBox* group2 = new TQGroupBox( plainPage() );
     group2->setTitle( i18n("S&kip Numbers") );
     group2->setColumnLayout(0, Qt::Horizontal );
-    group2->tqlayout()->setSpacing( 6 );
-    group2->tqlayout()->setMargin( 11 );
-    TQHBoxLayout* group2Layout = new TQHBoxLayout( group2->tqlayout() );
+    group2->layout()->setSpacing( 6 );
+    group2->layout()->setMargin( 11 );
+    TQHBoxLayout* group2Layout = new TQHBoxLayout( group2->layout() );
     group2Layout->setAlignment( TQt::AlignTop );
 
     listNumbers = new KListBox( group2 );
@@ -85,21 +85,21 @@ NumberDialog::NumberDialog(TQValueList<int> & n,TQWidget *parent )
     spinNumber->setValue( 0 );
     spinNumber->setFocus();
 
-    TQVBoxLayout* tqlayout2 = new TQVBoxLayout( 0, 6, 6 );
-    tqlayout2->addWidget( buttonAdd );
-    tqlayout2->addWidget( buttonRemove );
-    tqlayout2->addWidget( spinNumber );
-    tqlayout2->addItem( spacer );
+    TQVBoxLayout* layout2 = new TQVBoxLayout( 0, 6, 6 );
+    layout2->addWidget( buttonAdd );
+    layout2->addWidget( buttonRemove );
+    layout2->addWidget( spinNumber );
+    layout2->addItem( spacer );
                                                                 
     group1Layout->addWidget( spinIndex );
     group1Layout->addWidget( spinStep );
     group1Layout->addWidget( checkResetCounter );
     
     group2Layout->addWidget( listNumbers );
-    group2Layout->addLayout( tqlayout2 );
+    group2Layout->addLayout( layout2 );
     
-    tqlayout->addWidget( group1 );
-    tqlayout->addWidget( group2 );
+    layout->addWidget( group1 );
+    layout->addWidget( group2 );
 
     TQToolTip::add( spinIndex, i18n( "Number of the first file." ) );
     TQToolTip::add( spinStep, i18n( "The counter is increased/decreased by this value." ) );
diff --git a/krename/permission.cpp b/krename/permission.cpp
index b35894a..83fcd5b 100644
--- a/krename/permission.cpp
+++ b/krename/permission.cpp
@@ -137,9 +137,9 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     groupOwner = new TQGroupBox ( i18n("Ownership"), w );
     groupOwner->setEnabled( FALSE );
     groupOwner->setColumnLayout(0, Qt::Vertical );
-    groupOwner->tqlayout()->setSpacing( 6 );
-    groupOwner->tqlayout()->setMargin( 11 );
-    groupOwnerLayout = new TQVBoxLayout( groupOwner->tqlayout() );
+    groupOwner->layout()->setSpacing( 6 );
+    groupOwner->layout()->setMargin( 11 );
+    groupOwnerLayout = new TQVBoxLayout( groupOwner->layout() );
     groupOwnerLayout->setAlignment( TQt::AlignTop );
 
     Layout2 = new TQHBoxLayout( 0, 0, 6 );
diff --git a/krename/profiledlg.cpp b/krename/profiledlg.cpp
index eee32fd..304f45f 100644
--- a/krename/profiledlg.cpp
+++ b/krename/profiledlg.cpp
@@ -397,7 +397,7 @@ ProfileDlg::ProfileDlg(KRenameImpl* krename, TQWidget *parent, const char *name)
 {
     int i;
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout( plainPage(), 6, 6 );
+    TQHBoxLayout* layout = new TQHBoxLayout( plainPage(), 6, 6 );
     TQVBoxLayout* button = new TQVBoxLayout( 0, 6, 6 );
     
     profiles = new KListBox( plainPage() );
@@ -420,9 +420,9 @@ ProfileDlg::ProfileDlg(KRenameImpl* krename, TQWidget *parent, const char *name)
     button->addItem( spacer );
     button->addWidget( checkDefault );
 
-    tqlayout->addWidget( profiles );
-    tqlayout->addLayout( button );
-    tqlayout->setStretchFactor( profiles, 2 );
+    layout->addWidget( profiles );
+    layout->addLayout( button );
+    layout->setStretchFactor( profiles, 2 );
     
     TQToolTip::add( createProfile, i18n("<qt>Save KRename's current settings as a new profile. " 
                                        "The settings are saved and can be restored with Load Profile later.</qt>" ) );
diff --git a/krename/tabs.cpp b/krename/tabs.cpp
index d10ee26..92700c1 100644
--- a/krename/tabs.cpp
+++ b/krename/tabs.cpp
@@ -38,7 +38,7 @@ tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name )
 {
     setIcon( BarIcon( "krename" ) );
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 );
     TQHBoxLayout* buttons = new TQHBoxLayout( 0, 6, 6 );
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
     
@@ -53,12 +53,12 @@ tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name )
     buttons->addWidget( finishButton );
     buttons->addWidget( cancelButton );
     
-    tqlayout->addWidget( tab );
-    tqlayout->addLayout( buttons );
-    tqlayout->setStretchFactor( tab, 2 );
+    layout->addWidget( tab );
+    layout->addLayout( buttons );
+    layout->setStretchFactor( tab, 2 );
 
     menuBar = new KMenuBar( this );
-    tqlayout->setMenuBar( menuBar );
+    layout->setMenuBar( menuBar );
     
     connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) );
 
diff --git a/krename/translitplugin.cpp b/krename/translitplugin.cpp
index 7d08702..0e4b262 100644
--- a/krename/translitplugin.cpp
+++ b/krename/translitplugin.cpp
@@ -78,13 +78,13 @@ TQString TranslitPlugin::processFile( BatchRenamer*, int, TQString token, int )
     return output; // no error
 }
 
-TQString TranslitPlugin::translit(const TQString & tqunicoded)
+TQString TranslitPlugin::translit(const TQString & unicoded)
 {
     int i;
     TQString transed = "";
     
-    for (i=0; i<(int)tqunicoded.length(); i++) {
-        TQString charIn = tqunicoded.mid(i, 1);
+    for (i=0; i<(int)unicoded.length(); i++) {
+        TQString charIn = unicoded.mid(i, 1);
         if (m_mapFromUTF8[charIn.utf8()]) {
             TQString charTrans = m_mapFromUTF8[charIn.utf8()];
             transed.append(charTrans);
diff --git a/krename/wizard.cpp b/krename/wizard.cpp
index c44ca71..810a654 100644
--- a/krename/wizard.cpp
+++ b/krename/wizard.cpp
@@ -77,16 +77,16 @@ void wizard::slotAddPage( TQWidget* page, const TQString & title )
 
     TQString t = title + i18n(" - Step %1 of %2").arg( pageCount()+1 ).arg( 3 );
         
-    TQVBox* tqlayout = new TQVBox( this );
+    TQVBox* layout = new TQVBox( this );
    
-    new TQLabel( TQString( t ).remove( title.find( "&" ), 1 ), tqlayout );
+    new TQLabel( TQString( t ).remove( title.find( "&" ), 1 ), layout );
 
-    TQFrame* hbar1 = new TQFrame( tqlayout, "<hr>", 0 );
+    TQFrame* hbar1 = new TQFrame( layout, "<hr>", 0 );
     hbar1->setFrameStyle( TQFrame::Sunken + TQFrame::HLine );
 
-    page->reparent( tqlayout, TQPoint( 0, 0 ) );
-    addPage( tqlayout, t );
-    setHelpEnabled( tqlayout, false );
+    page->reparent( layout, TQPoint( 0, 0 ) );
+    addPage( layout, t );
+    setHelpEnabled( layout, false );
 }
 
 void wizard::slotShowPage( int page )