1 files changed, 16 insertions, 16 deletions

diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp
index e9193c4b2..94cec32a2 100644
--- a/kresources/scalix/kabc/resourcescalix.cpp
+++ b/kresources/scalix/kabc/resourcescalix.cpp
@@ -317,7 +317,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   TQString subResource;
   TQ_UINT32 sernum;
-  if ( mUidMap.tqfind( uid ) != mUidMap.end() ) {
+  if ( mUidMap.find( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
       kdWarning() << "Wow! Something tried to update a non-writable addressee! Fix this caller: " << kdBacktrace() << endl;
@@ -359,7 +359,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
     kdDebug(5650) << "kmailUpdate returned, now sernum=" << sernum << " for uid=" << uid << endl;
     mUidMap[ uid ] = StorageReference( subResource, sernum );
     // This is ugly, but it's faster than doing
-    // mAddrMap.tqfind(addr.uid()), which would give the same :-(
+    // mAddrMap.find(addr.uid()), which would give the same :-(
     // Reason for this: The Changed attribute of Addressee should
     // be mutable
     const_cast<Addressee&>(addr).setChanged( false );
@@ -377,7 +377,7 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   //kdDebug(5650) << k_funcinfo << uid << endl;
   bool ok = false;
-  if ( mUidMap.tqcontains( uid ) ) {
+  if ( mUidMap.contains( uid ) ) {
     mUidsPendingUpdate.append( uid );
   } else {
     mUidsPendingAdding.append( uid );
@@ -392,7 +392,7 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
 void KABC::ResourceScalix::removeAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
-  if ( mUidMap.tqfind( uid ) == mUidMap.end() ) return;
+  if ( mUidMap.find( uid ) == mUidMap.end() ) return;
   //kdDebug(5650) << k_funcinfo << uid << endl;
   const TQString resource = mUidMap[ uid ].resource();
   if ( !subresourceWritable( resource ) ) {
@@ -429,8 +429,8 @@ bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Emit "addressbook changed" if this comes from kmail and not from the GUI
-  if ( !mUidsPendingAdding.tqcontains( uid )
-       && !mUidsPendingUpdate.tqcontains( uid ) ) {
+  if ( !mUidsPendingAdding.contains( uid )
+       && !mUidsPendingUpdate.contains( uid ) ) {
     addressBook()->emitAddressBookChanged();
   } else {
     mUidsPendingAdding.remove( uid );
@@ -451,9 +451,9 @@ void KABC::ResourceScalix::fromKMailDelIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
+  if ( mUidsPendingDeletion.contains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
+  } else if ( mUidsPendingUpdate.contains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
     // replace it, so let's just sit tight.
   } else {
@@ -483,7 +483,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( mSubResources.tqcontains( subResource ) )
+  if ( mSubResources.contains( subResource ) )
     // Already registered
     return;
 
@@ -500,7 +500,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( !mSubResources.tqcontains( subResource ) )
+  if ( !mSubResources.contains( subResource ) )
     // Not registered
     return;
 
@@ -557,7 +557,7 @@ TQStringList KABC::ResourceScalix::subresources() const
 
 bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].active();
   }
 
@@ -569,7 +569,7 @@ bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) cons
 
 bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].writable();
   }
   return false; //better a safe default
@@ -577,7 +577,7 @@ bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) co
 
 int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].completionWeight();
   }
 
@@ -588,7 +588,7 @@ int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresour
 
 TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].label();
   }
 
@@ -598,7 +598,7 @@ TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) c
 
 void KABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     mSubResources[ subresource ].setCompletionWeight( completionWeight );
   } else {
     kdDebug(5650) << "setSubresourceCompletionWeight: subresource " << subresource << " not found" << endl;
@@ -617,7 +617,7 @@ TQMap<TQString, TQString> KABC::ResourceScalix::uidToResourceMap() const
 
 void KABC::ResourceScalix::setSubresourceActive( const TQString &subresource, bool active )
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     mSubResources[ subresource ].setActive( active );
     load();
   } else {