TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 63 insertions, 63 deletions

diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 8835bf49d..fa5bc8f69 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -17,41 +17,41 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include "KWQtSqlSerialDataSource.h"
-#include "KWQtSqlSerialDataSource.moc"
-#include "KWQtSqlEasyFilter.h"
+#include "KWTQtSqlSerialDataSource.h"
+#include "KWTQtSqlSerialDataSource.moc"
+#include "KWTQtSqlEasyFilter.h"
 
 #include <klocale.h>
-#include <qlayout.h>
-#include <qsqlcursor.h>
-#include <qdatatable.h>
-#include <qcheckbox.h>
-#include <qsqlrecord.h>
-#include <qsqlquery.h>
+#include <tqlayout.h>
+#include <tqsqlcursor.h>
+#include <tqdatatable.h>
+#include <tqcheckbox.h>
+#include <tqsqlrecord.h>
+#include <tqsqlquery.h>
 #include <kdebug.h>
 
-#define KWQtSqlBarIcon( x ) BarIcon( x, db->KWInstance() )
+#define KWTQtSqlBarIcon( x ) BarIcon( x, db->KWInstance() )
 
 /******************************************************************
  *
- * Class: KWQtSqlSerialDataSource
+ * Class: KWTQtSqlSerialDataSource
  *
  ******************************************************************/
 
-KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,QObject *parent)
-	: KWQtSqlSerialDataSourceBase(inst,parent)
+KWTQtSqlSerialDataSource::KWTQtSqlSerialDataSource(KInstance *inst,TQObject *tqparent)
+	: KWTQtSqlSerialDataSourceBase(inst,tqparent)
 {
   myquery=0;
 }
 
-KWQtSqlSerialDataSource::~KWQtSqlSerialDataSource()
+KWTQtSqlSerialDataSource::~KWTQtSqlSerialDataSource()
 {
         delete myquery;
-        QSqlDatabase::removeDatabase("KWQTSQLPOWER");
+        TQSqlDatabase::removeDatabase("KWTQTSTQLPOWER");
 }
 
 
-QString KWQtSqlSerialDataSource::getValue( const QString &name, int record ) const
+TQString KWTQtSqlSerialDataSource::getValue( const TQString &name, int record ) const
 {
         int num=record;
 
@@ -59,79 +59,79 @@ QString KWQtSqlSerialDataSource::getValue( const QString &name, int record ) con
         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->tqcontains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name);
         return (myquery->value(name)).toString();
 }
 
-void KWQtSqlSerialDataSource::save( QDomDocument & /*doc*/, QDomElement & /*parent*/)
+void KWTQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*tqparent*/)
 {
 /*
-	QDomElement def=doc.createElement(QString::fromLatin1("DEFINITION"));
-	parent.appendChild(def);
+	TQDomElement def=doc.createElement(TQString::tqfromLatin1("DEFINITION"));
+	tqparent.appendChild(def);
 	for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 	{
-		QDomElement defEnt=doc.createElement(QString::fromLatin1("FIELD"));
-		defEnt.setAttribute(QString::fromLatin1("name"),it.key());
+		TQDomElement defEnt=doc.createElement(TQString::tqfromLatin1("FIELD"));
+		defEnt.setAttribute(TQString::tqfromLatin1("name"),it.key());
 		def.appendChild(defEnt);
 	}
-	QDomElement cont=doc.createElement(QString::fromLatin1("CONTENT"));
-	parent.appendChild(cont);
+	TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
+	tqparent.appendChild(cont);
 	for (Db::Iterator dbI=db.begin();dbI!=db.end();++dbI)
 	{
-		QDomElement rec=doc.createElement(QString::fromLatin1("RECORD"));
+		TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
 		cont.appendChild(rec);
 		for (DbRecord::Iterator it=sampleRecord.begin();it!=sampleRecord.end();++it)
 		{
-			QDomElement recEnt=doc.createElement(QString::fromLatin1("ITEM"));
-			recEnt.setAttribute(QString::fromLatin1("name"),it.key());
-			recEnt.setAttribute(QString::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);
 		}
 	}
 */
 }
 
-void KWQtSqlSerialDataSource::load( QDomElement& /*parentElem*/ )
+void KWTQtSqlSerialDataSource::load( TQDomElement& /*tqparentElem*/ )
 {
 /*
 	db.clear();
 	sampleRecord.clear();
-	QDomNode defNd=parentElem.namedItem("DEFINITION");
+	TQDomNode defNd=tqparentElem.namedItem("DEFINITION");
 	if (defNd.isNull()) return;
-	QDomElement def=defNd.toElement();
-	for (QDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
+	TQDomElement def=defNd.toElement();
+	for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	{
-		sampleRecord[defEnt.attribute(QString::fromLatin1("name"))]=defEnt.attribute(QString::fromLatin1("name"));//i18n( "No Value" );
+		sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=defEnt.attribute(TQString::tqfromLatin1("name"));//i18n( "No Value" );
 	}
-	QDomNode contNd=parentElem.namedItem("CONTENT");
+	TQDomNode contNd=tqparentElem.namedItem("CONTENT");
 	if (contNd.isNull()) return;
-	for (QDomNode rec=contNd.firstChild();!rec.isNull();rec=rec.nextSibling())
+	for (TQDomNode rec=contNd.firstChild();!rec.isNull();rec=rec.nextSibling())
 	{
 		appendRecord();
-		for (QDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement())
+		for (TQDomElement recEnt=rec.firstChild().toElement();!recEnt.isNull();recEnt=recEnt.nextSibling().toElement())
 		{
-			setValue(recEnt.attribute(QString::fromLatin1("name")),
-				recEnt.attribute(QString::fromLatin1("data")),db.count()-1);
+			setValue(recEnt.attribute(TQString::tqfromLatin1("name")),
+				recEnt.attribute(TQString::tqfromLatin1("data")),db.count()-1);
 		}
 	}
 */
 }
 
-bool KWQtSqlSerialDataSource::showConfigDialog(QWidget *par,int action)
+bool KWTQtSqlSerialDataSource::showConfigDialog(TQWidget *par,int action)
 {
 	bool ret=false;
 	if (action==KWSLEdit)
 	{
-		KWQtSqlDataSourceEditor *dia=new KWQtSqlDataSourceEditor(par,this);
+		KWTQtSqlDataSourceEditor *dia=new KWTQtSqlDataSourceEditor(par,this);
 		ret=dia->exec();
 		delete dia;
 	}
-	else ret=KWQtSqlSerialDataSourceBase::showConfigDialog(par,action);
+	else ret=KWTQtSqlSerialDataSourceBase::showConfigDialog(par,action);
 
 	return ret;
 }
 
-void KWQtSqlSerialDataSource::refresh(bool force)
+void KWTQtSqlSerialDataSource::refresh(bool force)
 {
         if ((force) || (myquery==0))
         {
@@ -142,11 +142,11 @@ void KWQtSqlSerialDataSource::refresh(bool force)
                 }
                 if ((!database) || (!database->isOpen())) openDatabase();
 		if ((!database) || (!database->isOpen())) return;
-                myquery=new QSqlCursor(tableName,true,database);
-                myquery->setMode(QSqlCursor::ReadOnly);
+                myquery=new TQSqlCursor(tableName,true,database);
+                myquery->setMode(TQSqlCursor::ReadOnly);
 		myquery->select(filter);
         }
-        kdDebug()<<QString("There were %1 rows in the query").arg(myquery->size())<<endl;
+        kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl;
 
 }
 
@@ -156,39 +156,39 @@ void KWQtSqlSerialDataSource::refresh(bool force)
 
 /******************************************************************
  *
- * Class: KWQtSqlDataSourceEditor
+ * Class: KWTQtSqlDataSourceEditor
  *
  ******************************************************************/
 
 
 
-KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( QWidget *parent, KWQtSqlSerialDataSource *db_ )
-        :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, parent, "", true ), db( db_ )
+KWTQtSqlDataSourceEditor::KWTQtSqlDataSourceEditor( TQWidget *tqparent, KWTQtSqlSerialDataSource *db_ )
+        :KDialogBase( Plain, i18n( "Mail Merge - Editor" ), Ok | Cancel, Ok, tqparent, "", true ), db( db_ )
 {
 	tableName=db->tableName;
 	filter=db->filter;
-        (new QVBoxLayout(plainPage()))->setAutoAdd(true);
-        setMainWidget(widget=new QtSqlDataSourceEditor(plainPage()));
-	connect(widget->tableCombo,SIGNAL(activated(int)),this,SLOT(tableChanged(int)));
-	connect(widget->editFilter,SIGNAL(clicked()),this,SLOT(editFilter()));
+        (new TQVBoxLayout(plainPage()))->setAutoAdd(true);
+        setMainWidget(widget=new TQtSqlDataSourceEditor(plainPage()));
+	connect(widget->tableCombo,TQT_SIGNAL(activated(int)),this,TQT_SLOT(tableChanged(int)));
+	connect(widget->editFilter,TQT_SIGNAL(clicked()),this,TQT_SLOT(editFilter()));
 	updateTableCombo();
 
-//        connect(this,SIGNAL(okClicked()),this,SLOT(slotSetQuery()));
+//        connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotSetQuery()));
 }
 
-void KWQtSqlDataSourceEditor::tableChanged(int item)
+void KWTQtSqlDataSourceEditor::tableChanged(int item)
 {
 	tableName=widget->tableCombo->text(item);
-	QSqlCursor *tmpCursor=new QSqlCursor(tableName,true,db->database);
-	tmpCursor->setMode(QSqlCursor::ReadOnly);
+	TQSqlCursor *tmpCursor=new TQSqlCursor(tableName,true,db->database);
+	tmpCursor->setMode(TQSqlCursor::ReadOnly);
 
 	if (widget->filterCheckBox->isChecked()) tmpCursor->select(filter);
 
 	widget->DataTable->setSqlCursor(tmpCursor,true,true);
-	widget->DataTable->refresh(QDataTable::RefreshAll);
+	widget->DataTable->refresh(TQDataTable::RefreshAll);
 }
 
-void KWQtSqlDataSourceEditor::updateTableCombo()
+void KWTQtSqlDataSourceEditor::updateTableCombo()
 {
 	widget->tableCombo->clear();
         if (!db->database) return;
@@ -196,7 +196,7 @@ void KWQtSqlDataSourceEditor::updateTableCombo()
         widget->tableCombo->insertStringList(db->database->tables());
 }
 
-void KWQtSqlDataSourceEditor::slotSetQuery()
+void KWTQtSqlDataSourceEditor::slotSetQuery()
 {
         db->tableName=tableName;
 	db->filter=filter;
@@ -204,15 +204,15 @@ void KWQtSqlDataSourceEditor::slotSetQuery()
 }
 
 
-void KWQtSqlDataSourceEditor::editFilter()
+void KWTQtSqlDataSourceEditor::editFilter()
 {
-	KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(static_cast<QWidget*>(parent()));
+	KWTQtSqlEasyFilter *f=new KWTQtSqlEasyFilter(static_cast<TQWidget*>(tqparent()));
 	f->exec();
 }
 
 extern "C" {
-        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,QObject *parent)
+        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *tqparent)
         {
-                return new KWQtSqlSerialDataSource(inst,parent);
+                return new KWTQtSqlSerialDataSource(inst,tqparent);
         }
 }