diff options
Diffstat (limited to 'kmail/folderutil.cpp')
-rw-r--r-- | kmail/folderutil.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp index e227113db..6e1a2f88c 100644 --- a/kmail/folderutil.cpp +++ b/kmail/folderutil.cpp @@ -28,18 +28,18 @@ using namespace KMail; using namespace FolderUtil; -KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir, +KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, const TQString &folderName, const TQString &namespaceName, KMFolderType localFolderType ) { KMFolder *newFolder = 0; - if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeImap ) { - KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( tqparentFolder->storage() ); + if ( parentFolder && parentFolder->folderType() == KMFolderTypeImap ) { + KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( parentFolder->storage() ); KMAcctImap *anAccount = selectedStorage->account(); // check if a connection is available BEFORE creating the folder if (anAccount->makeConnection() == ImapAccountBase::Connected) { - newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, tqparentDir ); + newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir ); if ( newFolder ) { TQString imapPath, tqparent; if ( !namespaceName.isEmpty() ) { @@ -52,15 +52,15 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolder KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() ); selectedStorage->createFolder(folderName, tqparent); // create it on the server newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); - static_cast<KMFolderImap*>(tqparentFolder->storage())->setAccount( selectedStorage->account() ); + static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() ); return newFolder; } } - } else if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeCachedImap ) { + } else if ( parentFolder && parentFolder->folderType() == KMFolderTypeCachedImap ) { newFolder = kmkernel->dimapFolderMgr()->createFolder( folderName, false, KMFolderTypeCachedImap, - tqparentDir ); + parentDir ); if ( newFolder ) { - KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( tqparentFolder->storage() ); + KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( parentFolder->storage() ); KMFolderCachedImap* newStorage = static_cast<KMFolderCachedImap*>( newFolder->storage() ); newStorage->initializeFrom( selectedStorage ); if ( !namespaceName.isEmpty() ) { @@ -75,7 +75,7 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolder // local folder Q_ASSERT( localFolderType == KMFolderTypeMaildir || localFolderType == KMFolderTypeMbox ); newFolder = kmkernel->folderMgr()->createFolder( folderName, false, localFolderType, - tqparentDir ); + parentDir ); return newFolder; } |