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

20 files changed, 84 insertions, 84 deletions

diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index af23925e..1e6c20fe 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -46,8 +46,8 @@
  *
  ******************************************************************/
 
-KWClassicSerialDataSource::KWClassicSerialDataSource(KInstance *inst,TQObject *tqparent)
-	: KWMailMergeDataSource(inst,tqparent)
+KWClassicSerialDataSource::KWClassicSerialDataSource(KInstance *inst,TQObject *parent)
+	: KWMailMergeDataSource(inst,parent)
 //    : doc( doc_ )
 {
 }
@@ -113,10 +113,10 @@ void KWClassicSerialDataSource::removeRecord( int i )
     db.remove( it );
 }
 
-void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent)
+void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
 {
 	TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
-	tqparent.appendChild(def);
+	parent.appendChild(def);
 	for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 	{
 		TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
@@ -124,7 +124,7 @@ void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent
 		def.appendChild(defEnt);
 	}
 	TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
-	tqparent.appendChild(cont);
+	parent.appendChild(cont);
 	for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
 	{
 		TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
@@ -183,15 +183,15 @@ bool KWClassicSerialDataSource::showConfigDialog(TQWidget *par,int action)
  *
  ******************************************************************/
 
-KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *tqparent )
-    : TQListViewItem( tqparent )
+KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *parent )
+    : TQListViewItem( parent )
 {
     editWidget = new TQLineEdit( listView()->viewport() );
     listView()->addChild( editWidget );
 }
 
-KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *tqparent, TQListViewItem *after )
-    : TQListViewItem( tqparent, after )
+KWClassicMailMergeEditorListItem::KWClassicMailMergeEditorListItem( TQListView *parent, TQListViewItem *after )
+    : TQListViewItem( parent, after )
 {
     editWidget = new TQLineEdit( listView()->viewport() );
     listView()->addChild( editWidget );
@@ -238,8 +238,8 @@ void KWClassicMailMergeEditorListItem::update()
  *
  ******************************************************************/
 
-KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *tqparent, KWClassicSerialDataSource *db_ )
-    : TQListView( tqparent ), db( db_ )
+KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *parent, KWClassicSerialDataSource *db_ )
+    : TQListView( parent ), db( db_ )
 {
     setSorting( -1 );
     addColumn( i18n( "Name" ) );
@@ -329,8 +329,8 @@ void KWClassicMailMergeEditorList::displayRecord( int i )
  *
  ******************************************************************/
 
-KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *tqparent, KWClassicSerialDataSource *db_ )
-    : KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ )
+KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicSerialDataSource *db_ )
+    : KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ )
 {
     back = plainPage();
 
@@ -561,9 +561,9 @@ void KWClassicMailMergeEditor::removeRecord()
 }
 
 extern "C" {
-	KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(KInstance *inst,TQObject *tqparent)
+	KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(KInstance *inst,TQObject *parent)
 	{
-		return new KWClassicSerialDataSource(inst,tqparent);
+		return new KWClassicSerialDataSource(inst,parent);
 	}
 
 }
diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h
index 43416b07..03e1ddb3 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.h
+++ b/kword/mailmerge/KWClassicSerialDataSource.h
@@ -48,7 +48,7 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource
     Q_OBJECT
   TQ_OBJECT
     public:
-    KWClassicSerialDataSource(KInstance *inst,TQObject *tqparent);
+    KWClassicSerialDataSource(KInstance *inst,TQObject *parent);
     ~KWClassicSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
@@ -81,8 +81,8 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource
 class KWClassicMailMergeEditorListItem : public TQListViewItem
 {
 public:
-    KWClassicMailMergeEditorListItem( TQListView *tqparent );
-    KWClassicMailMergeEditorListItem( TQListView *tqparent, TQListViewItem *after );
+    KWClassicMailMergeEditorListItem( TQListView *parent );
+    KWClassicMailMergeEditorListItem( TQListView *parent, TQListViewItem *after );
     virtual ~KWClassicMailMergeEditorListItem();
 
     virtual void setText( int i, const TQString &text );
@@ -107,7 +107,7 @@ class KWClassicMailMergeEditorList : public TQListView
   TQ_OBJECT
 
 public:
-    KWClassicMailMergeEditorList( TQWidget *tqparent, KWClassicSerialDataSource *db_ );
+    KWClassicMailMergeEditorList( TQWidget *parent, KWClassicSerialDataSource *db_ );
     virtual ~KWClassicMailMergeEditorList();
 
     void invalidateCurrentRecord();
@@ -140,7 +140,7 @@ class KWClassicMailMergeEditor : public KDialogBase
   TQ_OBJECT
 
 public:
-    KWClassicMailMergeEditor( TQWidget *tqparent, KWClassicSerialDataSource *db_ );
+    KWClassicMailMergeEditor( TQWidget *parent, KWClassicSerialDataSource *db_ );
 
 protected:
     void resizeEvent( TQResizeEvent *e );
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();
 
     /**
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index e48fbf34..6801a64a 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -29,8 +29,8 @@
 
 using namespace KSpread;
 
-KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *tqparent )
-  : KWMailMergeDataSource( instance, tqparent ), _spreadSheetNumber( 1 )
+KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *parent )
+  : KWMailMergeDataSource( instance, parent ), _spreadSheetNumber( 1 )
 {
 }
 
@@ -72,10 +72,10 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem )
   initDocument();
 }
 
-void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& tqparent )
+void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent )
 {
   TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) );
-  tqparent.appendChild( content );
+  parent.appendChild( content );
 
   content.setAttribute( "URL", _url.url() );
   content.setAttribute( "SpreadSheetNumber", _spreadSheetNumber );
@@ -85,9 +85,9 @@ void KWMailMergeKSpread::refresh( bool )
 {
 }
 
-bool KWMailMergeKSpread::showConfigDialog( TQWidget *tqparent, int )
+bool KWMailMergeKSpread::showConfigDialog( TQWidget *parent, int )
 {
-  KWMailMergeKSpreadConfig dlg( tqparent, this );
+  KWMailMergeKSpreadConfig dlg( parent, this );
 
   int retval = dlg.exec();
   if ( retval )
@@ -202,9 +202,9 @@ TQString KWMailMergeKSpread::cellText( const Cell *cell ) const
 
 extern "C"
 {
-  KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *tqparent )
+  KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *parent )
   {
-    return new KWMailMergeKSpread( instance, tqparent );
+    return new KWMailMergeKSpread( instance, parent );
   }
 }
 
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h
index 2b039c01..e5b1bb2f 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h
@@ -35,7 +35,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource
   TQ_OBJECT
 
   public:
-    KWMailMergeKSpread( KInstance *inst, TQObject *tqparent );
+    KWMailMergeKSpread( KInstance *inst, TQObject *parent );
     ~KWMailMergeKSpread();
 
     /**
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
index 00f1ba20..f08ae82e 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
@@ -34,9 +34,9 @@
 
 using namespace KSpread;
 
-KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *tqparent, KWMailMergeKSpread *object )
+KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMergeKSpread *object )
   : KDialogBase( Plain, i18n( "Mail Merge - Editor" ),
-                 Ok | Cancel, Ok, tqparent, "", true ),
+                 Ok | Cancel, Ok, parent, "", true ),
     _document( 0 ), _initialPage( 1 )
 {
   _object = object;
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h
index 31706e76..21d6206e 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h
@@ -36,7 +36,7 @@ class KWMailMergeKSpreadConfig: public KDialogBase
   TQ_OBJECT
 
   public:
-    KWMailMergeKSpreadConfig( TQWidget *tqparent, KWMailMergeKSpread *object );
+    KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMergeKSpread *object );
     virtual ~KWMailMergeKSpreadConfig();
 
 
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
index aec361a3..3db1d9d6 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
@@ -6,8 +6,8 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *tqparent)
-        :KDialogBase( Swallow, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true)
+KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent)
+        :KDialogBase( Swallow, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true)
 {
        m_fieldList << "" <<"one" << "two" << "three" << "four";
        m_sortingList << ""<<i18n("ascending")<<i18n("descending");
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.h b/kword/mailmerge/sql/KWQtSqlEasyFilter.h
index 1384dec7..f95f46b3 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.h
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.h
@@ -12,7 +12,7 @@ class KWQtSqlEasyFilter: public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-    KWQtSqlEasyFilter( TQWidget *tqparent);
+    KWQtSqlEasyFilter( TQWidget *parent);
     virtual ~KWQtSqlEasyFilter();
 protected:
     void createColumn(int i);
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
index 2518399b..d3feca22 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
@@ -37,8 +37,8 @@
  *
  ******************************************************************/
 
-KWQtSqlMailMergeOpen::KWQtSqlMailMergeOpen( TQWidget *tqparent, KWQtSqlSerialDataSourceBase *db_ )
-        :KDialogBase( Plain, i18n( "Mail Merge - Setup Database Connection" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ ){
+KWQtSqlMailMergeOpen::KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataSourceBase *db_ )
+        :KDialogBase( Plain, i18n( "Mail Merge - Setup Database Connection" ), Ok | Cancel, Ok, parent, "", true ), db( db_ ){
         (new TQVBoxLayout(plainPage()))->setAutoAdd(true);
         setMainWidget(widget=new KWQtSqlOpenWidget(plainPage()));
         widget->drivers->insertStringList(TQSqlDatabase::drivers());
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h
index 949dc2c6..39430517 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h
@@ -39,7 +39,7 @@ class KWQtSqlMailMergeOpen : public KDialogBase
   TQ_OBJECT
 
 public:
-    KWQtSqlMailMergeOpen( TQWidget *tqparent, KWQtSqlSerialDataSourceBase *db_ );
+    KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataSourceBase *db_ );
     ~KWQtSqlMailMergeOpen();
 private:
  KWQtSqlSerialDataSourceBase *db;
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index c091184e..bbaf97d6 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -41,8 +41,8 @@
  *
  ******************************************************************/
 
-KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *tqparent)
-	: KWQtSqlSerialDataSourceBase(inst,tqparent),myquery(0)
+KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent)
+	: KWQtSqlSerialDataSourceBase(inst,parent),myquery(0)
 {
 	port=i18n("default");
 }
@@ -83,10 +83,10 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor
 	return (myquery->value(name)).toString();
 }
 
-void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent)
+void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
 {
         TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
-        tqparent.appendChild(def);
+        parent.appendChild(def);
         {
                 TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("DATABASE"));
                 defEnt.setAttribute(TQString::tqfromLatin1("hostname"),hostname);
@@ -101,7 +101,7 @@ void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqpar
 		def.appendChild(defEnt);
 
 		TQDomElement sampleEnt=doc.createElement(TQString::tqfromLatin1("SAMPLERECORD"));
-		tqparent.appendChild(sampleEnt);
+		parent.appendChild(sampleEnt);
 	        for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
         	{
                 	TQDomElement fieldEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
@@ -175,8 +175,8 @@ void KWQtSqlPowerSerialDataSource::addSampleRecordEntry(TQString name)
  *
  ******************************************************************/
 
-KWQtSqlPowerMailMergeEditor::KWQtSqlPowerMailMergeEditor( TQWidget *tqparent, KWQtSqlPowerSerialDataSource *db_ )
-	:KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ )
+KWQtSqlPowerMailMergeEditor::KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQtSqlPowerSerialDataSource *db_ )
+	:KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ )
 {
         (new TQVBoxLayout(plainPage()))->setAutoAdd(true);
         setMainWidget(widget=new KWQtSqlPowerWidget(plainPage()));
@@ -249,8 +249,8 @@ KWQtSqlPowerMailMergeEditor::~KWQtSqlPowerMailMergeEditor(){;}
 
 
 extern "C" {
-        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(KInstance *inst,TQObject *tqparent)
+        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(KInstance *inst,TQObject *parent)
         {
-                return new KWQtSqlPowerSerialDataSource(inst,tqparent);
+                return new KWQtSqlPowerSerialDataSource(inst,parent);
         }
 }
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
index 6870afe1..3d364338 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
@@ -47,7 +47,7 @@ class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase
     Q_OBJECT
 //    TQ_OBJECT
     public:
-    KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *tqparent);
+    KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent);
     ~KWQtSqlPowerSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
@@ -81,7 +81,7 @@ class KWQtSqlPowerMailMergeEditor : public KDialogBase
 //    TQ_OBJECT
 
 public:
-    KWQtSqlPowerMailMergeEditor( TQWidget *tqparent, KWQtSqlPowerSerialDataSource *db_ );
+    KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQtSqlPowerSerialDataSource *db_ );
     ~KWQtSqlPowerMailMergeEditor();
 private:
  KWQtSqlPowerSerialDataSource *db;
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 45ff85bc..ec31df35 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -38,8 +38,8 @@
  *
  ******************************************************************/
 
-KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,TQObject *tqparent)
-	: KWQtSqlSerialDataSourceBase(inst,tqparent)
+KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent)
+	: KWQtSqlSerialDataSourceBase(inst,parent)
 {
   myquery=0;
 }
@@ -63,11 +63,11 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c
         return (myquery->value(name)).toString();
 }
 
-void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*tqparent*/)
+void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*parent*/)
 {
 /*
 	TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
-	tqparent.appendChild(def);
+	parent.appendChild(def);
 	for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 	{
 		TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
@@ -75,7 +75,7 @@ void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*tq
 		def.appendChild(defEnt);
 	}
 	TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
-	tqparent.appendChild(cont);
+	parent.appendChild(cont);
 	for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
 	{
 		TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
@@ -162,8 +162,8 @@ void KWQtSqlSerialDataSource::refresh(bool force)
 
 
 
-KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( TQWidget *tqparent, KWQtSqlSerialDataSource *db_ )
-        :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ )
+KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSerialDataSource *db_ )
+        :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ )
 {
 	tableName=db->tableName;
 	filter=db->filter;
@@ -206,13 +206,13 @@ void KWQtSqlDataSourceEditor::slotSetQuery()
 
 void KWQtSqlDataSourceEditor::editFilter()
 {
-	KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(tqparent()));
+	KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(parent()));
 	f->exec();
 }
 
 extern "C" {
-        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *tqparent)
+        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *parent)
         {
-                return new KWQtSqlSerialDataSource(inst,tqparent);
+                return new KWQtSqlSerialDataSource(inst,parent);
         }
 }
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
index cc6061a9..ed25b4ee 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
@@ -36,7 +36,7 @@
 class KWQtSqlSerialDataSource: public KWQtSqlSerialDataSourceBase
 {
     public:
-    KWQtSqlSerialDataSource(KInstance *inst,TQObject *tqparent);
+    KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent);
     ~KWQtSqlSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
@@ -67,7 +67,7 @@ class KWQtSqlDataSourceEditor : public KDialogBase
   TQ_OBJECT
 
 public:
-    KWQtSqlDataSourceEditor( TQWidget *tqparent, KWQtSqlSerialDataSource *db_ );
+    KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSerialDataSource *db_ );
     ~KWQtSqlDataSourceEditor(){;}
 private:
   KWQtSqlSerialDataSource *db;
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index 040c657e..f31a431a 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -46,10 +46,10 @@
 
 int KWQtSqlSerialDataSourceBase::connectionId=0;
 
-KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *tqparent)
-	: KWMailMergeDataSource(inst,tqparent)
+KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent)
+	: KWMailMergeDataSource(inst,parent)
 {
-	DataBaseConnection=TQString("KWTQTSQLPOWER")+tqparent->name()+TQString("--%1").tqarg(connectionId++);
+	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").tqarg(connectionId++);
 	port=i18n("default");
 }
 
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
index ee4e02a8..1f3e4396 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
@@ -41,7 +41,7 @@ class KWQtSqlSerialDataSourceBase: public KWMailMergeDataSource
 //    TQ_OBJECT
     K_DCOP
     public:
-    KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *tqparent);
+    KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent);
     ~KWQtSqlSerialDataSourceBase();
 
    virtual bool showConfigDialog(TQWidget *par,int action);