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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 21 insertions, 21 deletions

diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 5f24875f9..88a2c087a 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -24,12 +24,12 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtable.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqtooltip.h>
 
 #include <kapplication.h>
@@ -367,7 +367,7 @@ void CSVImportDialog::initGUI()
 {
   mPage = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( mPage, 1, 1, marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( mPage, 1, 1, marginHint(),
                                          spacingHint() );
   TQHBoxLayout *hbox = new TQHBoxLayout();
   hbox->setSpacing( spacingHint() );
@@ -379,16 +379,16 @@ void CSVImportDialog::initGUI()
   mUrlRequester->setFilter( "*.csv" );
   hbox->addWidget( mUrlRequester );
 
-  layout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
+  tqlayout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
 
   // Delimiter: comma, semicolon, tab, space, other
   mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
   mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
-  mDelimiterBox->layout()->setSpacing( spacingHint() );
-  mDelimiterBox->layout()->setMargin( marginHint() );
-  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() );
-  delimiterLayout->setAlignment( TQt::AlignTop );
-  layout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
+  mDelimiterBox->tqlayout()->setSpacing( spacingHint() );
+  mDelimiterBox->tqlayout()->setMargin( marginHint() );
+  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() );
+  delimiterLayout->tqsetAlignment( TQt::AlignTop );
+  tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
 
   mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox );
   mRadioComma->setChecked( true );
@@ -411,13 +411,13 @@ void CSVImportDialog::initGUI()
 
   mComboLine = new TQComboBox( false, mPage );
   mComboLine->insertItem( i18n( "1" ) );
-  layout->addWidget( mComboLine, 2, 3 );
+  tqlayout->addWidget( mComboLine, 2, 3 );
 
   mComboQuote = new TQComboBox( false, mPage );
   mComboQuote->insertItem( i18n( "\"" ), 0 );
   mComboQuote->insertItem( i18n( "'" ), 1 );
   mComboQuote->insertItem( i18n( "None" ), 2 );
-  layout->addWidget( mComboQuote, 2, 2 );
+  tqlayout->addWidget( mComboQuote, 2, 2 );
 
   mDatePatternEdit = new TQLineEdit( mPage );
   mDatePatternEdit->setText( "Y-M-D" ); // ISO 8601 format as default
@@ -427,28 +427,28 @@ void CSVImportDialog::initGUI()
                                          "<li>M: month with 2 digits</li>"
                                          "<li>d: day with 1 or 2 digits</li>"
                                          "<li>D: day with 2 digits</li></ul>" ) );
-  layout->addWidget( mDatePatternEdit, 2, 4 );
+  tqlayout->addWidget( mDatePatternEdit, 2, 4 );
 
   label = new TQLabel( i18n( "Start at line:" ), mPage );
-  layout->addWidget( label, 1, 3 );
+  tqlayout->addWidget( label, 1, 3 );
 
   label = new TQLabel( i18n( "Textquote:" ), mPage );
-  layout->addWidget( label, 1, 2 );
+  tqlayout->addWidget( label, 1, 2 );
 
   label = new TQLabel( i18n( "Date format:" ), mPage );
-  layout->addWidget( label, 1, 4 );
+  tqlayout->addWidget( label, 1, 4 );
 
   mIgnoreDuplicates = new TQCheckBox( mPage );
   mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) );
-  layout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
+  tqlayout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
 
   mCodecCombo = new TQComboBox( mPage );
-  layout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
+  tqlayout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
 
   mTable = new TQTable( 0, 0, mPage );
   mTable->setSelectionMode( TQTable::NoSelection );
   mTable->horizontalHeader()->hide();
-  layout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
+  tqlayout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
 
   setButtonText( User1, i18n( "Apply Template..." ) );
   setButtonText( User2, i18n( "Save Template..." ) );
@@ -503,7 +503,7 @@ void CSVImportDialog::fillTable()
   else if ( code == Guess ) {
     TQTextCodec* codec = TQTextCodec::codecForContent( mFileArray.data(), mFileArray.size() );
     if ( codec ) {
-      KMessageBox::information( this, i18n( "Using codec '%1'" ).arg( codec->name() ), i18n( "Encoding" ) );
+      KMessageBox::information( this, i18n( "Using codec '%1'" ).tqarg( codec->name() ), i18n( "Encoding" ) );
       inputStream.setCodec( codec );
     }
   }
@@ -663,7 +663,7 @@ void CSVImportDialog::reloadCodecs()
   for ( int i = 0; ( codec = TQTextCodec::codecForIndex( i ) ); i++ )
     mCodecs.append( codec );
 
-  mCodecCombo->insertItem( i18n( "Local (%1)" ).arg( TQTextCodec::codecForLocale()->name() ), Local );
+  mCodecCombo->insertItem( i18n( "Local (%1)" ).tqarg( TQTextCodec::codecForLocale()->name() ), Local );
   mCodecCombo->insertItem( i18n( "[guess]" ), Guess );
   mCodecCombo->insertItem( i18n( "Latin1" ), Latin1 );
   mCodecCombo->insertItem( i18n( "Unicode" ), Uni );
@@ -858,7 +858,7 @@ void CSVImportDialog::saveTemplate()
     fileName += ".desktop";
 
   if( TQFileInfo(fileName).exists() ) {                                                                                                   
-      if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").arg(fileName) ) == KMessageBox::No)        
+      if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").tqarg(fileName) ) == KMessageBox::No)        
         return;                                                                                                                      
   }
   TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) );