summaryrefslogtreecommitdiffstats
path: root/kmail/kmailicalifaceimpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmailicalifaceimpl.cpp')
-rw-r--r--kmail/kmailicalifaceimpl.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 25a90fd74..bf0e5b8c3 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -1702,16 +1702,16 @@ void KMailICalIfaceImpl::readConfig()
// Read remaining options
const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders();
- TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent();
+ TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent();
// Find the folder tqparent
KMFolderDir* folderParentDir;
KMFolderType folderType;
- KMFolder* folderParent = kmkernel->findFolderById( tqparentName );
+ KMFolder* folderParent = kmkernel->findFolderById( parentName );
if( folderParent == 0 ) {
// Parent folder not found. It was probably deleted. The user will have to
// configure things again.
- kdDebug(5006) << "Groupware folder " << tqparentName << " not found. Groupware functionality disabled" << endl;
+ kdDebug(5006) << "Groupware folder " << parentName << " not found. Groupware functionality disabled" << endl;
// Or maybe the inbox simply wasn't created on the first startup
KMAccount* account = kmkernel->acctMgr()->tqfind( GlobalSettings::self()->theIMAPResourceAccount() );
Q_ASSERT( account );
@@ -1771,12 +1771,12 @@ void KMailICalIfaceImpl::readConfig()
if( noneFound || mustFix ) {
TQString msg;
- TQString tqparentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name();
+ TQString parentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name();
if ( noneFound ) {
// No subfolder was found, so ask if we can make them
msg = i18n("KMail will now create the required groupware folders"
" as subfolders of %1; if you do not want this, cancel"
- " and the IMAP resource will be disabled").tqarg(tqparentFolderName);
+ " and the IMAP resource will be disabled").tqarg(parentFolderName);
} else {
// Some subfolders were found, be more precise
TQString operations = "<ul>";
@@ -1794,7 +1794,7 @@ void KMailICalIfaceImpl::readConfig()
msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2"
"<br>If you do not want this, cancel"
- " and the IMAP resource will be disabled").tqarg(tqparentFolderName, operations);
+ " and the IMAP resource will be disabled").tqarg(parentFolderName, operations);
}
@@ -1959,8 +1959,8 @@ void KMailICalIfaceImpl::readConfig()
void KMailICalIfaceImpl::slotCheckDone()
{
- TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent();
- KMFolder* folderParent = kmkernel->findFolderById( tqparentName );
+ TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent();
+ KMFolder* folderParent = kmkernel->findFolderById( parentName );
//kdDebug(5006) << k_funcinfo << " folderParent=" << folderParent << endl;
if ( folderParent ) // cool it exists now
{
@@ -2003,9 +2003,9 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType
folder =
mFolderParentDir->createFolder( localizedDefaultFolderName( contentsType ), false, type );
if( mFolderType == KMFolderTypeImap ) {
- KMFolderImap* tqparentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() );
- tqparentFolder->createFolder( localizedDefaultFolderName( contentsType ) );
- static_cast<KMFolderImap*>( folder->storage() )->setAccount( tqparentFolder->account() );
+ KMFolderImap* parentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() );
+ parentFolder->createFolder( localizedDefaultFolderName( contentsType ) );
+ static_cast<KMFolderImap*>( folder->storage() )->setAccount( parentFolder->account() );
}
// Groupware folder created, use the global setting for storage format
setStorageFormat( folder, globalStorageFormat() );
@@ -2293,11 +2293,11 @@ bool KMailICalIfaceImpl::addSubresource( const TQString& resource,
kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl;
kdDebug(5006) << "contents type: " << contentsType << endl;
KMFolder *folder = findResourceFolder( tqparent );
- KMFolderDir *tqparentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
- if ( !tqparentFolderDir || tqparentFolderDir->hasNamedFolder( resource ) ) return false;
+ KMFolderDir *parentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
+ if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false;
TQString msg;
- if ( tqparentFolderDir->owner() && !tqparentFolderDir->owner()->isValidName( resource, msg ) ) {
+ if ( parentFolderDir->owner() && !parentFolderDir->owner()->isValidName( resource, msg ) ) {
KMessageBox::error( 0, msg );
return false;
}
@@ -2305,7 +2305,7 @@ bool KMailICalIfaceImpl::addSubresource( const TQString& resource,
KMFolderType type = mFolderType;
if( type == KMFolderTypeUnknown ) type = KMFolderTypeMaildir;
- KMFolder* newFolder = tqparentFolderDir->createFolder( resource, false, type );
+ KMFolder* newFolder = parentFolderDir->createFolder( resource, false, type );
if ( !newFolder ) return false;
if( mFolderType == KMFolderTypeImap )
static_cast<KMFolderImap*>( folder->storage() )->createFolder( resource );