4 files changed, 19 insertions, 19 deletions

diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 855611f5..411ee5e5 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -33,8 +33,8 @@
 #include "KWMailMergeKABC.h"
 #include "KWMailMergeKABCConfig.h"
 
-KWMailMergeKABC::KWMailMergeKABC( KInstance *inst, TQObject *tqparent )
-        : KWMailMergeDataSource( inst, tqparent )
+KWMailMergeKABC::KWMailMergeKABC( KInstance *inst, TQObject *parent )
+        : KWMailMergeDataSource( inst, parent )
 {
     _addressBook = KABC::StdAddressBook::self();
     _iterator = _addressBook->begin();
@@ -480,10 +480,10 @@ void KWMailMergeKABC::refresh( bool )
 }
 
 
-void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& tqparent)
+void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent)
 {
     TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
-    tqparent.appendChild(cont);
+    parent.appendChild(cont);
 
     TQValueList<TQString>::ConstIterator it = _individualUIDs.begin();
     for( ; it != _individualUIDs.end(); ++it )
@@ -537,9 +537,9 @@ TQStringList KWMailMergeKABC::singleRecords() const
 
 extern "C"
 {
-    KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( KInstance *inst, TQObject *tqparent )
+    KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( KInstance *inst, TQObject *parent )
     {
-        return new KWMailMergeKABC( inst, tqparent );
+        return new KWMailMergeKABC( inst, parent );
     }
 }
 
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h
index f2754117..0c40f47d 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.h
@@ -36,7 +36,7 @@ class KWMailMergeKABC: public KWMailMergeDataSource
   TQ_OBJECT
 
 public:
-    KWMailMergeKABC( KInstance *inst, TQObject *tqparent );
+    KWMailMergeKABC( KInstance *inst, TQObject *parent );
     ~KWMailMergeKABC();
 
     /**
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;
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
index 32fe74cd..0d0240f1 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
@@ -36,7 +36,7 @@ class KWMailMergeKABCConfig: public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    KWMailMergeKABCConfig( TQWidget *tqparent, KWMailMergeKABC *db_ );
+    KWMailMergeKABCConfig( TQWidget *parent, KWMailMergeKABC *db_ );
     virtual ~KWMailMergeKABCConfig();
 
 
@@ -58,7 +58,7 @@ private slots:
     void launchAddressbook() const;
 
     /**
-       Updates the tqparent's mail merge list from items in the right Listview.
+       Updates the parent's mail merge list from items in the right Listview.
      */
     void acceptSelection();
 
@@ -126,8 +126,8 @@ class KWMailMergeKABCConfigListItem : public TQListViewItem
 {
 
 public:
-    KWMailMergeKABCConfigListItem( TQListView *tqparent, const KABC::Addressee& addressEntry );
-    KWMailMergeKABCConfigListItem( TQListViewItem *tqparent, const KABC::Addressee& addressEntry );
+    KWMailMergeKABCConfigListItem( TQListView *parent, const KABC::Addressee& addressEntry );
+    KWMailMergeKABCConfigListItem( TQListViewItem *parent, const KABC::Addressee& addressEntry );
     virtual ~KWMailMergeKABCConfigListItem();
 
     /**