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, 28 insertions, 24 deletions

diff --git a/lib/kotext/KoCustomVariablesDia.h b/lib/kotext/KoCustomVariablesDia.h
index 14d5dbf0..b5883ddb 100644
--- a/lib/kotext/KoCustomVariablesDia.h
+++ b/lib/kotext/KoCustomVariablesDia.h
@@ -23,15 +23,15 @@
 #include "KoVariable.h"
 
 #include <kdialogbase.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
 #include <klistview.h>
 #include <koffice_export.h>
-class QComboBox;
-class QVBox;
-class QResizeEvent;
+class TQComboBox;
+class TQVBox;
+class TQResizeEvent;
 class KLineEdit;
-class QCloseEvent;
+class TQCloseEvent;
 
 /******************************************************************
  *
@@ -42,21 +42,22 @@ class QCloseEvent;
 class KoVariableNameDia : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     // For KWMailMergeVariableInsertDia
-    KoVariableNameDia( QWidget *parent );
+    KoVariableNameDia( TQWidget *tqparent );
     // For kwview
-    KoVariableNameDia( QWidget *parent, const QPtrList<KoVariable> &vars );
-    QString getName() const;
+    KoVariableNameDia( TQWidget *tqparent, const TQPtrList<KoVariable> &vars );
+    TQString getName() const;
 
 protected slots:
-    void textChanged ( const QString &_text );
+    void textChanged ( const TQString &_text );
 protected:
     void init();
 
-    QComboBox *names;
-    QVBox *back;
+    TQComboBox *names;
+    TQVBox *back;
 };
 
 /**
@@ -64,16 +65,16 @@ protected:
  * Used by KoCustomVariablesDia
  * Represents an item in the listview, holding a lineedit to edit the value of the variable.
  */
-class KoCustomVariablesListItem : public QListViewItem
+class KoCustomVariablesListItem : public TQListViewItem
 {
 public:
-    KoCustomVariablesListItem( QListView *parent );
+    KoCustomVariablesListItem( TQListView *tqparent );
 
     void setVariable( KoCustomVariable *v );
     KoCustomVariable *getVariable() const;
 
     virtual void setup();
-    virtual int width ( const QFontMetrics & fm, const QListView * lv, int c ) const;
+    virtual int width ( const TQFontMetrics & fm, const TQListView * lv, int c ) const;
     void update();
 
     // Gets the value from the lineedit and sets it into the variable
@@ -92,9 +93,10 @@ protected:
 class KoCustomVariablesList : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KoCustomVariablesList( QWidget *parent );
+    KoCustomVariablesList( TQWidget *tqparent );
 
     void setValues();
     void updateItems();
@@ -115,14 +117,15 @@ private:
 class KOTEXT_EXPORT KoCustomVariablesDia : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KoCustomVariablesDia( QWidget *parent, const QPtrList<KoVariable> &variables );
+    KoCustomVariablesDia( TQWidget *tqparent, const TQPtrList<KoVariable> &variables );
 protected slots:
     void slotOk();
 
 protected:
-    QVBox *back;
+    TQVBox *back;
     KoCustomVariablesList *list;
 
 };
@@ -135,27 +138,28 @@ protected:
 class KOTEXT_EXPORT KoCustomVarDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
      * Add new variable
      */
-    KoCustomVarDialog( QWidget *parent );
+    KoCustomVarDialog( TQWidget *tqparent );
     /**
      * Edit existing variable @p var
      */
-    KoCustomVarDialog( QWidget *parent, KoCustomVariable *var );
+    KoCustomVarDialog( TQWidget *tqparent, KoCustomVariable *var );
 
-    virtual QString name();
-    virtual QString value();
+    virtual TQString name();
+    virtual TQString value();
 
 protected slots:
     void slotAddOk();
     void slotEditOk();
-    void slotTextChanged(const QString&);
+    void slotTextChanged(const TQString&);
 
 protected:
-    QVBox *back;
+    TQVBox *back;
     KLineEdit *m_name;
     KLineEdit *m_value;