From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkdepim/kaddrbook.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'libkdepim/kaddrbook.cpp') diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp index 187ce637..7356bc2d 100644 --- a/libkdepim/kaddrbook.cpp +++ b/libkdepim/kaddrbook.cpp @@ -32,7 +32,7 @@ #include //----------------------------------------------------------------------------- -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("The email address %1 was added to your " "addressbook; you can add more information to this " "entry by opening the addressbook.").arg( addr ); - KMessageBox::information( parent, text, TQString::null, "addedtokabc" ); + KMessageBox::information( tqparent, text, TQString(), "addedtokabc" ); } } else { TQString text = i18n("The email address %1 is already in your " "addressbook.").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 ) -- cgit v1.2.3