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, 36 insertions, 32 deletions

diff --git a/kword/KWMailMergeDataBase.h b/kword/KWMailMergeDataBase.h
index 4b20e3e9..2906ebe8 100644
--- a/kword/KWMailMergeDataBase.h
+++ b/kword/KWMailMergeDataBase.h
@@ -26,22 +26,22 @@
 #include <ktrader.h>
 
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdom.h>
-#include <qtextstream.h>
+#include <tqmap.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdom.h>
+#include <tqtextstream.h>
 
 #include "KWMailMergeDataSource.h"
 #include "KWordMailMergeDatabaseIface.h"
 #include <koffice_export.h>
 
-class QListBox;
-class QPushButton;
-class QLineEdit;
-class QSpinBox;
+class TQListBox;
+class TQPushButton;
+class TQLineEdit;
+class TQSpinBox;
 class KWDocument;
-class QVBox;
+class TQVBox;
 
 //class KWMailMergeDataBase;
 
@@ -54,29 +54,30 @@ class QVBox;
  *
  ******************************************************************/
 
-class KWORD_EXPORT KWMailMergeDataBase: public QObject,KWordMailMergeDatabaseIface
+class KWORD_EXPORT KWMailMergeDataBase: public TQObject,KWordMailMergeDatabaseIface
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
     KWMailMergeDataBase( KWDocument *doc_ );
-    void showConfigDialog(QWidget *); // Select datasource type  and / or configure datasource
+    void showConfigDialog(TQWidget *); // Select datasource type  and / or configure datasource
 
-    QString getValue( const QString &name, int record = -1 ) const;  //accesses the plugin
+    TQString getValue( const TQString &name, int record = -1 ) const;  //accesses the plugin
     bool isSampleRecord();
 
-    const QMap< QString, QString > &getRecordEntries() const; //accesses the plugin
+    const TQMap< TQString, TQString > &getRecordEntries() const; //accesses the plugin
     int getNumRecords() const; //accesses the plugin
 
-    QDomElement save(QDomDocument &doc) const; // save some global config + plugin config
-    void load( const QDomElement& elem ); // save some global config + plugin config
+    TQDomElement save(TQDomDocument &doc) const; // save some global config + plugin config
+    void load( const TQDomElement& elem ); // save some global config + plugin config
 
-    KWMailMergeDataSource *loadPlugin(const QString& name);
+    KWMailMergeDataSource *loadPlugin(const TQString& name);
     KWMailMergeDataSource *openPluginFor(int type,int &version);
 
     virtual void refresh(bool force);
-    virtual QStringList availablePlugins();
-    virtual bool loadPlugin(const QString &name,const QString &command);
+    virtual TQStringList availablePlugins();
+    virtual bool loadPlugin(const TQString &name,const TQString &command);
     virtual bool isConfigDialogShown();
     
     int version();
@@ -87,8 +88,8 @@ protected:
     KWDocument *doc;
     int action;
     class KWMailMergeDataSource *plugin;
-    QMap<QString, QString> emptyMap;
-    bool askUserForConfirmationAndConfig(KWMailMergeDataSource *tmpPlugin,bool config,QWidget *par,int version);
+    TQMap<TQString, TQString> emptyMap;
+    bool askUserForConfirmationAndConfig(KWMailMergeDataSource *tmpPlugin,bool config,TQWidget *par,int version);
     bool rejectdcopcall;
 };
 
@@ -96,6 +97,7 @@ protected:
 class KWMailMergeChoosePluginDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KWMailMergeChoosePluginDialog( KTrader::OfferList );
@@ -107,24 +109,25 @@ class KWMailMergeChoosePluginDialog : public KDialogBase
     void pluginChanged( int pos );
 
   private:
-    class QComboBox *chooser;
-    class QLabel *descriptionLabel;
+    class TQComboBox *chooser;
+    class TQLabel *descriptionLabel;
     KTrader::OfferList pluginOffers;
 };
 
 class KWMailMergeConfigDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-   KWMailMergeConfigDialog ( QWidget *parent, KWMailMergeDataBase *db );
+   KWMailMergeConfigDialog ( TQWidget *tqparent, KWMailMergeDataBase *db );
    ~KWMailMergeConfigDialog();
 protected:
-    QPushButton *edit;
-    QPushButton *create;
-    QPushButton *open;
-    QPushButton *preview;
-    QPushButton *document;
+    TQPushButton *edit;
+    TQPushButton *create;
+    TQPushButton *open;
+    TQPushButton *preview;
+    TQPushButton *document;
     KWMailMergeDataBase *db_;
     void enableDisableEdit();
     void doNewActions();
@@ -146,10 +149,11 @@ protected slots:
 class KWMailMergeVariableInsertDia : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KWMailMergeVariableInsertDia( QWidget *parent, KWMailMergeDataBase *db );
-    QString getName() const; // ### unused, can we remove this?
+    KWMailMergeVariableInsertDia( TQWidget *tqparent, KWMailMergeDataBase *db );
+    TQString getName() const; // ### unused, can we remove this?
 
   protected slots:
     void slotSelectionChanged();
@@ -158,7 +162,7 @@ class KWMailMergeVariableInsertDia : public KDialogBase
     KWMailMergeDataBase *m_db;
 
   protected:
-    QListBox *names;
+    TQListBox *names;
 };
 
 #endif