1 files changed, 44 insertions, 41 deletions

diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h
index 4f348dfe..713f41d8 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.h
+++ b/kword/mailmerge/KWClassicSerialDataSource.h
@@ -21,52 +21,53 @@
 #ifndef _SERIALLETTER_CLASSIC_PLUGIN_H_
 #define _SERIALLETTER_CLASSIC_PLUGIN_H_
 
-#include <qdom.h>
-#include <qlistview.h>
+#include <tqdom.h>
+#include <tqlistview.h>
 #include <kdialogbase.h>
 #include <KoCustomVariablesDia.h>
 #include "KWMailMergeDataSource.h"
-#include <qspinbox.h>
+#include <tqspinbox.h>
 
-class QHBox;
-class QVBox;
-class QPushButton;
-class QListBox;
-class QLabel;
-class QLineEdit;
-class QToolButton;
+class TQHBox;
+class TQVBox;
+class TQPushButton;
+class TQListBox;
+class TQLabel;
+class TQLineEdit;
+class TQToolButton;
 
 /******************************************************************
  *
  * Class: KWClassicSerialDataSource
  *
  ******************************************************************/
-typedef QValueList< DbRecord > Db;
+typedef TQValueList< DbRecord > Db;
 
 class KWClassicSerialDataSource: public KWMailMergeDataSource
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
-    KWClassicSerialDataSource(KInstance *inst,QObject *parent);
+    KWClassicSerialDataSource(KInstance *inst,TQObject *tqparent);
     ~KWClassicSerialDataSource();
 
-    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 (int)db.count();
     }
-    virtual  bool showConfigDialog(QWidget *,int);
+    virtual  bool showConfigDialog(TQWidget *,int);
     virtual void refresh(bool){};
 
     protected:
     friend class KWClassicMailMergeEditor;
     friend class KWClassicMailMergeEditorList;
 
-    void setValue( const QString &name, const QString &value, int record = -1 );
+    void setValue( const TQString &name, const TQString &value, int record = -1 );
     void appendRecord();
-    void addEntry( const QString &name );
-    void removeEntry( const QString &name );
+    void addEntry( const TQString &name );
+    void removeEntry( const TQString &name );
     void removeRecord( int i );
     Db db;
 };
@@ -77,20 +78,20 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource
  *
  ******************************************************************/
 
-class KWClassicMailMergeEditorListItem : public QListViewItem
+class KWClassicMailMergeEditorListItem : public TQListViewItem
 {
 public:
-    KWClassicMailMergeEditorListItem( QListView *parent );
-    KWClassicMailMergeEditorListItem( QListView *parent, QListViewItem *after );
+    KWClassicMailMergeEditorListItem( TQListView *tqparent );
+    KWClassicMailMergeEditorListItem( TQListView *tqparent, TQListViewItem *after );
     virtual ~KWClassicMailMergeEditorListItem();
 
-    virtual void setText( int i, const QString &text );
-    virtual QString text( int i ) const;
+    virtual void setText( int i, const TQString &text );
+    virtual TQString text( int i ) const;
     void setup();
     void update();
 
 protected:
-    QLineEdit *editWidget;
+    TQLineEdit *editWidget;
 
 };
 
@@ -100,20 +101,21 @@ protected:
  *
  ******************************************************************/
 
-class KWClassicMailMergeEditorList : public QListView
+class KWClassicMailMergeEditorList : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWClassicMailMergeEditorList( QWidget *parent, KWClassicSerialDataSource *db_ );
+    KWClassicMailMergeEditorList( TQWidget *tqparent, KWClassicSerialDataSource *db_ );
     virtual ~KWClassicMailMergeEditorList();
 
-    void invalidateCurrentRecord();
+    void tqinvalidateCurrentRecord();
     void updateItems();
     void displayRecord( int i );
 
     void setSorting( int, bool increasing = TRUE ) {
-        QListView::setSorting( -1, increasing );
+        TQListView::setSorting( -1, increasing );
     }
 
 protected slots:
@@ -135,27 +137,28 @@ protected:
 class KWClassicMailMergeEditor : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWClassicMailMergeEditor( QWidget *parent, KWClassicSerialDataSource *db_ );
+    KWClassicMailMergeEditor( TQWidget *tqparent, KWClassicSerialDataSource *db_ );
 
 protected:
-    void resizeEvent( QResizeEvent *e );
+    void resizeEvent( TQResizeEvent *e );
     void updateButton();
 
-    QSpinBox *records;
+    TQSpinBox *records;
     KWClassicMailMergeEditorList *dbList;
-    QWidget *back;
+    TQWidget *back;
     KWClassicSerialDataSource *db;
 
-    QToolButton *first;
-    QToolButton *back_;
-    QToolButton *forward;
-    QToolButton *finish;
-    QToolButton *newRecord;
-    QToolButton *newEntry;
-    QToolButton *deleteRecord;
-    QToolButton *deleteEntry;
+    TQToolButton *first;
+    TQToolButton *back_;
+    TQToolButton *forward;
+    TQToolButton *finish;
+    TQToolButton *newRecord;
+    TQToolButton *newEntry;
+    TQToolButton *deleteRecord;
+    TQToolButton *deleteEntry;
 
 protected slots:
     void changeRecord( int i );