diff options
Diffstat (limited to 'kmail/copyfolderjob.cpp')
| -rw-r--r-- | kmail/copyfolderjob.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp index ddfa6d251..9be07213e 100644 --- a/kmail/copyfolderjob.cpp +++ b/kmail/copyfolderjob.cpp @@ -16,11 +16,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. @@ -67,7 +67,7 @@ CopyFolderJob::~CopyFolderJob() /* * The basic strategy is to first create the target folder, then copy all the mail - * from the source to the target folder, then recurse for each of the folder's children + * from the source to the target folder, then recurse for each of the folder's tqchildren */ void CopyFolderJob::execute() { @@ -113,7 +113,7 @@ void CopyFolderJob::slotCopyCompleted( KMCommand* command ) rollback(); return; } - // if we have children, recurse + // if we have tqchildren, recurse if ( mStorage->folder()->child() ) { slotCopyNextChild(); } else { @@ -144,7 +144,7 @@ void CopyFolderJob::slotCopyNextChild( bool success ) mNextChildFolder = static_cast<KMFolder*>(node); ++mChildFolderNodeIterator; } else { - // no more children, we are done + // no more tqchildren, we are done emit folderCopyComplete( true ); deleteLater(); return; @@ -196,8 +196,8 @@ bool CopyFolderJob::createTargetDir() KMFolderImap* newStorage = static_cast<KMFolderImap*>( mNewFolder->storage() ); connect( selectedStorage, TQT_SIGNAL(folderCreationResult(const TQString&, bool)), this, TQT_SLOT(folderCreationDone(const TQString&, bool)) ); - selectedStorage->createFolder(mStorage->folder()->name(), TQString::null); // create it on the server - newStorage->initializeFrom( selectedStorage, imapPath, TQString::null ); + selectedStorage->createFolder(mStorage->folder()->name(), TQString()); // create it on the server + newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); static_cast<KMFolderImap*>(mNewParent->owner()->storage())->setAccount( selectedStorage->account() ); waitForFolderCreation = true; success = true; |