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, 17 insertions, 16 deletions

diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
index 335574b8..32fe74cd 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
@@ -34,8 +34,9 @@ class KWMailMergeKABC;
 class KWMailMergeKABCConfig: public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KWMailMergeKABCConfig( QWidget *parent, KWMailMergeKABC *db_ );
+    KWMailMergeKABCConfig( TQWidget *tqparent, KWMailMergeKABC *db_ );
     virtual ~KWMailMergeKABCConfig();
 
 
@@ -57,14 +58,14 @@ private slots:
     void launchAddressbook() const;
 
     /**
-       Updates the parent's mail merge list from items in the right Listview.
+       Updates the tqparent's mail merge list from items in the right Listview.
      */
     void acceptSelection();
 
     /**
        Hides items in the left listview, which are not matching  @p txt.
      */
-    void filterChanged( const QString& txt );
+    void filterChanged( const TQString& txt );
 
     /**
        Saves the selected single entries to a new KABC::DistributionList in KAddressbook.
@@ -79,7 +80,7 @@ private:
     /**
        Store all categories used in the addressbook, to avoid some iterator cycles.
      */
-    QStringList _usedCategories;
+    TQStringList _usedCategories;
 
     /**
        The mail merge list.
@@ -87,17 +88,17 @@ private:
     KWMailMergeKABC *_db;
 
     /**
-       Removes duplicates in the left QListView, when moving an item to the right.
+       Removes duplicates in the left TQListView, when moving an item to the right.
      */
-    void destroyAvailableClones( const QString& uid );
+    void destroyAvailableClones( const TQString& uid );
 
     /**
-       Appends the previously selected entries to the right QListView.
+       Appends the previously selected entries to the right TQListView.
      */
     void initSelectedAddressees();
 
     /**
-      Appends the previously selected distribution lists to the right QListView.
+      Appends the previously selected distribution lists to the right TQListView.
     */
     void initSelectedLists();
 
@@ -111,22 +112,22 @@ private:
        
        Called by KWMailMergeKABCConfig::removeSelectedContacts().
      */
-    void removeContact( QListViewItem* item );
+    void removeContact( TQListViewItem* item );
 
     /**
        Appends all KAddressbook entries in KABC::StdAddressBook::self() and all
-       KABC::DistributionLists to the left QListView.
+       KABC::DistributionLists to the left TQListView.
     */
     void updateAvailable();
 };
 
 
-class KWMailMergeKABCConfigListItem : public QListViewItem
+class KWMailMergeKABCConfigListItem : public TQListViewItem
 {
 
 public:
-    KWMailMergeKABCConfigListItem( QListView *parent, const KABC::Addressee& addressEntry );
-    KWMailMergeKABCConfigListItem( QListViewItem *parent, const KABC::Addressee& addressEntry );
+    KWMailMergeKABCConfigListItem( TQListView *tqparent, const KABC::Addressee& addressEntry );
+    KWMailMergeKABCConfigListItem( TQListViewItem *tqparent, const KABC::Addressee& addressEntry );
     virtual ~KWMailMergeKABCConfigListItem();
 
     /**
@@ -135,11 +136,11 @@ public:
     KABC::Addressee addressee() const;
 
     /**
-       This is an overloaded member function of QListViewItem::text( int column ).
+       This is an overloaded member function of TQListViewItem::text( int column ).
        It Returns the KABC::Addressee::uid(), if column is set to -1.
-       Otherwise QListViewItem::text( int column ) is returned.
+       Otherwise TQListViewItem::text( int column ) is returned.
      */
-    QString text( int column ) const;
+    TQString text( int column ) const;
 
 
 private: