1 files changed, 12 insertions, 12 deletions

diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 08fe43e01..df8b4daf1 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -90,13 +90,13 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
     connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
              aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
     connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
-             tqparent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
+             parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
     connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ),
-             tqparent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
+             parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
     connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*,  int ) ),
-             tqparent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
+             parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
     connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ),
-             tqparent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
+             parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
   }
 
   // Resend all mStorage signals
@@ -284,11 +284,11 @@ KMFolderDir* KMFolder::createChildFolder()
   else if( folderType() == KMFolderTypeImap )
     newType = KMImapDir;
 
-  mChild = new KMFolderDir( this, tqparent(), childName, newType );
+  mChild = new KMFolderDir( this, parent(), childName, newType );
   if( !mChild )
     return 0;
   mChild->reload();
-  tqparent()->append( mChild );
+  parent()->append( mChild );
   return mChild;
 }
 
@@ -593,8 +593,8 @@ TQString KMFolder::label() const
 TQString KMFolder::prettyURL() const
 {
   TQString parentUrl;
-  if ( tqparent() )
-    parentUrl = tqparent()->prettyURL();
+  if ( parent() )
+    parentUrl = parent()->prettyURL();
   if ( !parentUrl.isEmpty() )
     return parentUrl + '/' + label();
   else
@@ -704,11 +704,11 @@ void KMFolder::correctUnreadMsgsCount()
 
 TQString KMFolder::idString() const
 {
-  KMFolderNode* folderNode = tqparent();
+  KMFolderNode* folderNode = parent();
   if (!folderNode)
     return "";
-  while ( folderNode->tqparent() )
-    folderNode = folderNode->tqparent();
+  while ( folderNode->parent() )
+    folderNode = folderNode->parent();
   TQString myPath = path();
   int pathLen = myPath.length() - folderNode->path().length();
   TQString relativePath = myPath.right( pathLen );
@@ -890,7 +890,7 @@ void KMFolder::slotContentsTypeChanged( KMail::FolderContentsType type )
 void KMFolder::slotFolderSizeChanged()
 {
   emit folderSizeChanged( this );
-  KMFolder* papa = tqparent()->manager()->parentFolder( this );
+  KMFolder* papa = parent()->manager()->parentFolder( this );
   if ( papa && papa != this ) {
     papa->slotFolderSizeChanged();
   }