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

1 files changed, 12 insertions, 12 deletions

diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 4722feac7..ceac59bb9 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqgroupbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqmap.h>
 #include <tqpushbutton.h>
@@ -153,7 +153,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
   groupBox->setFrameShape( TQGroupBox::Box );
   groupBox->setFrameShadow( TQGroupBox::Sunken );
   groupBox->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
+  TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
                                             5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -176,10 +176,10 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
 
   TQSize buttonSize;
   mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox );
-  buttonSize = mSearchButton->tqsizeHint();
+  buttonSize = mSearchButton->sizeHint();
   mSearchButton->setText( i18n( "&Search" ) );
-  if ( buttonSize.width() < mSearchButton->tqsizeHint().width() )
-    buttonSize = mSearchButton->tqsizeHint();
+  if ( buttonSize.width() < mSearchButton->sizeHint().width() )
+    buttonSize = mSearchButton->sizeHint();
   mSearchButton->setFixedWidth( buttonSize.width() );
 
   mSearchButton->setDefault( true );
@@ -208,7 +208,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
 
   topLayout->addWidget( buttons );
 
-  resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) );
+  resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) );
 
   setButtonText( User1, i18n( "Add Selected" ) );
 
@@ -361,15 +361,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at
 
   if ( attr == i18n( "Name" ) ) {
     result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)";
-    result = result.tqarg( query ).tqarg( query );
+    result = result.arg( query ).arg( query );
   } else {
     result += (startsWith ? "%1=%2*" : "%1=*%2*");
     if ( attr == i18n( "Email" ) ) {
-      result = result.tqarg( "mail" ).tqarg( query );
+      result = result.arg( "mail" ).arg( query );
     } else if ( attr == i18n( "Home Number" ) ) {
-      result = result.tqarg( "homePhone" ).tqarg( query );
+      result = result.arg( "homePhone" ).arg( query );
     } else if ( attr == i18n( "Work Number" ) ) {
-      result = result.tqarg( "telephoneNumber" ).tqarg( query );
+      result = result.arg( "telephoneNumber" ).arg( query );
     } else {
       // Error?
       result = TQString();
@@ -560,7 +560,7 @@ KPIM::DistributionList LDAPSearchDialog::selectDistributionList()
 KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems,
                                                                        KABC::Resource * const resource )
 {
-    const TQDateTime now = TQDateTime::tqcurrentDateTime();
+    const TQDateTime now = TQDateTime::currentDateTime();
     TQStringList importedAddrs;
     KABC::Addressee::List localAddrs;
 
@@ -573,7 +573,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
 
       if ( existing.isEmpty() ) {
         addr.setUid( KApplication::randomString( 10 ) );
-        addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).tqarg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
+        addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
         addr.setResource( resource );
         mCore->addressBook()->insertAddressee( addr );
         TQString displayString;