1 files changed, 18 insertions, 18 deletions

diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 4fc57d2c1..134a71020 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -19,11 +19,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.
@@ -134,8 +134,8 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
   TQValueList<KMFolderCachedImap*> folderList;
   TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
-    if ((*it).parent)
-      folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
+    if ((*it).tqparent)
+      folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage());
     // Kill the job - except if it's the one that already died and is calling us
     if ( !it.key()->error() && mSlave ) {
       it.key()->kill();
@@ -163,8 +163,8 @@ void KMAcctCachedImap::cancelMailCheck()
   TQValueList<KMFolderCachedImap*> folderList;
   TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
   for (; it != mapJobData.end(); ++it) {
-    if ( (*it).cancellable && (*it).parent )
-      folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
+    if ( (*it).cancellable && (*it).tqparent )
+      folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage());
   }
   // Kill jobs
   ImapAccountBase::cancelMailCheck();
@@ -186,7 +186,7 @@ void KMAcctCachedImap::slotCheckQueuedFolders()
     mMailCheckFolders.append( mFoldersQueuedForChecking.front() );
     mFoldersQueuedForChecking.pop_front();
     if ( mFoldersQueuedForChecking.isEmpty() )
-      disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+      disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
                   this, TQT_SLOT( slotCheckQueuedFolders() ) );
 
     kmkernel->acctMgr()->singleCheckMail(this, true);
@@ -243,7 +243,7 @@ void KMAcctCachedImap::processNewMail( KMFolderCachedImap* folder,
   mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
     "MailCheck" + TQString::number( id() ),
     TQStyleSheet::escape( folder->label() ), // will be changed immediately in serverSync anyway
-    TQString::null,
+    TQString(),
     true, // can be cancelled
     useSSL() || useTLS() );
   connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
@@ -287,7 +287,7 @@ void KMAcctCachedImap::addUnreadMsgCount( const KMFolderCachedImap *folder,
     // therefore doesn't need to be counted here
     const TQString folderId = folder->folder()->idString();
     int newInFolder = countUnread;
-    if ( mUnreadBeforeCheck.find( folderId ) != mUnreadBeforeCheck.end() )
+    if ( mUnreadBeforeCheck.tqfind( folderId ) != mUnreadBeforeCheck.end() )
       newInFolder -= mUnreadBeforeCheck[folderId];
     if ( newInFolder > 0 )
       addToNewInFolder( folderId, newInFolder );
@@ -310,7 +310,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder,
 
 void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
   ImapAccountBase::readConfig( config );
-  // Apparently this method is only ever called once (from KMKernel::init) so this is ok
+  // Aptqparently this method is only ever called once (from KMKernel::init) so this is ok
   mPreviouslyDeletedFolders = config.readListEntry( "deleted-folders" );
   mDeletedFolders.clear(); // but just in case...
   const TQStringList oldPaths = config.readListEntry( "renamed-folders-paths" );
@@ -318,7 +318,7 @@ void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
   TQStringList::const_iterator it = oldPaths.begin();
   TQStringList::const_iterator nameit = newNames.begin();
   for( ; it != oldPaths.end() && nameit != newNames.end(); ++it, ++nameit ) {
-    addRenamedFolder( *it, TQString::null, *nameit );
+    addRenamedFolder( *it, TQString(), *nameit );
   }
   mGroupwareType = (GroupwareType)config.readNumEntry( "groupwareType", GroupwareKolab );
 }
@@ -351,7 +351,7 @@ void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder )
   TQStringList strList;
   TQValueList<TQGuardedPtr<KMFolder> > folderList;
   kmkernel->dimapFolderMgr()->createFolderList( &strList, &folderList,
-                                                folder->folder()->child(), TQString::null,
+                                                folder->folder()->child(), TQString(),
                                                 false );
   TQValueList<TQGuardedPtr<KMFolder> >::Iterator it;
   mCountLastUnread = 0;
@@ -417,12 +417,12 @@ TQStringList KMAcctCachedImap::deletedFolderPaths( const TQString& subFolderPath
 
 bool KMAcctCachedImap::isDeletedFolder( const TQString& subFolderPath ) const
 {
-  return mDeletedFolders.find( subFolderPath ) != mDeletedFolders.end();
+  return mDeletedFolders.tqfind( subFolderPath ) != mDeletedFolders.end();
 }
 
 bool KMAcctCachedImap::isPreviouslyDeletedFolder( const TQString& subFolderPath ) const
 {
-  return mPreviouslyDeletedFolders.find( subFolderPath ) != mPreviouslyDeletedFolders.end();
+  return mPreviouslyDeletedFolders.tqfind( subFolderPath ) != mPreviouslyDeletedFolders.end();
 }
 
 void KMAcctCachedImap::removeDeletedFolder( const TQString& subFolderPath )
@@ -447,7 +447,7 @@ void KMAcctCachedImap::slotProgressItemCanceled( ProgressItem* )
   killAllJobs( abortConnection );
   if ( abortConnection ) {
     // If we were trying to connect, tell kmfoldercachedimap so that it moves on
-    emit connectionResult( KIO::ERR_USER_CANCELED, TQString::null );
+    emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
   }
 }
 
@@ -459,10 +459,10 @@ FolderStorage* KMAcctCachedImap::rootFolder() const
 
 TQString KMAcctCachedImap::renamedFolder( const TQString& imapPath ) const
 {
-  TQMap<TQString, RenamedFolder>::ConstIterator renit = mRenamedFolders.find( imapPath );
+  TQMap<TQString, RenamedFolder>::ConstIterator renit = mRenamedFolders.tqfind( imapPath );
   if ( renit != mRenamedFolders.end() )
     return (*renit).mNewName;
-  return TQString::null;
+  return TQString();
 }
 
 #include "kmacctcachedimap.moc"