diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
| commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
| tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kmail/keyresolver.cpp | |
| parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
| download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip | |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/keyresolver.cpp')
| -rw-r--r-- | kmail/keyresolver.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index 3c1a952ca..94edd591c 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -1379,7 +1379,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() { SplitInfo & si = v.front(); for ( std::vector<SplitInfo>::const_iterator it = v.begin() + 1; it != v.end() ; ++it ) { si.keys.insert( si.keys.end(), it->keys.begin(), it->keys.end() ); - qCopy( it->recipients.begin(), it->recipients.end(), std::back_inserter( si.recipients ) ); + tqCopy( it->recipients.begin(), it->recipients.end(), std::back_inserter( si.recipients ) ); } v.resize( 1 ); } @@ -1579,8 +1579,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f ) std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys( const TQString & person, const TQString & msg, const std::vector<GpgME::Key> & selectedKeys ) const { - const bool opgp = containsOpenPGP( mCryptoMessageFormats ); - const bool x509 = containsSMIME( mCryptoMessageFormats ); + const bool opgp = tqcontainsOpenPGP( mCryptoMessageFormats ); + const bool x509 = tqcontainsSMIME( mCryptoMessageFormats ); Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"), msg, KPIM::getEmailAddress(person), selectedKeys, @@ -1770,7 +1770,7 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference return it->second; KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); - const KABC::Addressee::List res = ab->findByEmail( address ); + const KABC::Addressee::List res = ab->tqfindByEmail( address ); ContactPreferences pref; if ( !res.isEmpty() ) { KABC::Addressee addr = res.first(); @@ -1792,7 +1792,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont { d->mContactPreferencesMap.insert( std::make_pair( email, pref ) ); KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); - KABC::Addressee::List res = ab->findByEmail( email ); + KABC::Addressee::List res = ab->tqfindByEmail( email ); KABC::Addressee addr; if ( res.isEmpty() ) { |