1 files changed, 20 insertions, 20 deletions

diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 738cf6d7..518699a8 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, QObject *parent )
-  : KWMailMergeDataSource( instance, parent ), _spreadSheetNumber( 1 )
+KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *tqparent )
+  : KWMailMergeDataSource( instance, tqparent ), _spreadSheetNumber( 1 )
 {
 }
 
@@ -43,7 +43,7 @@ int KWMailMergeKSpread::getNumRecords() const
   return rows() - 2;
 }
 
-QString KWMailMergeKSpread::getValue( const QString &name, int record ) const
+TQString KWMailMergeKSpread::getValue( const TQString &name, int record ) const
 {
   if ( record < 0 )
     return name;
@@ -53,29 +53,29 @@ QString KWMailMergeKSpread::getValue( const QString &name, int record ) const
   if ( cell )
     return cellText( cell );
   else
-    return i18n( "Unkown mail merge variable: %1" ).arg( name );
+    return i18n( "Unkown mail merge variable: %1" ).tqarg( name );
 }
 
-void KWMailMergeKSpread::load( QDomElement& parentElem )
+void KWMailMergeKSpread::load( TQDomElement& tqparentElem )
 {
-  QDomNode contentNode = parentElem.namedItem( "CONTENT" );
+  TQDomNode contentNode = tqparentElem.namedItem( "CONTENT" );
   if ( contentNode.isNull() )
     return;
 
-  QDomElement element = contentNode.toElement();
+  TQDomElement element = contentNode.toElement();
   if ( element.isNull() )
     return;
 
-  _url = element.attribute( QString::fromLatin1( "URL" ) );
-  _spreadSheetNumber = element.attribute( QString::fromLatin1( "SpreadSheetNumber" ) ).toInt();
+  _url = element.attribute( TQString::tqfromLatin1( "URL" ) );
+  _spreadSheetNumber = element.attribute( TQString::tqfromLatin1( "SpreadSheetNumber" ) ).toInt();
 
   initDocument();
 }
 
-void KWMailMergeKSpread::save( QDomDocument& doc, QDomElement& parent )
+void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& tqparent )
 {
-  QDomElement content = doc.createElement( QString::fromLatin1( "CONTENT" ) );
-  parent.appendChild( content );
+  TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) );
+  tqparent.appendChild( content );
 
   content.setAttribute( "URL", _url.url() );
   content.setAttribute( "SpreadSheetNumber", _spreadSheetNumber );
@@ -85,9 +85,9 @@ void KWMailMergeKSpread::refresh( bool )
 {
 }
 
-bool KWMailMergeKSpread::showConfigDialog( QWidget *parent, int )
+bool KWMailMergeKSpread::showConfigDialog( TQWidget *tqparent, int )
 {
-  KWMailMergeKSpreadConfig dlg( parent, this );
+  KWMailMergeKSpreadConfig dlg( tqparent, this );
 
   int retval = dlg.exec();
   if ( retval )
@@ -100,7 +100,7 @@ void KWMailMergeKSpread::initDocument()
 {
   _document = new Doc();
 
-  connect( _document, SIGNAL( completed() ), SLOT( initSpreadSheets() ) );
+  connect( _document, TQT_SIGNAL( completed() ), TQT_SLOT( initSpreadSheets() ) );
 
   _document->openURL( _url );
 }
@@ -111,7 +111,7 @@ void KWMailMergeKSpread::initSpreadSheets()
   _columnMap.clear();
   sampleRecord.clear();
 
-  QPtrListIterator<Sheet> it( _document->map()->sheetList() );
+  TQPtrListIterator<Sheet> it( _document->map()->sheetList() );
   int counter = 0;
   for ( it.toFirst(); it.current(), counter < _spreadSheetNumber; ++it ) {
     _sheet = it.current();
@@ -172,9 +172,9 @@ int KWMailMergeKSpread::columns() const
   return col;
 }
 
-QString KWMailMergeKSpread::cellText( const Cell *cell ) const
+TQString KWMailMergeKSpread::cellText( const Cell *cell ) const
 {
-  QString text = QString::null;
+  TQString text = TQString();
 
   if ( !cell->isDefault() && !cell->isEmpty() ) {
       if ( cell->isFormula() )
@@ -202,9 +202,9 @@ QString KWMailMergeKSpread::cellText( const Cell *cell ) const
 
 extern "C"
 {
-  KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, QObject *parent )
+  KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *tqparent )
   {
-    return new KWMailMergeKSpread( instance, parent );
+    return new KWMailMergeKSpread( instance, tqparent );
   }
 }