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, 10 insertions, 9 deletions

diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h
index 2d639074..2b039c01 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h
@@ -21,8 +21,8 @@
 #ifndef _KWMAILMERGE_KSPREAD_H_
 #define _KWMAILMERGE_KSPREAD_H_
 
-#include <qdom.h>
-#include <qmap.h>
+#include <tqdom.h>
+#include <tqmap.h>
 
 #include <kspread_doc.h>
 #include <kspread_sheet.h>
@@ -32,20 +32,21 @@
 class KWMailMergeKSpread: public KWMailMergeDataSource
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KWMailMergeKSpread( KInstance *inst, QObject *parent );
+    KWMailMergeKSpread( KInstance *inst, TQObject *tqparent );
     ~KWMailMergeKSpread();
 
     /**
        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".
@@ -54,7 +55,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource
        
        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.
@@ -71,7 +72,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource
     /**
        Shows a KWMailMergeKSpreadConfig dialog for selecting entries from KAddressbook.
      */
-    virtual bool showConfigDialog( QWidget*, int action);
+    virtual bool showConfigDialog( TQWidget*, int action);
 
 
     void setURL( const KURL &url ) { _url = url; }
@@ -92,14 +93,14 @@ class KWMailMergeKSpread: public KWMailMergeDataSource
     int rows() const;
     int columns() const;
 
-    QString cellText( const KSpread::Cell* ) const;
+    TQString cellText( const KSpread::Cell* ) const;
 
     KSpread::Doc *_document;
     KSpread::Sheet* _sheet;
     KURL _url;
     int _spreadSheetNumber;
 
-    QMap<QString, int> _columnMap;
+    TQMap<TQString, int> _columnMap;
 };
 
 #endif