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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

8 files changed, 51 insertions, 51 deletions

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>