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

diff --git a/kword/KWTableStyleManager.h b/kword/KWTableStyleManager.h
index aaa61083..4d95ca75 100644
--- a/kword/KWTableStyleManager.h
+++ b/kword/KWTableStyleManager.h
@@ -24,17 +24,17 @@
 #include "KWTableStyle.h"
 
 #include <kdialogbase.h>
-#include <qgroupbox.h>
-#include <qptrlist.h>
+#include <tqgroupbox.h>
+#include <tqptrlist.h>
 
 
-class QGridLayout;
-class QLineEdit;
-class QListBox;
-class QPushButton;
-class QWidget;
-class QFrame;
-class QComboBox;
+class TQGridLayout;
+class TQLineEdit;
+class TQListBox;
+class TQPushButton;
+class TQWidget;
+class TQFrame;
+class TQComboBox;
 
 class KWDocument;
 class KoParagStyle;
@@ -45,18 +45,19 @@ class KoTextDocument;
 /* Class: KWTableStylePreview                                     */
 /******************************************************************/
 
-class KWTableStylePreview : public QGroupBox
+class KWTableStylePreview : public TQGroupBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWTableStylePreview(const QString &title, const QString &text, QWidget *parent, const char* name = 0);
+    KWTableStylePreview(const TQString &title, const TQString &text, TQWidget *tqparent, const char* name = 0);
     virtual ~KWTableStylePreview();
 
     void setTableStyle(KWTableStyle *_tableStyle);
 
 protected:
-    void drawContents( QPainter *p );
+    void drawContents( TQPainter *p );
 
     KWTableStyle *tableStyle;
 
@@ -96,9 +97,10 @@ class KWTableStyleListItem
 class KWTableStyleManager : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWTableStyleManager( QWidget *_parent, KWDocument *_doc );
+    KWTableStyleManager( TQWidget *_parent, KWDocument *_doc );
     ~KWTableStyleManager();
 
 private:
@@ -110,26 +112,26 @@ private:
     void save();
     int tableStyleIndex( int pos );
 
-    void addStyles(const QPtrList<KWTableStyle> &listStyle );
-
-    QListBox *m_stylesList;
-    QLineEdit *m_nameString;
-    QPushButton *m_deleteButton;
-    QPushButton *m_newButton;
-    QPushButton *m_moveUpButton;
-    QPushButton *m_moveDownButton;
-    QComboBox *m_frameStyle;
-    QComboBox *m_style;
-    QPushButton *m_changeFrameStyleButton;
-    QPushButton *m_changeStyleButton;
-    QStringList m_styleOrder;
-    QGroupBox *previewBox;
+    void addStyles(const TQPtrList<KWTableStyle> &listStyle );
+
+    TQListBox *m_stylesList;
+    TQLineEdit *m_nameString;
+    TQPushButton *m_deleteButton;
+    TQPushButton *m_newButton;
+    TQPushButton *m_moveUpButton;
+    TQPushButton *m_moveDownButton;
+    TQComboBox *m_frameStyle;
+    TQComboBox *m_style;
+    TQPushButton *m_changeFrameStyleButton;
+    TQPushButton *m_changeStyleButton;
+    TQStringList m_styleOrder;
+    TQGroupBox *previewBox;
     KWTableStylePreview *preview;
 
-    QWidget *main;
+    TQWidget *main;
 
     KWTableStyle *m_currentTableStyle;
-    QPtrList<KWTableStyleListItem> m_tableStyles;
+    TQPtrList<KWTableStyleListItem> m_tableStyles;
     int numTableStyles;
     bool noSignals;
 
@@ -148,7 +150,7 @@ protected slots:
     void deleteStyle();
     void moveUpStyle();
     void moveDownStyle();
-    void renameStyle(const QString &);
+    void renameStyle(const TQString &);
     void setupMain();
     void importFromFile();
 };