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, 27 insertions, 26 deletions

diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
index e2051a2f..c415c19c 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
@@ -17,63 +17,64 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef _SERIALLETTER_QtSql_PLUGIN_H_
-#define _SERIALLETTER_QtSql_PLUGIN_H_
+#ifndef _SERIALLETTER_TQtSql_PLUGIN_H_
+#define _SERIALLETTER_TQtSql_PLUGIN_H_
 
-#include <qdom.h>
-#include <qsqlcursor.h>
+#include <tqdom.h>
+#include <tqsqlcursor.h>
 #include "KWMailMergeDataSource.h"
-#include "KWQtSqlSerialDataSourceBase.h"
-#include "qtsqldatasourceeditor.h"
+#include "KWTQtSqlSerialDataSourceBase.h"
+#include "tqtsqldatasourceeditor.h"
 
 
 /******************************************************************
  *
- * Class: KWQtSqlSerialDataSource
+ * Class: KWTQtSqlSerialDataSource
  *
  ******************************************************************/
 
-class KWQtSqlSerialDataSource: public KWQtSqlSerialDataSourceBase
+class KWTQtSqlSerialDataSource: public KWTQtSqlSerialDataSourceBase
 {
     public:
-    KWQtSqlSerialDataSource(KInstance *inst,QObject *parent);
-    ~KWQtSqlSerialDataSource();
+    KWTQtSqlSerialDataSource(KInstance *inst,TQObject *tqparent);
+    ~KWTQtSqlSerialDataSource();
 
-    virtual void save( QDomDocument &doc,QDomElement&);
-    virtual void load( QDomElement& elem );
-    virtual class QString getValue( const class QString &name, int record = -1 ) const;
+    virtual void save( TQDomDocument &doc,TQDomElement&);
+    virtual void load( TQDomElement& elem );
+    virtual class TQString getValue( const class TQString &name, int record = -1 ) const;
     virtual int getNumRecords() const {
         return (myquery?((myquery->size()<0)?0:myquery->size()):0);
     }
     virtual void refresh(bool);
-    virtual  bool showConfigDialog(QWidget *,int);
+    virtual  bool showConfigDialog(TQWidget *,int);
 
     protected:
-	friend class KWQtSqlDataSourceEditor;
-	QString tableName;
-	QString filter;
-	QSqlCursor *myquery;
+	friend class KWTQtSqlDataSourceEditor;
+	TQString tableName;
+	TQString filter;
+	TQSqlCursor *myquery;
 };
 
 /******************************************************************
  *
- * Class: KWQtSqlDataSourceEditor
+ * Class: KWTQtSqlDataSourceEditor
  *
  ******************************************************************/
 
-class KWQtSqlDataSourceEditor : public KDialogBase
+class KWTQtSqlDataSourceEditor : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWQtSqlDataSourceEditor( QWidget *parent, KWQtSqlSerialDataSource *db_ );
-    ~KWQtSqlDataSourceEditor(){;}
+    KWTQtSqlDataSourceEditor( TQWidget *tqparent, KWTQtSqlSerialDataSource *db_ );
+    ~KWTQtSqlDataSourceEditor(){;}
 private:
-  KWQtSqlSerialDataSource *db;
-  QtSqlDataSourceEditor *widget;
+  KWTQtSqlSerialDataSource *db;
+  TQtSqlDataSourceEditor *widget;
   void updateTableCombo();
-  QString filter;
-  QString tableName;
+  TQString filter;
+  TQString tableName;
 
 private slots:
   void tableChanged(int);