1 files changed, 20 insertions, 19 deletions

diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h
index 2787ac6f..f2754117 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.h
@@ -23,8 +23,8 @@
 #ifndef _KWMAILMERGE_KABC_H_
 #define _KWMAILMERGE_KABC_H_
 
-#include <qdom.h>
-#include <qguardedptr.h>
+#include <tqdom.h>
+#include <tqguardedptr.h>
 
 #include <kabc/addressbook.h>
 
@@ -33,20 +33,21 @@
 class KWMailMergeKABC: public KWMailMergeDataSource
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWMailMergeKABC( KInstance *inst, QObject *parent );
+    KWMailMergeKABC( KInstance *inst, TQObject *tqparent );
     ~KWMailMergeKABC();
 
     /**
        Saves the mail merge list to the kword document.
      */
-    virtual void save( QDomDocument&, QDomElement& );
+    virtual void save( TQDomDocument&, TQDomElement& );
 
     /**
        Loads the mail merge list stored in the kword document.
      */
-    virtual void load( QDomElement& );
+    virtual void load( TQDomElement& );
 
     /**
        @param name	The name of the value e.g. "Family name".
@@ -55,7 +56,7 @@ public:
        
        If @p record equals -1, @p name is returned.
      */
-    virtual class QString getValue( const class QString &name, int record = -1 ) const;
+    virtual class TQString getValue( const class TQString &name, int record = -1 ) const;
 
     /**
        @return	The number of available contacts in mail merge list.
@@ -72,7 +73,7 @@ public:
     /**
        Shows a KWMailMergeKABCConfig dialog for selecting entries from KAddressbook.
      */
-    virtual bool showConfigDialog( QWidget*, int action);
+    virtual bool showConfigDialog( TQWidget*, int action);
 
 protected:
     friend class KWMailMergeKABCConfig;
@@ -86,7 +87,7 @@ protected:
        
        @param uid	The entry's KABC::Addressee::uid().
      */
-    void addEntry( const QString &uid );
+    void addEntry( const TQString &uid );
 
     /**
        Adds a distribution list to the mail merge list.
@@ -96,7 +97,7 @@ protected:
        
        @param id	The DistributionList::name().
      */
-    void addList( const QString &id );
+    void addList( const TQString &id );
 
     /**
        Removes all entries and distribution lists from the mail merge list.
@@ -108,7 +109,7 @@ protected:
        
        To be called by KWMailMergeKABCConfig::initSelectedLists()
      */
-    virtual QStringList lists() const;
+    virtual TQStringList lists() const;
 
     /**
        @return	The KABC::Addressee::uid() of all individually selected 
@@ -116,7 +117,7 @@ protected:
        
        To be called by KWMailMergeKABCConfig::initSelectedAddressees()
     */
-    virtual QStringList singleRecords() const;
+    virtual TQStringList singleRecords() const;
 
 private:
     /**
@@ -132,47 +133,47 @@ private:
     /**
        Just an Iterator.
      */
-    mutable QStringList::ConstIterator _UIDIterator;
+    mutable TQStringList::ConstIterator _UIDIterator;
 
     /**
-       The "real" mail merge list. A list of QStrings. Each represents 
+       The "real" mail merge list. A list of TQStrings. Each represents 
        the KABC::Addressee::uid() of a KAdressbook entry.
        There is no UID twice in this list.
       
        Needed because selected contacts may appear in a selected 
        distribution list, too. And we don't want to print it multiple.
      */
-    QStringList _exclusiveUIDs;
+    TQStringList _exclusiveUIDs;
 
     /**
        This list contains all the KABC::Addressee::uid() selected 
        individually with the KWMailMergeKABCConfig dialog.
      */
-    QStringList _individualUIDs;
+    TQStringList _individualUIDs;
 
     /**
        This list contains all the KABC::Addressee::uid() from the distribution 
        lists selected with the KWMailMergeKABCConfig dialog.
      */
-    QStringList _listUIDs;
+    TQStringList _listUIDs;
 
     /**
        This list contains all the DistributionList::name() selected with the
        KWMailMergeKABCConfig dialog.
      */
-    QStringList _lists;
+    TQStringList _lists;
 
 
     /**
        Appends all KABC::Addressee::uid() of a distribution list to _listUIDs
        and updates the mail merge list.
        
-       To be used by KWMailMergeKABCConfig::addList( const QString &id )
+       To be used by KWMailMergeKABCConfig::addList( const TQString &id )
        only.
        
        @param listName	The DistributionList::name() of the distribution list.
      */
-    void parseList( const QString& listName );
+    void parseList( const TQString& listName );
 
     /**
        Removes duplicate entries in the mail merge list.