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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

3 files changed, 11 insertions, 11 deletions

diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 5a786f76b..7e6034881 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -38,7 +38,7 @@
 #include <tqevent.h>
 #include <tqguardedptr.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpoint.h>
 #include <tqtimer.h>
 #include <tqpushbutton.h>
@@ -56,7 +56,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event )
         event->ignore();
     }
     else {
-        event->accept( itemRect( item ) );
+        event->accept( tqitemRect( item ) );
     }
 }
 
@@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const
 
 KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->setSpacing( KDialog::spacingHint() );
 
     TQHBoxLayout *buttonLayout = new TQHBoxLayout();
-    layout->addLayout( buttonLayout );
+    tqlayout->addLayout( buttonLayout );
 
     TQLabel *label = new TQLabel( this );
     label->setText( i18n( "Distribution Lists" ) );
@@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
     connect( mListBox, TQT_SIGNAL( highlighted( int ) ),
              this, TQT_SLOT( itemSelected( int ) ) );
     connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) );
-    layout->addWidget( mListBox );
+    tqlayout->addWidget( mListBox );
 
     connect( core, TQT_SIGNAL( contactsUpdated() ),
              this, TQT_SLOT( updateEntries() ) );
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 48393ce4a..035eba6ce 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -25,7 +25,7 @@
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -343,7 +343,7 @@ void DistributionListWidget::editList()
 void DistributionListWidget::removeList()
 {
   int result = KMessageBox::warningContinueCancel( this,
-      i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ),
+      i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .tqarg( mNameCombo->currentText() ),
       TQString(), KGuiItem( i18n("Delete"), "editdelete") );
 
   if ( result != KMessageBox::Continue )
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 5c1c62b9b..a7f0d36dd 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpopupmenu.h>
 #include <tqpushbutton.h>
 #include <tqtimer.h>
@@ -247,7 +247,7 @@ void ResourceSelection::add()
   KABC::Resource *resource = mManager->createResource( type );
   if ( !resource ) {
     KMessageBox::error( this, i18n("<qt>Unable to create an address book of type <b>%1</b>.</qt>")
-                              .arg( type ) );
+                              .tqarg( type ) );
     return;
   }
 
@@ -298,7 +298,7 @@ void ResourceSelection::remove()
 
   int result = KMessageBox::warningContinueCancel( this,
         i18n( "<qt>Do you really want to remove the address book <b>%1</b>?</qt>" )
-        .arg( item->resource()->resourceName() ), "",
+        .tqarg( item->resource()->resourceName() ), "",
         KGuiItem( i18n( "&Remove" ), "editdelete" ) );
   if ( result == KMessageBox::Cancel )
     return;