Rename obsolete tq methods to standard names

2 files changed, 24 insertions, 24 deletions

diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 72ae7e782..a860b5f6f 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -367,7 +367,7 @@ void CSVImportDialog::initGUI()
 {
   mPage = plainPage();
 
-  TQGridLayout *tqlayout = new TQGridLayout( mPage, 1, 1, marginHint(),
+  TQGridLayout *layout = 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 );
 
-  tqlayout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
+  layout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
 
   // Delimiter: comma, semicolon, tab, space, other
   mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
   mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
-  mDelimiterBox->tqlayout()->setSpacing( spacingHint() );
-  mDelimiterBox->tqlayout()->setMargin( marginHint() );
-  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() );
+  mDelimiterBox->layout()->setSpacing( spacingHint() );
+  mDelimiterBox->layout()->setMargin( marginHint() );
+  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() );
   delimiterLayout->setAlignment( TQt::AlignTop );
-  tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
+  layout->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" ) );
-  tqlayout->addWidget( mComboLine, 2, 3 );
+  layout->addWidget( mComboLine, 2, 3 );
 
   mComboQuote = new TQComboBox( false, mPage );
   mComboQuote->insertItem( i18n( "\"" ), 0 );
   mComboQuote->insertItem( i18n( "'" ), 1 );
   mComboQuote->insertItem( i18n( "None" ), 2 );
-  tqlayout->addWidget( mComboQuote, 2, 2 );
+  layout->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>" ) );
-  tqlayout->addWidget( mDatePatternEdit, 2, 4 );
+  layout->addWidget( mDatePatternEdit, 2, 4 );
 
   label = new TQLabel( i18n( "Start at line:" ), mPage );
-  tqlayout->addWidget( label, 1, 3 );
+  layout->addWidget( label, 1, 3 );
 
   label = new TQLabel( i18n( "Textquote:" ), mPage );
-  tqlayout->addWidget( label, 1, 2 );
+  layout->addWidget( label, 1, 2 );
 
   label = new TQLabel( i18n( "Date format:" ), mPage );
-  tqlayout->addWidget( label, 1, 4 );
+  layout->addWidget( label, 1, 4 );
 
   mIgnoreDuplicates = new TQCheckBox( mPage );
   mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) );
-  tqlayout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
+  layout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
 
   mCodecCombo = new TQComboBox( mPage );
-  tqlayout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
+  layout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
 
   mTable = new TQTable( 0, 0, mPage );
   mTable->setSelectionMode( TQTable::NoSelection );
   mTable->horizontalHeader()->hide();
-  tqlayout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
+  layout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
 
   setButtonText( User1, i18n( "Apply Template..." ) );
   setButtonText( User2, i18n( "Save Template..." ) );
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 022f6c5f2..ad85389fe 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -471,18 +471,18 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
     mContacts( list )
 {
   TQFrame *page = plainPage();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Do you want to import this contact in your address book?" ), page );
   TQFont font = label->font();
   font.setBold( true );
   label->setFont( font );
-  tqlayout->addWidget( label );
+  layout->addWidget( label );
 
   mView = new KPIM::AddresseeView( page );
   mView->enableLinks( 0 );
   mView->setVScrollBarMode( TQScrollView::Auto );
-  tqlayout->addWidget( mView );
+  layout->addWidget( mView );
 
   setButtonText( Apply, i18n( "Import All..." ) );
 
@@ -544,22 +544,22 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
 {
   TQFrame *page = plainPage();
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Select the fields which shall be exported in the vCard." ), page );
-  tqlayout->addWidget( label );
+  layout->addWidget( label );
 
   mPrivateBox = new TQCheckBox( i18n( "Private fields" ), page );
-  tqlayout->addWidget( mPrivateBox );
+  layout->addWidget( mPrivateBox );
 
   mBusinessBox = new TQCheckBox( i18n( "Business fields" ), page );
-  tqlayout->addWidget( mBusinessBox );
+  layout->addWidget( mBusinessBox );
 
   mOtherBox = new TQCheckBox( i18n( "Other fields" ), page );
-  tqlayout->addWidget( mOtherBox );
+  layout->addWidget( mOtherBox );
 
   mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page );
-  tqlayout->addWidget( mEncryptionKeys );
+  layout->addWidget( mEncryptionKeys );
 
   KConfig config( "kaddressbookrc" );
   config.setGroup( "XXPortVCard" );