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, 20 insertions, 19 deletions

diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
index 0e4586c3..a0705bdf 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
@@ -17,43 +17,44 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef _SERIALLETTER_QtSql_BASE_H_
-#define _SERIALLETTER_QtSql_BASE_H_
+#ifndef _SERIALLETTER_TQtSql_BASE_H_
+#define _SERIALLETTER_TQtSql_BASE_H_
 
-#include <qdom.h>
+#include <tqdom.h>
 #include <kdialogbase.h>
-#include <qsqldatabase.h>
-#include <qguardedptr.h>
+#include <tqsqldatabase.h>
+#include <tqguardedptr.h>
 
 #include "KWMailMergeDataSource.h"
-#include "qtsqlopenwidget.h"
+#include "tqtsqlopenwidget.h"
 
 
 
 /******************************************************************
  *
- * Class: KWQtSqlSerialDataSourceBase
+ * Class: KWTQtSqlSerialDataSourceBase
  *
  ******************************************************************/
-class KWQtSqlSerialDataSourceBase: public KWMailMergeDataSource
+class KWTQtSqlSerialDataSourceBase: public KWMailMergeDataSource
 {
     Q_OBJECT
+  TQ_OBJECT
     K_DCOP
     public:
-    KWQtSqlSerialDataSourceBase(KInstance *inst,QObject *parent);
-    ~KWQtSqlSerialDataSourceBase();
+    KWTQtSqlSerialDataSourceBase(KInstance *inst,TQObject *tqparent);
+    ~KWTQtSqlSerialDataSourceBase();
 
-   virtual bool showConfigDialog(QWidget *par,int action);
+   virtual bool showConfigDialog(TQWidget *par,int action);
 
     protected:
-	friend class KWQtSqlMailMergeOpen;
-	QString hostname;
-	QString username;
-	QString driver;
-	QString port;
-	QString databasename;
-	QGuardedPtr<QSqlDatabase> database;
-	QString DataBaseConnection;
+	friend class KWTQtSqlMailMergeOpen;
+	TQString hostname;
+	TQString username;
+	TQString driver;
+	TQString port;
+	TQString databasename;
+	TQGuardedPtr<TQSqlDatabase> database;
+	TQString DataBaseConnection;
         static int connectionId;
    k_dcop:
      bool openDatabase();