diff options
Diffstat (limited to 'kaddressbook/kabtools.cpp')
| -rw-r--r-- | kaddressbook/kabtools.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index 31d7f3684..3efa42772 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -39,12 +39,12 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList & uint number = 0; do { name = addressee.givenName() + "_" + addressee.familyName() + uniquePart + ".vcf"; - name.tqreplace( ' ', '_' ); - name.tqreplace( '/', '_' ); + name.replace( ' ', '_' ); + name.replace( '/', '_' ); ++number; uniquePart = TQString( "_%1" ).tqarg( number ); - } while ( existingFiles.tqcontains( name ) ); + } while ( existingFiles.contains( name ) ); existingFiles.append( name ); @@ -141,7 +141,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) KABC::Address::List::ConstIterator addrIt( addresses.begin() ); const KABC::Address::List::ConstIterator addrEndIt( addresses.end() ); for ( ; addrIt != addrEndIt; ++addrIt ) { - if ( !masterAddresses.tqcontains( *addrIt ) ) + if ( !masterAddresses.contains( *addrIt ) ) masterAddressee.insertAddress( *addrIt ); } @@ -156,7 +156,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) TQStringList::ConstIterator it( categories.begin() ); TQStringList::ConstIterator endIt( categories.end() ); for ( it = categories.begin(); it != endIt; ++it ) - if ( !masterCategories.tqcontains( *it ) ) + if ( !masterCategories.contains( *it ) ) newCategories.append( *it ); masterAddressee.setCategories( newCategories ); @@ -169,7 +169,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) const TQStringList masterEmails = masterAddressee.emails(); endIt = emails.end(); for ( it = emails.begin(); it != endIt; ++it ) - if ( !masterEmails.tqcontains( *it ) ) + if ( !masterEmails.contains( *it ) ) masterAddressee.insertEmail( *it, false ); // FN @@ -239,7 +239,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) KABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() ); const KABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() ); for ( ; phoneIt != phoneEndIt; ++phoneIt ) - if ( !masterPhones.tqcontains( *phoneIt ) ) + if ( !masterPhones.contains( *phoneIt ) ) masterAddressee.insertPhoneNumber( *phoneIt ); // TITLE @@ -262,7 +262,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) TQStringList newCustoms( masterCustoms ); endIt = customs.end(); for ( it = customs.begin(); it != endIt; ++it ) - if ( !masterCustoms.tqcontains( *it ) ) + if ( !masterCustoms.contains( *it ) ) newCustoms.append( *it ); masterAddressee.setCustoms( newCustoms ); } |