diff options
Diffstat (limited to 'kabc')
| -rw-r--r-- | kabc/frontend/mainWindow.ui.h | 12 | ||||
| -rw-r--r-- | kabc/kabc2mutt/kabc2mutt.cpp | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h index 0740d9cf0..421c0d332 100644 --- a/kabc/frontend/mainWindow.ui.h +++ b/kabc/frontend/mainWindow.ui.h @@ -139,8 +139,8 @@ void MainWindow::readAddressee( const KABC::Addressee &a ) TQStringList customs = a.customs(); TQStringList::ConstIterator it5; for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) { - int posDash = (*it5).tqfind( "-" ); - int posColon = (*it5).tqfind( ":" ); + int posDash = (*it5).find( "-" ); + int posColon = (*it5).find( ":" ); TQString app = (*it5).left( posDash ); TQString cname = (*it5).mid( posDash + 1, posColon - posDash - 1 ); @@ -583,8 +583,8 @@ void MainWindow::editCustom() this ); if ( !ok || name.isEmpty() ) return; - int posDash = name.tqfind( "-" ); - int posColon = name.tqfind( ":" ); + int posDash = name.find( "-" ); + int posColon = name.find( ":" ); TQString app = name.left( posDash ); TQString cname = name.mid( posDash + 1, posColon - posDash - 1 ); @@ -610,8 +610,8 @@ void MainWindow::newCustom() this ); if ( !ok || name.isEmpty() ) return; - int posDash = name.tqfind( "-" ); - int posColon = name.tqfind( ":" ); + int posDash = name.find( "-" ); + int posColon = name.find( ":" ); TQString app = name.left( posDash ); TQString cname = name.mid( posDash + 1, posColon - posDash - 1 ); diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp index 7e10dc32e..c12967862 100644 --- a/kabc/kabc2mutt/kabc2mutt.cpp +++ b/kabc/kabc2mutt/kabc2mutt.cpp @@ -53,8 +53,8 @@ void KABC2Mutt::loadingFinished() for ( iaddr = mAddressBook->begin(); iaddr != mAddressBook->end(); ++iaddr ) { const TQString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName(); if ( !mQuery.isEmpty() ) { - bool match = (name.tqfind(mQuery, 0, mIgnoreCase) > -1) || - ((*iaddr).preferredEmail().tqfind( mQuery, 0, mIgnoreCase ) > -1 ); + bool match = (name.find(mQuery, 0, mIgnoreCase) > -1) || + ((*iaddr).preferredEmail().find( mQuery, 0, mIgnoreCase ) > -1 ); if ( !match ) continue; } @@ -86,9 +86,9 @@ void KABC2Mutt::loadingFinished() else if ( !(*iaddr).familyName().isEmpty() ) key = (*iaddr).givenName().left( 1 ).lower() + - (*iaddr).familyName().lower().tqreplace( space, underscore ); + (*iaddr).familyName().lower().replace( space, underscore ); else - key = (*iaddr).givenName().lower().tqreplace( space, underscore ); + key = (*iaddr).givenName().lower().replace( space, underscore ); while ( from != to ) { std::cout << "alias " << key; @@ -101,7 +101,7 @@ void KABC2Mutt::loadingFinished() if ( !(*iaddr).nickName().isEmpty() ) { std::cout << "alias " - << (*iaddr).nickName().lower().tqreplace( space, underscore ) + << (*iaddr).nickName().lower().replace( space, underscore ) << '\t' << name << " <" << (*iaddr).preferredEmail() << '>' << std::endl; } @@ -130,7 +130,7 @@ void KABC2Mutt::loadingFinished() KABC::DistributionList *list = manager.list( *iaddr ); if ( list ) { if ( !mQuery.isEmpty() ) { - bool match = ((*iaddr).tqfind(mQuery) > -1); + bool match = ((*iaddr).find(mQuery) > -1); if ( !match ) continue; } @@ -140,7 +140,7 @@ void KABC2Mutt::loadingFinished() continue; if ( mFormat == Aliases ) { - std::cout << "alias " << (*iaddr).tqreplace( TQRegExp( " " ), "_" ) + std::cout << "alias " << (*iaddr).replace( TQRegExp( " " ), "_" ) << '\t' << emails.join( "," ) << std::endl; } else { std::cout << emails.join( "," ) << '\t' << (*iaddr) << '\t' << std::endl; |