rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 6 deletions

diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp
index 6e1a2f88..40b543be 100644
--- a/kmail/folderutil.cpp
+++ b/kmail/folderutil.cpp
@@ -41,16 +41,16 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi
     if (anAccount->makeConnection() == ImapAccountBase::Connected) {
       newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir );
       if ( newFolder ) {
-        TQString imapPath, tqparent;
+        TQString imapPath, parent;
         if ( !namespaceName.isEmpty() ) {
           // create folder with namespace
-          tqparent = anAccount->addPathToNamespace( namespaceName );
-          imapPath = anAccount->createImapPath( tqparent, folderName );
+          parent = anAccount->addPathToNamespace( namespaceName );
+          imapPath = anAccount->createImapPath( parent, folderName );
         } else {
           imapPath = anAccount->createImapPath( selectedStorage->imapPath(), folderName );
         }
         KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() );
-        selectedStorage->createFolder(folderName, tqparent); // create it on the server
+        selectedStorage->createFolder(folderName, parent); // create it on the server
         newStorage->initializeFrom( selectedStorage, imapPath, TQString() );
         static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() );
         return newFolder;
@@ -82,14 +82,14 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi
   return newFolder;
 }
 
-void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent )
+void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent )
 {
   if ( folderToDelete->hasAccounts() ) {
     // this folder has an account, so we need to change that to the inbox
     for ( AccountList::Iterator it (folderToDelete->acctList()->begin() ),
            end( folderToDelete->acctList()->end() ); it != end; ++it ) {
       (*it)->setFolder( kmkernel->inboxFolder() );
-      KMessageBox::information(tqparent,
+      KMessageBox::information(parent,
           i18n("<qt>The folder you deleted was associated with the account "
             "<b>%1</b> which delivered mail into it. The folder the account "
             "delivers new mail into was reset to the main Inbox folder.</qt>").tqarg( (*it)->name()));