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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 8 insertions, 8 deletions

diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 9f18818b7..9a06fb399 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -39,7 +39,7 @@
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsignalmapper.h>
 #include <tqtoolbutton.h>
 #include <tqguardedptr.h>
@@ -67,16 +67,16 @@ public:
 KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book )
 {
     Q_ASSERT( m_addressBook );
-    TQBoxLayout* layout = new TQHBoxLayout( this );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQBoxLayout* tqlayout = new TQHBoxLayout( this );
+    tqlayout->setSpacing( KDialog::spacingHint() );
     m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this );
     connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
              this, TQT_SLOT( textChanged( const TQString& ) ) );
-    layout->addWidget( m_lineEdit );
+    tqlayout->addWidget( m_lineEdit );
     m_clearButton = new TQToolButton( this );
     m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
     m_clearButton->setEnabled( false );
-    layout->addWidget( m_clearButton );
+    tqlayout->addWidget( m_clearButton );
     connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) );
 }
 
@@ -188,7 +188,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
     d->scrollView->setFrameShape( TQFrame::NoFrame );
     mainLayout->addWidget( d->scrollView );
     d->memberListWidget = new TQWidget( d->scrollView->viewport() );
-    d->memberListWidget->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
+    d->memberListWidget->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
     TQVBoxLayout* memberLayout = new TQVBoxLayout( d->memberListWidget );
     d->addresseeLayout = new TQVBoxLayout;
     d->addresseeLayout->setSpacing( KDialog::spacingHint() );
@@ -200,7 +200,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
     setMainWidget( main );
 
     KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( KPIM::DistributionList::Entry() );
-    const TQSize hint = sizeHint();
+    const TQSize hint = tqsizeHint();
     resize( hint.width() * 3L/2, hint.height() );
 }
 
@@ -261,7 +261,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk()
     const KPIM::DistributionList existing = KPIM::DistributionList::findByName( d->addressBook, name );
     if ( !existing.isEmpty() && existing.uid() != d->distListUid )
     {
-        KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).arg( name ), i18n( "Name in Use" ) );
+        KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).tqarg( name ), i18n( "Name in Use" ) );
         return;
     }