1 files changed, 15 insertions, 15 deletions

diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp
index 187ce6375..7356bc2d8 100644
--- a/libkdepim/kaddrbook.cpp
+++ b/libkdepim/kaddrbook.cpp
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 //-----------------------------------------------------------------------------
-void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
+void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *tqparent ) {
   TQString email;
   TQString name;
 
@@ -56,7 +56,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
   }
 #endif
 
-  KABC::Addressee::List addressees = ab->tqfindByEmail( email );
+  KABC::Addressee::List addressees = ab->findByEmail( email );
 
   if ( addressees.count() > 0 ) {
     if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){
@@ -78,12 +78,12 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
 #else
     TQString text = email + " " + i18n( "is not in address book" );
 #endif
-    KMessageBox::information( parent, text, TQString::null, "notInAddressBook" );
+    KMessageBox::information( tqparent, text, TQString(), "notInAddressBook" );
   }
 }
 
 //-----------------------------------------------------------------------------
-void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
+void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) {
   TQString email;
   TQString name;
 
@@ -91,7 +91,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
 
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
 
-  ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
+  ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) );
 
   // force a reload of the address book file so that changes that were made
   // by other programs are loaded
@@ -109,7 +109,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
   }
 #endif
 
-  KABC::Addressee::List addressees = ab->tqfindByEmail( email );
+  KABC::Addressee::List addressees = ab->findByEmail( email );
 
   if ( addressees.isEmpty() ) {
     KABC::Addressee a;
@@ -151,12 +151,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
       TQString text = i18n("<qt>The email address <b>%1</b> was added to your "
                           "addressbook; you can add more information to this "
                           "entry by opening the addressbook.</qt>").arg( addr );
-      KMessageBox::information( parent, text, TQString::null, "addedtokabc" );
+      KMessageBox::information( tqparent, text, TQString(), "addedtokabc" );
     }
   } else {
     TQString text = i18n("<qt>The email address <b>%1</b> is already in your "
                         "addressbook.</qt>").arg( addr );
-    KMessageBox::information( parent, text, TQString::null,
+    KMessageBox::information( tqparent, text, TQString(),
                               "alreadyInAddressBook" );
   }
   ab->setErrorHandler( 0 );
@@ -173,22 +173,22 @@ void KAddrBookExternal::addNewAddressee( TQWidget* )
   call.send("newContact()");
 }
 
-bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *parent )
+bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tqparent )
 {
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
   bool inserted = false;
 
-  ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
+  ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) );
 
   KABC::Addressee::List addressees =
-      ab->tqfindByEmail( addressee.preferredEmail() );
+      ab->findByEmail( addressee.preferredEmail() );
 
   if ( addressees.isEmpty() ) {
     if ( KAddrBookExternal::addAddressee( addressee ) ) {
       TQString text = i18n("The VCard was added to your addressbook; "
                           "you can add more information to this "
                           "entry by opening the addressbook.");
-      KMessageBox::information( parent, text, TQString::null, "addedtokabc" );
+      KMessageBox::information( tqparent, text, TQString(), "addedtokabc" );
       inserted = true;
     }
   } else {
@@ -196,7 +196,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *pa
                         "your addressbook; however, you may save the VCard "
                         "into a file and import it into the addressbook "
                         "manually.");
-    KMessageBox::information( parent, text );
+    KMessageBox::information( tqparent, text );
     inserted = true;
   }
 
@@ -229,7 +229,7 @@ bool KAddrBookExternal::addAddressee( const KABC::Addressee& addr )
 TQString KAddrBookExternal::expandDistributionList( const TQString& listName )
 {
   if ( listName.isEmpty() )
-    return TQString::null;
+    return TQString();
 
   const TQString lowerListName = listName.lower();
   KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
@@ -251,7 +251,7 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName )
     }
   }
 #endif
-  return TQString::null;
+  return TQString();
 }
 
 KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *addressBook )