1 files changed, 13 insertions, 13 deletions
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index e9c481bfb..0acabb09b 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -20,11 +20,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.
@@ -79,7 +79,7 @@ static const char* s_inlineMimeType = "text/x-vcard";
 KABC::ResourceKolab::ResourceKolab( const KConfig *config )
   : KPIM::ResourceABC( config ),
     Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
-    mCachedSubresource( TQString::null ), mCachedSubresourceNotFound( false ), mLocked( false )
+    mCachedSubresource( TQString() ), mCachedSubresourceNotFound( false ), mLocked( false )
 {
   setType( "imap" );
   if ( !config ) {
@@ -144,7 +144,7 @@ KABC::Ticket * KABC::ResourceKolab::requestSaveTicket()
 void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
 {
   mLocked = false;
-  mCachedSubresource = TQString::null;
+  mCachedSubresource = TQString();
   mCachedSubresourceNotFound = false;
   delete ticket;
 }
@@ -185,7 +185,7 @@ static const struct { const char* mimetype; KMailICalIface::StorageFormat format
 bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
 {
   int count = 0;
-  if ( !kmailIncidencesCount( count, TQString::null, subResource ) ) {
+  if ( !kmailIncidencesCount( count, TQString(), subResource ) ) {
     kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
     return false;
   }
@@ -335,7 +335,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   TQString subResource;
   TQ_UINT32 sernum;
-  if ( mUidMap.find( uid ) != mUidMap.end() ) {
+  if ( mUidMap.tqfind( 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;
@@ -398,7 +398,7 @@ bool KABC::ResourceKolab::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.find(addr.uid()), which would give the same :-(
+    // mAddrMap.tqfind(addr.uid()), which would give the same :-(
     // Reason for this: The Changed attribute of Addressee should
     // be mutable
     const_cast<Addressee&>(addr).setChanged( false );
@@ -431,7 +431,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
 void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
-  if ( mUidMap.find( uid ) == mUidMap.end() ) return;
+  if ( mUidMap.tqfind( uid ) == mUidMap.end() ) return;
   //kdDebug(5650) << k_funcinfo << uid << endl;
   const TQString resource = mUidMap[ uid ].resource();
   if ( !subresourceWritable( resource ) ) {
@@ -494,7 +494,7 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
     mUidsPendingDeletion.remove( uid );
   } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // tqreplace it, so let's just sit tight.
+    // replace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     mAddrMap.remove( uid );
@@ -633,7 +633,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
   }
 
   kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n";
-  return TQString::null;
+  return TQString();
 }
 
 void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
@@ -668,9 +668,9 @@ void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, boo
 
 
 /*virtual*/
-bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent )
+bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& tqparent )
 {
-  return kmailAddSubresource( label, parent, s_kmailContentsType );
+  return kmailAddSubresource( label, tqparent, s_kmailContentsType );
 }
 
 /*virtual*/