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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

14 files changed, 108 insertions, 108 deletions

diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index 57b574a5..1e6c20fe 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -24,7 +24,7 @@
 #include <kinputdialog.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
@@ -107,7 +107,7 @@ void KWClassicSerialDataSource::removeRecord( int i )
     if ( (i < 0) || (i > (int)db.count() - 1) )
         return;
 
-	kdDebug()<<TQString("Removing record %1").arg(i)<<endl;
+	kdDebug()<<TQString("Removing record %1").tqarg(i)<<endl;
 
     Db::Iterator it = db.at( i);
     db.remove( it );
@@ -115,25 +115,25 @@ void KWClassicSerialDataSource::removeRecord( int i )
 
 void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
 {
-	TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION"));
+	TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
 	parent.appendChild(def);
 	for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 	{
-		TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD"));
-		defEnt.setAttribute(TQString::fromLatin1("name"),it.key());
+		TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
+		defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
 		def.appendChild(defEnt);
 	}
-	TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
+	TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
 	parent.appendChild(cont);
 	for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
 	{
-		TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
+		TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
 		cont.appendChild(rec);
 		for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 		{
-			TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
-			recEnt.setAttribute(TQString::fromLatin1("name"),it.key());
-			recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]);
+			TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+			recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
+			recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]);
 			rec.appendChild(recEnt);
 		}
 	}
@@ -148,7 +148,7 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem )
 	TQDomElement def=defNd.toElement();
 	for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	{
-		sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=i18n( "No Value" );
+		sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=i18n( "No Value" );
 	}
 	TQDomNode contNd=parentElem.namedItem("CONTENT");
 	if (contNd.isNull()) return;
@@ -157,8 +157,8 @@ void KWClassicSerialDataSource::load( TQDomElement& parentElem )
 		appendRecord();
 		for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement())
 		{
-			setValue(recEnt.attribute(TQString::fromLatin1("name")),
-				recEnt.attribute(TQString::fromLatin1("data")),db.count()-1);
+			setValue(recEnt.attribute(TQString::tqfromLatin1("name")),
+				recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1);
 		}
 	}
 }
@@ -219,9 +219,9 @@ TQString KWClassicMailMergeEditorListItem::text( int i ) const
 void KWClassicMailMergeEditorListItem::setup()
 {
     setHeight( TQMAX( listView()->fontMetrics().height(),
-                     editWidget->sizeHint().height() ) );
-    if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() )
-        listView()->setColumnWidth( 1, editWidget->sizeHint().width() );
+                     editWidget->tqsizeHint().height() ) );
+    if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() )
+        listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() );
 }
 
 void KWClassicMailMergeEditorListItem::update()
@@ -342,27 +342,27 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS
 
     first = new TQToolButton( toolbar );
     first->setIconSet( SmallIconSet( "start" ) );
-    first->setFixedSize( first->sizeHint() );
+    first->setFixedSize( first->tqsizeHint() );
     connect(first, TQT_SIGNAL(clicked()), this, TQT_SLOT(firstRecord()));
 
     back_ = new TQToolButton( toolbar );
     back_->setIconSet( SmallIconSet( "back" ) );
-    back_->setFixedSize( back_->sizeHint() );
+    back_->setFixedSize( back_->tqsizeHint() );
     connect(back_, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevRecord()));
 
     records = new TQSpinBox( 1, db->getNumRecords(), 1, toolbar );
-    records->setMaximumHeight( records->sizeHint().height() );
+    records->setMaximumHeight( records->tqsizeHint().height() );
     connect( records, TQT_SIGNAL( valueChanged( int ) ),
              this, TQT_SLOT( changeRecord( int ) ) );
 
     forward = new TQToolButton( toolbar );
     forward->setIconSet( SmallIconSet( "forward" ) );
-    forward->setFixedSize( forward->sizeHint() );
+    forward->setFixedSize( forward->tqsizeHint() );
     connect(forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextRecord()));
 
     finish = new TQToolButton( toolbar );
     finish->setIconSet( SmallIconSet( "finish" ) );
-    finish->setFixedSize( finish->sizeHint() );
+    finish->setFixedSize( finish->tqsizeHint() );
     connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(lastRecord()));
 
     TQWidget *sep = new TQWidget( toolbar );
@@ -370,28 +370,28 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS
 
     newRecord = new TQToolButton( toolbar );
     newRecord->setIconSet( SmallIconSet( "sl_addrecord" ) );
-    newRecord->setFixedSize( newRecord->sizeHint() );
+    newRecord->setFixedSize( newRecord->tqsizeHint() );
     connect( newRecord, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( addRecord() ) );
     TQToolTip::add( newRecord, i18n( "Add record" ) );
 
     newEntry = new TQToolButton( toolbar );
     newEntry->setIconSet( SmallIconSet( "sl_addentry" ) );
-    newEntry->setFixedSize( newEntry->sizeHint() );
+    newEntry->setFixedSize( newEntry->tqsizeHint() );
     connect( newEntry, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( addEntry() ) );
     TQToolTip::add( newEntry, i18n( "Add entry" ) );
 
     deleteRecord = new TQToolButton( toolbar );
     deleteRecord->setIconSet( SmallIconSet( "sl_delrecord" ) );
-    deleteRecord->setFixedSize( deleteRecord->sizeHint() );
+    deleteRecord->setFixedSize( deleteRecord->tqsizeHint() );
     connect( deleteRecord, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( removeRecord() ) );
     TQToolTip::add( deleteRecord, i18n( "Remove record" ) );
 
     deleteEntry = new TQToolButton( toolbar );
     deleteEntry->setIconSet( SmallIconSet( "sl_delentry" ) );
-    deleteEntry->setFixedSize( deleteEntry->sizeHint() );
+    deleteEntry->setFixedSize( deleteEntry->tqsizeHint() );
     connect( deleteEntry, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( removeEntry() ) );
     TQToolTip::add( deleteEntry, i18n( "Remove entry" ) );
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 1886207c..411ee5e5 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -168,7 +168,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const
 
     if( !uidAvailable )
     {
-        return ( i18n ( "KAddressbook entry '%1' not available." ).arg( *_UIDIterator ) );
+        return ( i18n ( "KAddressbook entry '%1' not available." ).tqarg( *_UIDIterator ) );
     }
 
 
@@ -350,16 +350,16 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const
         TQString lat;
         TQString longi;
         if(  geo.latitude()<0 )
-            lat = TQString( i18n("%1 South") ).arg( -geo.latitude() );
+            lat = TQString( i18n("%1 South") ).tqarg( -geo.latitude() );
         else
-            lat = TQString( i18n("%1 North") ).arg( geo.latitude() );
+            lat = TQString( i18n("%1 North") ).tqarg( geo.latitude() );
 
         if(  geo.longitude()<0 )
             // There is something going wrong, because "W" is replaced by "q ".
             // Needs fix.
-            longi = TQString( i18n("%1 West") ).arg( -geo.longitude() );
+            longi = TQString( i18n("%1 West") ).tqarg( -geo.longitude() );
         else
-            longi = TQString( i18n("%1 East") ).arg( geo.longitude() );
+            longi = TQString( i18n("%1 East") ).tqarg( geo.longitude() );
 
         return i18n( "Geographic coordinates", "%1, %2" ).arg ( lat, longi );
     }
@@ -409,7 +409,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem )
             for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull();
                     recEnt=recEnt.nextSibling().toElement() )
             {
-                addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) );
+                addEntry( recEnt.attribute( TQString::tqfromLatin1("uid") ) );
             }
         }
         else if( rec.nodeName() == "LIST" )
@@ -417,7 +417,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem )
             for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull();
                     recEnt=recEnt.nextSibling().toElement() )
             {
-                addList( recEnt.attribute( TQString::fromLatin1("listid") ) );
+                addList( recEnt.attribute( TQString::tqfromLatin1("listid") ) );
             }
         }
         else
@@ -482,26 +482,26 @@ void KWMailMergeKABC::refresh( bool )
 
 void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent)
 {
-    TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
+    TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
     parent.appendChild(cont);
 
     TQValueList<TQString>::ConstIterator it = _individualUIDs.begin();
     for( ; it != _individualUIDs.end(); ++it )
     {
-        TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
+        TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
         cont.appendChild(rec);
-        TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
-        recEnt.setAttribute(TQString::fromLatin1("uid"),*it);
+        TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+        recEnt.setAttribute(TQString::tqfromLatin1("uid"),*it);
         rec.appendChild(recEnt);
     }
 
     it = _lists.begin();
     for( ; !(it == _lists.end()); ++it )
     {
-        TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST"));
+        TQDomElement rec=doc.createElement(TQString::tqfromLatin1("LIST"));
         cont.appendChild(rec);
-        TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
-        recEnt.setAttribute(TQString::fromLatin1("listid"),*it);
+        TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+        recEnt.setAttribute(TQString::tqfromLatin1("listid"),*it);
         rec.appendChild(recEnt);
     }
 }
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index d3f3a21c..d1c03809 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -20,7 +20,7 @@
 
 
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 
 #include <kapplication.h>
@@ -376,7 +376,7 @@ void KWMailMergeKABCConfig::saveDistributionList()
         KMessageBox::information( 0,
                                   i18n( "<qt>Distribution list with the given name <b>%1</b> "
                                         "already exists. Please select a different name.</qt>" )
-                                  .arg( listName ) );
+                                  .tqarg( listName ) );
         return;
     }
     KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName );
diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui
index af8f5723..c7276c9b 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/kabc/addresspicker.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -76,7 +76,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -101,7 +101,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -217,7 +217,7 @@
             <property name="text">
                 <string>&amp;Address Book</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="buddy" stdset="0">
@@ -236,7 +236,7 @@
             <property name="text">
                 <string>&amp;Selected Addresses</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 025e9a4e..6801a64a 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" ).arg( name );
+    return i18n( "Unkown mail merge variable: %1" ).tqarg( name );
 }
 
 void KWMailMergeKSpread::load( TQDomElement& parentElem )
@@ -66,15 +66,15 @@ void KWMailMergeKSpread::load( TQDomElement& parentElem )
   if ( element.isNull() )
     return;
 
-  _url = element.attribute( TQString::fromLatin1( "URL" ) );
-  _spreadSheetNumber = element.attribute( TQString::fromLatin1( "SpreadSheetNumber" ) ).toInt();
+  _url = element.attribute( TQString::tqfromLatin1( "URL" ) );
+  _spreadSheetNumber = element.attribute( TQString::tqfromLatin1( "SpreadSheetNumber" ) ).toInt();
 
   initDocument();
 }
 
 void KWMailMergeKSpread::save( TQDomDocument& doc, TQDomElement& parent )
 {
-  TQDomElement content = doc.createElement( TQString::fromLatin1( "CONTENT" ) );
+  TQDomElement content = doc.createElement( TQString::tqfromLatin1( "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 595633d9..f08ae82e 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 <layout.h>
+#include <tqlayout.h>
 
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -100,20 +100,20 @@ void KWMailMergeKSpreadConfig::initGUI()
 {
   TQFrame *page = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "URL:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   _urlRequester = new KURLRequester( page );
-  layout->addWidget( _urlRequester, 0, 1 );
+  tqlayout->addWidget( _urlRequester, 0, 1 );
 
   label = new TQLabel( i18n( "Page number:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   _pageNumber = new KComboBox( page );
   _pageNumber->setEnabled( false );
-  layout->addWidget( _pageNumber, 1, 1 );
+  tqlayout->addWidget( _pageNumber, 1, 1 );
   connect( _urlRequester->lineEdit() , TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
 }
 
diff --git a/kword/mailmerge/sql/KWMySqlCursor.h b/kword/mailmerge/sql/KWMySqlCursor.h
index 8919cc9a..4a25323b 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 /*invalidate*/ = TRUE ) { return FALSE; }
-    int update( bool /*invalidate*/ = TRUE ) { return FALSE; }
-    int del( bool /*invalidate*/ = TRUE ) { return FALSE; }
+    int insert( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
+    int update( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
+    int del( bool /*tqinvalidate*/ = TRUE ) { return FALSE; }
     void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {}
 };
 
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
index b424f227..3db1d9d6 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
@@ -3,7 +3,7 @@
 #include <tqtable.h>
 #include <tqscrollview.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent)
@@ -33,7 +33,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent)
 
 	int h=m_table->rowHeight(0);
 	for (int i=0;i<6;i++) h+=m_table->rowHeight(i);
-	h+=m_table->horizontalHeader()->sizeHint().height();
+	h+=m_table->horizontalHeader()->tqsizeHint().height();
 	m_table->setMinimumHeight(h);
 	
 	int w=0;
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
index 3e860d76..d3feca22 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
@@ -22,7 +22,7 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kconfig.h>
 #include <kpushbutton.h>
 #include <klineeditdlg.h>
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index e7671e03..544f7990 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -20,7 +20,7 @@
 #include "KWQtSqlPowerSerialDataSource.h"
 #include "KWQtSqlPowerSerialDataSource.moc"
 #include "KWQtSqlMailMergeOpen.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdom.h>
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -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").arg(myquery->size())<<endl;
+	kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl;
 }
 
 TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int record ) const
@@ -79,33 +79,33 @@ 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<<<").arg(name);
+	if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
 	return (myquery->value(name)).toString();
 }
 
 void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &parent)
 {
-        TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION"));
+        TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
         parent.appendChild(def);
         {
-                TQDomElement defEnt=doc.createElement(TQString::fromLatin1("DATABASE"));
-                defEnt.setAttribute(TQString::fromLatin1("hostname"),hostname);
-                defEnt.setAttribute(TQString::fromLatin1("port"),port);
-                defEnt.setAttribute(TQString::fromLatin1("driver"),driver);
-                defEnt.setAttribute(TQString::fromLatin1("databasename"),databasename);
-                defEnt.setAttribute(TQString::fromLatin1("username"),username);
+                TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("DATABASE"));
+                defEnt.setAttribute(TQString::tqfromLatin1("hostname"),hostname);
+                defEnt.setAttribute(TQString::tqfromLatin1("port"),port);
+                defEnt.setAttribute(TQString::tqfromLatin1("driver"),driver);
+                defEnt.setAttribute(TQString::tqfromLatin1("databasename"),databasename);
+                defEnt.setAttribute(TQString::tqfromLatin1("username"),username);
                 def.appendChild(defEnt);
 
-		defEnt=doc.createElement(TQString::fromLatin1("QUERY"));
-		defEnt.setAttribute(TQString::fromLatin1("value"),query);
+		defEnt=doc.createElement(TQString::tqfromLatin1("QUERY"));
+		defEnt.setAttribute(TQString::tqfromLatin1("value"),query);
 		def.appendChild(defEnt);
 
-		TQDomElement sampleEnt=doc.createElement(TQString::fromLatin1("SAMPLERECORD"));
+		TQDomElement sampleEnt=doc.createElement(TQString::tqfromLatin1("SAMPLERECORD"));
 		parent.appendChild(sampleEnt);
 	        for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
         	{
-                	TQDomElement fieldEnt=doc.createElement(TQString::fromLatin1("FIELD"));
-	                fieldEnt.setAttribute(TQString::fromLatin1("name"),it.key());
+                	TQDomElement fieldEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
+	                fieldEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
 	                sampleEnt.appendChild(fieldEnt);
 	        }
         }
@@ -122,19 +122,19 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem )
 		if (!dbNd.isNull())
 		{
 			TQDomElement dbEnt=dbNd.toElement();
-			if (dbEnt.tagName()==TQString::fromLatin1("DATABASE"))
+			if (dbEnt.tagName()==TQString::tqfromLatin1("DATABASE"))
 			{
-				hostname=dbEnt.attribute(TQString::fromLatin1("hostname"));
-				port=dbEnt.attribute(TQString::fromLatin1("port"));
-				driver=dbEnt.attribute(TQString::fromLatin1("driver"));
-				databasename=dbEnt.attribute(TQString::fromLatin1("databasename"));
-				username=dbEnt.attribute(TQString::fromLatin1("username"));
+				hostname=dbEnt.attribute(TQString::tqfromLatin1("hostname"));
+				port=dbEnt.attribute(TQString::tqfromLatin1("port"));
+				driver=dbEnt.attribute(TQString::tqfromLatin1("driver"));
+				databasename=dbEnt.attribute(TQString::tqfromLatin1("databasename"));
+				username=dbEnt.attribute(TQString::tqfromLatin1("username"));
 			}
 		}
 		TQDomNode queryNd=def.namedItem("QUERY");
 		if (!queryNd.isNull())
 		{
-			query=queryNd.toElement().attribute(TQString::fromLatin1("value"));
+			query=queryNd.toElement().attribute(TQString::tqfromLatin1("value"));
 		}
         }
 
@@ -144,7 +144,7 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem )
 		TQDomElement def1=defNd.toElement();
 	        for (TQDomElement defEnt=defNd.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	        {
-	               addSampleRecordEntry(defEnt.attribute(TQString::fromLatin1("name")));
+	               addSampleRecordEntry(defEnt.attribute(TQString::tqfromLatin1("name")));
 	        }
 	}
 }
@@ -203,7 +203,7 @@ void KWQtSqlPowerMailMergeEditor::slotExecute()
 	cur->setMode(TQSqlCursor::ReadOnly);
 
 	db->clearSampleRecord();
-	kdDebug()<<TQString("Fieldname count %1").arg(cur->count())<<endl;
+	kdDebug()<<TQString("Fieldname count %1").tqarg(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 b956335b..ec31df35 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -22,7 +22,7 @@
 #include "KWQtSqlEasyFilter.h"
 
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsqlcursor.h>
 #include <tqdatatable.h>
 #include <tqcheckbox.h>
@@ -59,32 +59,32 @@ 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<<<").arg(name);
+        if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
         return (myquery->value(name)).toString();
 }
 
 void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*parent*/)
 {
 /*
-	TQDomElement def=doc.createElement(TQString::fromLatin1("DEFINITION"));
+	TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
 	parent.appendChild(def);
 	for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 	{
-		TQDomElement defEnt=doc.createElement(TQString::fromLatin1("FIELD"));
-		defEnt.setAttribute(TQString::fromLatin1("name"),it.key());
+		TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
+		defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
 		def.appendChild(defEnt);
 	}
-	TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
+	TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
 	parent.appendChild(cont);
 	for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
 	{
-		TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
+		TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
 		cont.appendChild(rec);
 		for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 		{
-			TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
-			recEnt.setAttribute(TQString::fromLatin1("name"),it.key());
-			recEnt.setAttribute(TQString::fromLatin1("data"),(*dbI)[it.key()]);
+			TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+			recEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
+			recEnt.setAttribute(TQString::tqfromLatin1("data"),(*dbI)[it.key()]);
 			rec.appendChild(recEnt);
 		}
 	}
@@ -101,7 +101,7 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ )
 	TQDomElement def=defNd.toElement();
 	for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	{
-		sampleRecord[defEnt.attribute(TQString::fromLatin1("name"))]=defEnt.attribute(TQString::fromLatin1("name"));//i18n( "No Value" );
+		sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=defEnt.attribute(TQString::tqfromLatin1("name"));//i18n( "No Value" );
 	}
 	TQDomNode contNd=parentElem.namedItem("CONTENT");
 	if (contNd.isNull()) return;
@@ -110,8 +110,8 @@ void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ )
 		appendRecord();
 		for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement())
 		{
-			setValue(recEnt.attribute(TQString::fromLatin1("name")),
-				recEnt.attribute(TQString::fromLatin1("data")),db.count()-1);
+			setValue(recEnt.attribute(TQString::tqfromLatin1("name")),
+				recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1);
 		}
 	}
 */
@@ -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").arg(myquery->size())<<endl;
+        kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl;
 
 }
 
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index 0d414cdc..f31a431a 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -20,7 +20,7 @@
 #include "KWQtSqlSerialDataSourceBase.h"
 #include "KWQtSqlSerialDataSourceBase.moc"
 #include "KWQtSqlMailMergeOpen.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdom.h>
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -49,7 +49,7 @@ int KWQtSqlSerialDataSourceBase::connectionId=0;
 KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent)
 	: KWMailMergeDataSource(inst,parent)
 {
-	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++);
+	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").tqarg(connectionId++);
 	port=i18n("default");
 }
 
diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui
index afff8c7f..a68b62db 100644
--- a/kword/mailmerge/sql/kwqtsqlpower.ui
+++ b/kword/mailmerge/sql/kwqtsqlpower.ui
@@ -54,7 +54,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>120</height>
@@ -73,7 +73,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>120</height>
@@ -168,7 +168,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>300</width>
                             <height>0</height>
@@ -196,7 +196,7 @@
                     <property name="name">
                         <cstring>Line2</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
diff --git a/kword/mailmerge/sql/qtsqlopenwidget.ui b/kword/mailmerge/sql/qtsqlopenwidget.ui
index c0d2423a..fc32bded 100644
--- a/kword/mailmerge/sql/qtsqlopenwidget.ui
+++ b/kword/mailmerge/sql/qtsqlopenwidget.ui
@@ -283,7 +283,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>