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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 23 insertions, 23 deletions

diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 76c760ad..b9d0e506 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -33,7 +33,7 @@ using KMail::FilterImporterExporter;
 #include <kpushbutton.h>
 
 // other TQt headers:
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqwidgetstack.h>
@@ -234,7 +234,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
       mConfigureShortcut = new TQCheckBox( i18n("Add this filter to the Apply Filter menu"), adv_w );
       gl->addMultiCellWidget( mConfigureShortcut, 7, 7, 0, 1 );
       TQLabel *keyButtonLabel = new TQLabel( i18n( "Shortcut:" ), adv_w );
-      keyButtonLabel->setAlignment( AlignVCenter | AlignRight );
+      keyButtonLabel->tqsetAlignment( AlignVCenter | AlignRight );
       gl->addMultiCellWidget( keyButtonLabel, 7, 7, 2, 2 );
       mKeyButton = new KKeyButton( adv_w, "FilterShortcutSelector" );
       gl->addMultiCellWidget( mKeyButton, 7, 7, 3, 3 );
@@ -339,11 +339,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
   connect( this, TQT_SIGNAL(finished()),
 	   this, TQT_SLOT(slotFinished()) );
 
-  KConfigGroup geometry( KMKernel::config(), "Geometry");
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry");
   const char * configKey
     = bPopFilter ? "popFilterDialogSize" : "filterDialogSize";
-  if ( geometry.hasKey( configKey ) )
-    resize( geometry.readSizeEntry( configKey ) );
+  if ( tqgeometry.hasKey( configKey ) )
+    resize( tqgeometry.readSizeEntry( configKey ) );
   else
     adjustSize();
 
@@ -356,8 +356,8 @@ void KMFilterDlg::slotFinished() {
 }
 
 void KMFilterDlg::slotSaveSize() {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  tqgeometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
 }
 
 /** Set action of popFilter */
@@ -558,7 +558,7 @@ void KMFilterDlg::slotUpdateAccountList()
     TQCheckListItem *listItem =
       new TQCheckListItem( mAccountList, top, a->name(), TQCheckListItem::CheckBox );
     listItem->setText( 1, a->type() );
-    listItem->setText( 2, TQString( "%1" ).arg( a->id() ) );
+    listItem->setText( 2, TQString( "%1" ).tqarg( a->id() ) );
     if ( mFilter )
       listItem->setOn( mFilter->applyOnAccount( a->id() ) );
     top = listItem;
@@ -595,19 +595,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   mBtnTop = new KPushButton( TQString(), hb );
   mBtnTop->setAutoRepeat( true );
   mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) );
-  mBtnTop->setMinimumSize( mBtnTop->sizeHint() * 1.2 );
+  mBtnTop->setMinimumSize( mBtnTop->tqsizeHint() * 1.2 );
   mBtnUp = new KPushButton( TQString(), hb );
   mBtnUp->setAutoRepeat( true );
   mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
-  mBtnUp->setMinimumSize( mBtnUp->sizeHint() * 1.2 );
+  mBtnUp->setMinimumSize( mBtnUp->tqsizeHint() * 1.2 );
   mBtnDown = new KPushButton( TQString(), hb );
   mBtnDown->setAutoRepeat( true );
   mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
-  mBtnDown->setMinimumSize( mBtnDown->sizeHint() * 1.2 );
+  mBtnDown->setMinimumSize( mBtnDown->tqsizeHint() * 1.2 );
   mBtnBot = new KPushButton( TQString(), hb );
   mBtnBot->setAutoRepeat( true );
   mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) );
-  mBtnBot->setMinimumSize( mBtnBot->sizeHint() * 1.2 );
+  mBtnBot->setMinimumSize( mBtnBot->tqsizeHint() * 1.2 );
   TQToolTip::add( mBtnTop, i18n("Top") );
   TQToolTip::add( mBtnUp, i18n("Up") );
   TQToolTip::add( mBtnDown, i18n("Down") );
@@ -622,13 +622,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   hb->setSpacing(4);
   mBtnNew = new TQPushButton( TQString(), hb );
   mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) );
-  mBtnNew->setMinimumSize( mBtnNew->sizeHint() * 1.2 );
+  mBtnNew->setMinimumSize( mBtnNew->tqsizeHint() * 1.2 );
   mBtnCopy = new TQPushButton( TQString(), hb );
   mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) );
-  mBtnCopy->setMinimumSize( mBtnCopy->sizeHint() * 1.2 );
+  mBtnCopy->setMinimumSize( mBtnCopy->tqsizeHint() * 1.2 );
   mBtnDelete = new TQPushButton( TQString(), hb );
   mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
-  mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 );
+  mBtnDelete->setMinimumSize( mBtnDelete->tqsizeHint() * 1.2 );
   mBtnRename = new TQPushButton( i18n("Rename..."), hb );
   TQToolTip::add( mBtnNew, i18n("New") );
   TQToolTip::add( mBtnCopy, i18n("Copy") );
@@ -682,7 +682,7 @@ void KMFilterListBox::createFilter( const TQCString & field,
 
   KMFilter *newFilter = new KMFilter(0, bPopFilter);
   newFilter->pattern()->append( newRule );
-  newFilter->pattern()->setName( TQString("<%1>:%2").arg( TQString(field) ).arg( TQString(value) ) );
+  newFilter->pattern()->setName( TQString("<%1>:%2").tqarg( TQString(field) ).tqarg( TQString(value) ) );
 
   KMFilterActionDesc *desc = (*kmkernel->filterActionDict())["transfer"];
   if ( desc )
@@ -712,7 +712,7 @@ void KMFilterListBox::slotUpdateFilterName()
   if ( mFilterList.at(mIdxSelItem)->isAutoNaming() ) {
     // auto-naming of patterns
     if ( !p->isEmpty() && p->first() && !p->first()->field().stripWhiteSpace().isEmpty() )
-      shouldBeName = TQString( "<%1>: %2" ).arg( TQString(p->first()->field()) ).arg( TQString(p->first()->contents()) );
+      shouldBeName = TQString( "<%1>: %2" ).tqarg( TQString(p->first()->field()) ).tqarg( TQString(p->first()->contents()) );
     else
       shouldBeName = "<" + i18n("unnamed") + ">";
     p->setName( shouldBeName );
@@ -946,9 +946,9 @@ void KMFilterListBox::slotRename()
     (
      i18n("Rename Filter"),
      i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)")
-        .arg( filter->pattern()->name() ) /*label*/,
+        .tqarg( filter->pattern()->name() ) /*label*/,
      filter->pattern()->name() /* initial value */,
-     &okPressed, topLevelWidget(), 0, validator
+     &okPressed, tqtopLevelWidget(), 0, validator
      );
   delete validator;
 
@@ -1140,13 +1140,13 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name )
 
   // don't show scroll bars.
   mComboBox->setSizeLimit( mComboBox->count() );
-  // layout management:
-  // o the combo box is not to be made larger than it's sizeHint(),
+  // tqlayout management:
+  // o the combo box is not to be made larger than it's tqsizeHint(),
   //   the parameter widget should grow instead.
   // o the whole widget takes all space horizontally, but is fixed vertically.
   mComboBox->adjustSize();
-  mComboBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mComboBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   updateGeometry();
 
   // redirect focus to the filter action combo box