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, 29 insertions, 27 deletions

diff --git a/kword/KWTableDia.h b/kword/KWTableDia.h
index 60f58b5c..0e6ad2d5 100644
--- a/kword/KWTableDia.h
+++ b/kword/KWTableDia.h
@@ -21,7 +21,7 @@
 #define tabledia_h
 
 #include <kdialogbase.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
 
 #include "defs.h"
 #include <KoBorder.h>
@@ -30,32 +30,33 @@ class KWCanvas;
 class KWDocument;
 class KWTableTemplateSelector;
 
-class QGridLayout;
-class QLabel;
-class QListBox;
-class QWidget;
-class QCheckBox;
-class QButtonGroup;
-class QComboBox;
-class QSpinBox;
+class TQGridLayout;
+class TQLabel;
+class TQListBox;
+class TQWidget;
+class TQCheckBox;
+class TQButtonGroup;
+class TQComboBox;
+class TQSpinBox;
 
 /******************************************************************/
 /* Class: KWTablePreview                                          */
 /******************************************************************/
 
-class KWTablePreview : public QWidget
+class KWTablePreview : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWTablePreview( QWidget *_parent, int _rows, int _cols )
-        : QWidget( _parent ), rows( _rows ), cols( _cols ) {}
+    KWTablePreview( TQWidget *_parent, int _rows, int _cols )
+        : TQWidget( _parent ), rows( _rows ), cols( _cols ) {}
 
-    void setRows( int _rows ) { rows = _rows; repaint( true ); }
-    void setCols( int _cols ) { cols = _cols; repaint( true ); }
+    void setRows( int _rows ) { rows = _rows; tqrepaint( true ); }
+    void setCols( int _cols ) { cols = _cols; tqrepaint( true ); }
 
 protected:
-    void paintEvent( QPaintEvent *e );
+    void paintEvent( TQPaintEvent *e );
 
     int rows, cols;
 
@@ -68,30 +69,31 @@ protected:
 class KWTableDia : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     typedef int CellSize; // in fact KWTableFrameSet::CellSize, which is an enum
     enum UseMode{ NEW, EDIT };
-    KWTableDia( QWidget *parent, const char *name, UseMode _useMode, KWCanvas *_canvas,
+    KWTableDia( TQWidget *tqparent, const char *name, UseMode _useMode, KWCanvas *_canvas,
             KWDocument *_doc, int rows, int cols, CellSize wid, CellSize hei, bool floating,
-            const QString & _templateName,  int format);
+            const TQString & _templateName,  int format);
 
 protected:
     void setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool floating );
-    void setupTab2( const QString &_templateName,  int format);
+    void setupTab2( const TQString &_templateName,  int format);
 
-    QWidget *tab1;
-    QLabel *lRows, *lCols;
+    TQWidget *tab1;
+    TQLabel *lRows, *lCols;
 #ifdef ALLOW_NON_INLINE_TABLES
-    QLabel *lWid, *lHei;
-    QComboBox *cHei, *cWid;
-    QCheckBox *cbIsFloating;
+    TQLabel *lWid, *lHei;
+    TQComboBox *cHei, *cWid;
+    TQCheckBox *cbIsFloating;
 #endif
-    QSpinBox *nRows, *nCols;
+    TQSpinBox *nRows, *nCols;
     KWTablePreview *preview;
-    QCheckBox *cbReapplyTemplate1, *cbReapplyTemplate2;
+    TQCheckBox *cbReapplyTemplate1, *cbReapplyTemplate2;
 
-    QGridLayout *grid;
+    TQGridLayout *grid;
     KWTableTemplateSelector *tableTemplateSelector;
 
     UseMode m_useMode;
@@ -99,7 +101,7 @@ protected:
     KWDocument *doc;
 
     int oldRowCount, oldColCount;
-    QString oldTemplateName;
+    TQString oldTemplateName;
 protected slots:
     void rowsChanged( int );
     void colsChanged( int );