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

diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
index d7587eea..1c36b196 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
@@ -17,77 +17,79 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef _SERIALLETTER_QtSql_POWER_PLUGIN_H_
-#define _SERIALLETTER_QtSql_POWER_PLUGIN_H_
+#ifndef _SERIALLETTER_TQtSql_POWER_PLUGIN_H_
+#define _SERIALLETTER_TQtSql_POWER_PLUGIN_H_
 
-#include <qdom.h>
+#include <tqdom.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
-#include <qsqldatabase.h>
+#include <tqsqldatabase.h>
 /* FOR THE DIRTY HACK */
-#include <qsqlcursor.h>
-#include <qsqldriver.h>
+#include <tqsqlcursor.h>
+#include <tqsqldriver.h>
 /* END FOR THE DIRTY HACK */
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
 
 #include "defs.h"
 #include "KWMailMergeDataSource.h"
-#include "KWQtSqlSerialDataSourceBase.h"
+#include "KWTQtSqlSerialDataSourceBase.h"
 #include "kwqtsqlpower.h"
 #include "KWMySqlCursor.h"
 
 /******************************************************************
  *
- * Class: KWQtSqlSerialDataSource
+ * Class: KWTQtSqlSerialDataSource
  *
  ******************************************************************/
-class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase
+class KWTQtSqlPowerSerialDataSource: public KWTQtSqlSerialDataSourceBase
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
-    KWQtSqlPowerSerialDataSource(KInstance *inst,QObject *parent);
-    ~KWQtSqlPowerSerialDataSource();
+    KWTQtSqlPowerSerialDataSource(KInstance *inst,TQObject *tqparent);
+    ~KWTQtSqlPowerSerialDataSource();
 
-    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  bool showConfigDialog(QWidget *,int);
+    virtual  bool showConfigDialog(TQWidget *,int);
     virtual void refresh(bool force);
 
     protected:
-	friend class KWQtSqlPowerMailMergeEditor;
-	QString query;
+	friend class KWTQtSqlPowerMailMergeEditor;
+	TQString query;
 	KWMySqlCursor *myquery;
 
     void clearSampleRecord();
-    void addSampleRecordEntry(QString name);
+    void addSampleRecordEntry(TQString name);
 
 };
 
 /******************************************************************
  *
- * Class: KWQtSqlPowerMailMergeEditor
+ * Class: KWTQtSqlPowerMailMergeEditor
  *
  ******************************************************************/
 
-class KWQtSqlPowerMailMergeEditor : public KDialogBase
+class KWTQtSqlPowerMailMergeEditor : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWQtSqlPowerMailMergeEditor( QWidget *parent, KWQtSqlPowerSerialDataSource *db_ );
-    ~KWQtSqlPowerMailMergeEditor();
+    KWTQtSqlPowerMailMergeEditor( TQWidget *tqparent, KWTQtSqlPowerSerialDataSource *db_ );
+    ~KWTQtSqlPowerMailMergeEditor();
 private:
- KWQtSqlPowerSerialDataSource *db;
- KWQtSqlPowerWidget *widget;
+ KWTQtSqlPowerSerialDataSource *db;
+ KWTQtSqlPowerWidget *widget;
 private slots:
  void openSetup();
  void updateDBViews();
- void slotTableChanged ( QListBoxItem * item );
+ void slotTableChanged ( TQListBoxItem * item );
  void slotExecute();
  void slotSetQuery();
 };