rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 8 insertions, 8 deletions

diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index 508eb74f..d1c03809 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -39,9 +39,9 @@
 #include "KWMailMergeKABCConfig.h"
 
 
-KWMailMergeKABCConfig::KWMailMergeKABCConfig( TQWidget *tqparent, KWMailMergeKABC *db_)
+KWMailMergeKABCConfig::KWMailMergeKABCConfig( TQWidget *parent, KWMailMergeKABC *db_)
         :KDialogBase( Plain, i18n( "Mail Merge - Editor" ),
-                      Ok | Cancel, Ok, tqparent, "", true)
+                      Ok | Cancel, Ok, parent, "", true)
 {
     _db = db_;
 
@@ -119,7 +119,7 @@ void KWMailMergeKABCConfig::addSelectedContacts()
                     destroyAvailableClones( uid );
                 }
             }
-            else if( it.current()->tqparent()->text(0) == i18n("Distribution Lists") )
+            else if( it.current()->parent()->text(0) == i18n("Distribution Lists") )
             {
                 if( selectedLists )
                 {
@@ -336,7 +336,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item )
             }
             delete item;
         }
-        else if( item->tqparent()->text(0) == i18n("Distribution Lists") ) // remove a list
+        else if( item->parent()->text(0) == i18n("Distribution Lists") ) // remove a list
         {
             if( availableLists )
                 availableLists->insertItem( item );
@@ -509,15 +509,15 @@ void KWMailMergeKABCConfig::updateAvailable()
 
 
 
-KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListView *tqparent,
-        const KABC::Addressee& addressEntry ) : TQListViewItem( tqparent )
+KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListView *parent,
+        const KABC::Addressee& addressEntry ) : TQListViewItem( parent )
 {
     setText( 0, addressEntry.formattedName() );
     _addressEntry = addressEntry;
 }
 
-KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListViewItem *tqparent,
-        const KABC::Addressee& addressEntry ) : TQListViewItem( tqparent )
+KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListViewItem *parent,
+        const KABC::Addressee& addressEntry ) : TQListViewItem( parent )
 {
     setText( 0, addressEntry.formattedName() );
     _addressEntry = addressEntry;