1 files changed, 8 insertions, 8 deletions

diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index fc41a46b..96ea86b5 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -106,12 +106,12 @@ void KMail::ImportJob::abort( const TQString &errorMessage )
   deleteLater();
 }
 
-KMFolder * KMail::ImportJob::createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions )
+KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions )
 {
-  KMFolder *newFolder = FolderUtil::createSubFolder( tqparent, tqparent->child(), folderName, TQString(),
+  KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(),
                                                      KMFolderTypeMaildir );
   if ( !newFolder ) {
-    abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( tqparent->name() ) );
+    abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parent->name() ) );
     return 0;
   }
   else {
@@ -131,7 +131,7 @@ void KMail::ImportJob::enqueueMessages( const KArchiveDirectory *dir, KMFolder *
   const KArchiveDirectory *messageDir = dynamic_cast<const KArchiveDirectory*>( dir->entry( "cur" ) );
   if ( messageDir ) {
     Messages messagesToQueue;
-    messagesToQueue.tqparent = folder;
+    messagesToQueue.parent = folder;
     const TQStringList entries = messageDir->entries();
     for ( uint i = 0; i < entries.size(); i++ ) {
       const KArchiveEntry *entry = messageDir->entry( entries[i] );
@@ -199,7 +199,7 @@ void KMail::ImportJob::importNextMessage()
     return;
   }
 
-  KMFolder *folder = messages.tqparent;
+  KMFolder *folder = messages.parent;
   if ( folder != mCurrentFolder ) {
     kdDebug(5006) << "importNextMessage(): Processed all messages in the current folder of the queue." << endl;
     if ( mCurrentFolder ) {
@@ -308,7 +308,7 @@ void KMail::ImportJob::importNextDirectory()
   }
 
   Folder folder = mQueuedDirectories.first();
-  KMFolder *currentFolder = folder.tqparent;
+  KMFolder *currentFolder = folder.parent;
   mQueuedDirectories.pop_front();
   kdDebug(5006) << "importNextDirectory(): Working on directory " << folder.archiveDir->name() << endl;
 
@@ -343,7 +343,7 @@ void KMail::ImportJob::importNextDirectory()
 
         Folder newFolder;
         newFolder.archiveDir = dir;
-        newFolder.tqparent = subFolder;
+        newFolder.parent = subFolder;
         kdDebug(5006) << "Enqueueing directory " << entry->name() << endl;
         mQueuedDirectories.push_back( newFolder );
       }
@@ -388,7 +388,7 @@ void KMail::ImportJob::start()
 
   Folder nextFolder;
   nextFolder.archiveDir = mArchive->directory();
-  nextFolder.tqparent = mRootFolder;
+  nextFolder.parent = mRootFolder;
   mQueuedDirectories.push_back( nextFolder );
   importNextDirectory();
 }