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, 16 insertions, 16 deletions

diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index a7ebe5c1d..d10e8cfac 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -105,7 +105,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir,
                             true, false, true, false);
 
   if( mFolderDir ) {
-    // search the tqparent folder of the folder
+    // search the parent folder of the folder
     FolderList::ConstIterator it;
     int i = 1;
     for( it = folders.begin(); it != folders.end(); ++it, ++i ) {
@@ -234,9 +234,9 @@ void KMFolderDialog::setFolder( KMFolder* folder )
   mFolder = folder;
 }
 
-static void addLine( TQWidget *tqparent, TQVBoxLayout* tqlayout )
+static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout )
 {
-   TQFrame *line = new TQFrame( tqparent, "line" );
+   TQFrame *line = new TQFrame( parent, "line" );
    line->setGeometry( TQRect( 80, 150, 250, 20 ) );
    line->setFrameShape( TQFrame::HLine );
    line->setFrameShadow( TQFrame::Sunken );
@@ -247,8 +247,8 @@ static void addLine( TQWidget *tqparent, TQVBoxLayout* tqlayout )
 //----------------------------------------------------------------------------
 KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
                                                  const TQString& aName,
-                                                 TQWidget* tqparent, const char* name )
-  : FolderDiaTab( tqparent, name ),
+                                                 TQWidget* parent, const char* name )
+  : FolderDiaTab( parent, name ),
   mSharedSeenFlagsCheckBox( 0 ),
   mDlg( dlg )
 {
@@ -294,20 +294,20 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
         bool parentRightsOk = false;
         bool folderRightsOk = false;
         if ( imap ) {
-          KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() );
+          KMFolderImap * const parent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() );
           folderRights = imap->userRights();
           folderRightsOk = imap->userRightsState() == KMail::ACLJobs::Ok;
-          if ( tqparent ) {
-            parentRights = tqparent->userRights();
-            parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok;
+          if ( parent ) {
+            parentRights = parent->userRights();
+            parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok;
           }
         } else if ( dimap ) {
-          KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() );
+          KMFolderCachedImap * const parent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() );
           folderRights = dimap->userRights();
           folderRightsOk = dimap->userRightsState() == KMail::ACLJobs::Ok;
-          if ( tqparent ) {
-            parentRights = tqparent->userRights();
-            parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok;
+          if ( parent ) {
+            parentRights = parent->userRights();
+            parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok;
           }
         }
 
@@ -325,7 +325,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
     mNameEdit->setEnabled( nameChangeAllowed );
     if ( !nameChangeAllowed ) {
       TQToolTip::add( mNameEdit, i18n( "Not enough permissions to rename this folder.\n"
-                                      "The tqparent folder doesn't have write support.\n"
+                                      "The parent folder doesn't have write support.\n"
                                       "A sync is needed after changing the permissions." ) );
     }
     mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") );
@@ -796,8 +796,8 @@ void FolderDiaGeneralTab::slotChangeIcon( TQString icon ) // can't use a const-r
 
 //----------------------------------------------------------------------------
 KMail::FolderDiaTemplatesTab::FolderDiaTemplatesTab( KMFolderDialog* dlg,
-                                                     TQWidget* tqparent )
-  : FolderDiaTab( tqparent, 0 ), mDlg( dlg )
+                                                     TQWidget* parent )
+  : FolderDiaTab( parent, 0 ), mDlg( dlg )
 {
 
   mIsLocalSystemFolder = mDlg->folder()->isSystemFolder();