4 files changed, 9 insertions, 9 deletions
diff --git a/kword/mailmerge/sql/KWMySqlCursor.h b/kword/mailmerge/sql/KWMySqlCursor.h
index 4a25323b..8919cc9a 100644
--- a/kword/mailmerge/sql/KWMySqlCursor.h
+++ b/kword/mailmerge/sql/KWMySqlCursor.h
@@ -59,9 +59,9 @@ TQSqlCursor( TQString(), autopopulate )
 TQSqlIndex() ) { return exec( lastQuery() ); }
     TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const { return
 TQSqlIndex(); }
-    int insert( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
-    int update( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
-    int del( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
+    int insert( bool /*invalidate*/ = TRUE ) { return FALSE; }
+    int update( bool /*invalidate*/ = TRUE ) { return FALSE; }
+    int del( bool /*invalidate*/ = TRUE ) { return FALSE; }
     void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {}
 };
 
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index d5e9b4ac..466ac182 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -68,7 +68,7 @@ void KWQtSqlPowerSerialDataSource::refresh(bool force)
 		myquery=new KWMySqlCursor(query,true,database);
 		myquery->setMode(TQSqlCursor::ReadOnly);
 	}
-	kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl;
+	kdDebug()<<TQString("There were %1 rows in the query").arg(myquery->size())<<endl;
 }
 
 TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int record ) const
@@ -79,7 +79,7 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor
 	if ( num < 0 || num > (int)myquery->size() )
 		return name;
 	if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<");
-	if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
+	if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").arg(name);
 	return (myquery->value(name)).toString();
 }
 
@@ -203,7 +203,7 @@ void KWQtSqlPowerMailMergeEditor::slotExecute()
 	cur->setMode(TQSqlCursor::ReadOnly);
 
 	db->clearSampleRecord();
-	kdDebug()<<TQString("Fieldname count %1").tqarg(cur->count())<<endl;
+	kdDebug()<<TQString("Fieldname count %1").arg(cur->count())<<endl;
 	for (uint i=0;i<cur->count();i++)
 		db->addSampleRecordEntry(cur->fieldName(i));
 
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 2181c172..14c3640e 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -59,7 +59,7 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c
         if ( num < 0 || num > (int)myquery->size() )
                 return name;
         if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<");
-        if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
+        if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").arg(name);
         return (myquery->value(name)).toString();
 }
 
@@ -146,7 +146,7 @@ void KWQtSqlSerialDataSource::refresh(bool force)
                 myquery->setMode(TQSqlCursor::ReadOnly);
 		myquery->select(filter);
         }
-        kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl;
+        kdDebug()<<TQString("There were %1 rows in the query").arg(myquery->size())<<endl;
 
 }
 
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index f31a431a..9a333a8d 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -49,7 +49,7 @@ int KWQtSqlSerialDataSourceBase::connectionId=0;
 KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent)
 	: KWMailMergeDataSource(inst,parent)
 {
-	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").tqarg(connectionId++);
+	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++);
 	port=i18n("default");
 }