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

1 files changed, 14 insertions, 14 deletions

diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 94edd591c..bd4d4a51d 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -24,11 +24,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -555,7 +555,7 @@ namespace {
 
 static TQString canonicalAddress( const TQString & _address ) {
   const TQString address = KPIM::getEmailAddress( _address );
-  if ( address.find('@') == -1 ) {
+  if ( address.tqfind('@') == -1 ) {
     // local address
     //char hostname[1024];
     //gethostname(hostname,1024);
@@ -1370,7 +1370,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() {
   dump();
   for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i ) {
     std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
-      d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
+      d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
     if ( pos == d->mFormatInfoMap.end() )
       continue;
     std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1394,7 +1394,7 @@ void Kleo::KeyResolver::addToAllSplitInfos( const std::vector<GpgME::Key> & keys
     if ( !( f & concreteCryptoMessageFormats[i] ) )
       continue;
     std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
-      d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
+      d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
     if ( pos == d->mFormatInfoMap.end() )
       continue;
     std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1560,14 +1560,14 @@ Kpgp::Result Kleo::KeyResolver::showKeyApprovalDialog() {
 std::vector<Kleo::KeyResolver::SplitInfo> Kleo::KeyResolver::encryptionItems( Kleo::CryptoMessageFormat f ) const {
   dump();
   std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
-    d->mFormatInfoMap.find( f );
+    d->mFormatInfoMap.tqfind( f );
   return it != d->mFormatInfoMap.end() ? it->second.splitInfos : std::vector<SplitInfo>() ;
 }
 
 std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f ) const {
   dump();
   std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
-    d->mFormatInfoMap.find( f );
+    d->mFormatInfoMap.tqfind( f );
   return it != d->mFormatInfoMap.end() ? it->second.signKeys : std::vector<GpgME::Key>() ;
 }
 
@@ -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 = tqcontainsOpenPGP( mCryptoMessageFormats );
-  const bool x509 = tqcontainsSMIME( mCryptoMessageFormats );
+  const bool opgp = containsOpenPGP( mCryptoMessageFormats );
+  const bool x509 = containsSMIME( mCryptoMessageFormats );
 
   Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"),
 				msg, KPIM::getEmailAddress(person), selectedKeys,
@@ -1765,12 +1765,12 @@ void Kleo::KeyResolver::addKeys( const std::vector<Item> & items ) {
 Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreferences( const TQString& address ) const
 {
   const Private::ContactPreferencesMap::iterator it =
-    d->mContactPreferencesMap.find( address );
+    d->mContactPreferencesMap.tqfind( address );
   if ( it != d->mContactPreferencesMap.end() )
     return it->second;
 
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  const KABC::Addressee::List res = ab->tqfindByEmail( address );
+  const KABC::Addressee::List res = ab->findByEmail( address );
   ContactPreferences pref;
   if ( !res.isEmpty() ) {
     KABC::Addressee addr = res.first();
@@ -1792,12 +1792,12 @@ 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->tqfindByEmail( email );
+  KABC::Addressee::List res = ab->findByEmail( email );
 
   KABC::Addressee addr;
   if ( res.isEmpty() ) {
      bool ok = true;
-     TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString::null, &ok );
+     TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok );
     if ( ok ) {
       addr.setNameFromString( fullName );
       addr.insertEmail( email, true );