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

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);
         }
 }