Rename a number of old tq methods that are no longer tq specific

2 files changed, 10 insertions, 10 deletions

diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 6801a64a..025e9a4e 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -53,7 +53,7 @@ TQString KWMailMergeKSpread::getValue( const TQString &name, int record ) const
   if ( cell )
     return cellText( cell );
   else
-    return i18n( "Unkown mail merge variable: %1" ).tqarg( name );
+    return i18n( "Unkown mail merge variable: %1" ).arg( name );
 }
 
 void KWMailMergeKSpread::load( TQDomElement& parentElem )
@@ -66,15 +66,15 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem )
   if ( element.isNull() )
     return;
 
-  _url = element.attribute( TQString::tqfromLatin1( "URL" ) );
-  _spreadSheetNumber = element.attribute( TQString::tqfromLatin1( "SpreadSheetNumber" ) ).toInt();
+  _url = element.attribute( TQString::fromLatin1( "URL" ) );
+  _spreadSheetNumber = element.attribute( TQString::fromLatin1( "SpreadSheetNumber" ) ).toInt();
 
   initDocument();
 }
 
 void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent )
 {
-  TQDomElement content = doc.createElement( TQString::tqfromLatin1( "CONTENT" ) );
+  TQDomElement content = doc.createElement( TQString::fromLatin1( "CONTENT" ) );
   parent.appendChild( content );
 
   content.setAttribute( "URL", _url.url() );
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
index f08ae82e..595633d9 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
@@ -20,7 +20,7 @@
 
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -100,20 +100,20 @@ void KWMailMergeKSpreadConfig::initGUI()
 {
   TQFrame *page = plainPage();
 
-  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "URL:" ), page );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   _urlRequester = new KURLRequester( page );
-  tqlayout->addWidget( _urlRequester, 0, 1 );
+  layout->addWidget( _urlRequester, 0, 1 );
 
   label = new TQLabel( i18n( "Page number:" ), page );
-  tqlayout->addWidget( label, 1, 0 );
+  layout->addWidget( label, 1, 0 );
 
   _pageNumber = new KComboBox( page );
   _pageNumber->setEnabled( false );
-  tqlayout->addWidget( _pageNumber, 1, 1 );
+  layout->addWidget( _pageNumber, 1, 1 );
   connect( _urlRequester->lineEdit() , TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
 }