1 files changed, 20 insertions, 20 deletions

diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 82084b134..1376932e0 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -611,12 +611,12 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
 {
   if( !msg ) return;
 
-  KMFolder *tqparent = msg->tqparent();
-  Q_ASSERT( tqparent );
+  KMFolder *parent = msg->parent();
+  Q_ASSERT( parent );
   TQ_UINT32 sernum = msg->getMsgSerNum();
 
   // do we have an accumulator for this folder?
-  Accumulator *ac = mAccumulators.find( tqparent->location() );
+  Accumulator *ac = mAccumulators.find( parent->location() );
   if( ac ) {
     TQString s;
     if ( !vPartFoundAndDecoded( msg, s ) ) return;
@@ -634,7 +634,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
   } else {
     /* We are not accumulating for this folder, so this one was added
      * by KMail. Do your thang. */
-     slotIncidenceAdded( msg->tqparent(), msg->getMsgSerNum() );
+     slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() );
   }
 
   if ( mTheUnGetMes.contains( sernum ) ) {
@@ -687,10 +687,10 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
     }
     // Another special case is our own folders, under the imap INBOX, make
     // those prettier too
-    const KMFolder *tqparent = folder;
-    while ( tqparent->tqparent() && tqparent->tqparent()->owner() ) {
-      tqparent = tqparent->tqparent()->owner();
-      if ( tqparent->isSystemFolder() ) {
+    const KMFolder *parent = folder;
+    while ( parent->parent() && parent->parent()->owner() ) {
+      parent = parent->parent()->owner();
+      if ( parent->isSystemFolder() ) {
         TQStringList remainder(parts);
         remainder.pop_front();
         remainder.pop_front();
@@ -1139,7 +1139,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
     // go get the rest of it, then try again
     // TODO: Till, port me
     if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true );
-    FolderJob *job = msg->tqparent()->createJob( msg );
+    FolderJob *job = msg->parent()->createJob( msg );
     connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
         this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) );
     job->start();
@@ -1385,8 +1385,8 @@ void KMailICalIfaceImpl::deleteMsg( KMMessage *msg )
 {
   if( !msg ) return;
   // Commands are now delayed; can't use that anymore, we need immediate deletion
-  //( new KMDeleteMsgCommand( msg->tqparent(), msg ) )->start();
-  KMFolder *srcFolder = msg->tqparent();
+  //( new KMDeleteMsgCommand( msg->parent(), msg ) )->start();
+  KMFolder *srcFolder = msg->parent();
   int idx = srcFolder->find(msg);
   assert(idx != -1);
   // kill existing jobs since we are about to delete the message
@@ -1704,7 +1704,7 @@ void KMailICalIfaceImpl::readConfig()
   const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders();
   TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent();
 
-  // Find the folder tqparent
+  // Find the folder parent
   KMFolderDir* folderParentDir;
   KMFolderType folderType;
   KMFolder* folderParent = kmkernel->findFolderById( parentName );
@@ -1738,7 +1738,7 @@ void KMailICalIfaceImpl::readConfig()
   KMAcctCachedImap::GroupwareType groupwareType = dynamic_cast<KMFolderCachedImap *>( folderParent->storage() )->account()->groupwareType();
 
   if ( groupwareType == KMAcctCachedImap::GroupwareKolab ) {
-    // Make sure the folder tqparent has the subdirs
+    // Make sure the folder parent has the subdirs
     // Globally there are 3 cases: nothing found, some stuff found by type/name heuristics, or everything found OK
     bool noneFound = true;
     bool mustFix = false; // true when at least one was found by heuristics
@@ -2287,13 +2287,13 @@ bool KMailICalIfaceImpl::isResourceQuiet() const
 
 
 bool KMailICalIfaceImpl::addSubresource( const TQString& resource,
-                                         const TQString& tqparent,
+                                         const TQString& parent,
                                          const TQString& contentsType )
 {
-  kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl;
+  kdDebug(5006) << "Adding subresource to parent: " << parent << " with name: " << resource << endl;
   kdDebug(5006) << "contents type: " << contentsType << endl;
-  KMFolder *folder = findResourceFolder( tqparent );
-  KMFolderDir *parentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
+  KMFolder *folder = findResourceFolder( parent );
+  KMFolderDir *parentFolderDir = !parent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
   if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false;
 
   TQString msg;
@@ -2359,10 +2359,10 @@ void KMailICalIfaceImpl::syncFolder(KMFolder * folder) const
   KMFolderCachedImap *dimapFolder = dynamic_cast<KMFolderCachedImap*>( folder->storage() );
   if ( !dimapFolder )
     return;
-  // check if the folder exists already, otherwise sync its tqparent as well to create it
+  // check if the folder exists already, otherwise sync its parent as well to create it
   if ( dimapFolder->imapPath().isEmpty() ) {
-    if ( folder->tqparent() && folder->tqparent()->owner() )
-      syncFolder( folder->tqparent()->owner() );
+    if ( folder->parent() && folder->parent()->owner() )
+      syncFolder( folder->parent()->owner() );
     else
       return;
   }