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, 40 insertions, 38 deletions

diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h
index fdf4d92f..6d17eeb6 100644
--- a/kword/KWDocStruct.h
+++ b/kword/KWDocStruct.h
@@ -21,15 +21,15 @@
 #define docstruct_h
 
 #include <klistview.h>
-#include <qwidget.h>
+#include <tqwidget.h>
 
 class KWDocument;
 class KWFormulaFrameSet;
 class KWPictureFrameSet;
 class KWPartFrameSet;
 class KWGUI;
-class QWidget;
-class QVBoxLayout;
+class TQWidget;
+class TQVBoxLayout;
 class KWFrame;
 class KWFrameSet;
 class KWTextParag;
@@ -38,7 +38,7 @@ class KWTextParag;
 /* Class: KWOrderedFrameSet                                       */
 /******************************************************************/
 
-/** Provides a way to sort framesets using a QValueList based on their top left corner. */
+/** Provides a way to sort framesets using a TQValueList based on their top left corner. */
 class KWOrderedFrameSet
 {
 public:
@@ -67,16 +67,16 @@ public:
         IT_PARAG = 13
     };
 
-    KWDocListViewItem(QListViewItem *_parent, const QString &_text);
-    KWDocListViewItem(QListViewItem *_parent, QListViewItem *_after, const QString &_text);
-    KWDocListViewItem(QListView *_parent, const QString &_text);
+    KWDocListViewItem(TQListViewItem *_parent, const TQString &_text);
+    KWDocListViewItem(TQListViewItem *_parent, TQListViewItem *_after, const TQString &_text);
+    KWDocListViewItem(TQListView *_parent, const TQString &_text);
     virtual ItemType itemType() { return IT_BASE; }
     virtual void selectItem() {}
     virtual void editItem() {}
     virtual void deleteItem() {}
     virtual void editProperties() {}
     virtual void speakItem() {}
-    virtual void contextMenu(QListViewItem *, const QPoint &, int) {}
+    virtual void contextMenu(TQListViewItem *, const TQPoint &, int) {}
 
 protected:
     KWDocument* doc();
@@ -91,15 +91,15 @@ protected:
 class KWDocStructParagItem : public KWDocListViewItem
 {
 public:
-    KWDocStructParagItem(QListViewItem* parent, const QString& text, KWTextParag* parag);
-    KWDocStructParagItem(QListViewItem* parent, QListViewItem* after, const QString& text, KWTextParag* parag);
+    KWDocStructParagItem(TQListViewItem* tqparent, const TQString& text, KWTextParag* parag);
+    KWDocStructParagItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text, KWTextParag* parag);
     virtual ItemType itemType() { return IT_PARAG; }
     virtual void selectItem();
     virtual void editItem();
     virtual void deleteItem();
     virtual void editProperties();
     virtual void speakItem();
-    virtual void contextMenu(QListViewItem* item, const QPoint& p, int);
+    virtual void contextMenu(TQListViewItem* item, const TQPoint& p, int);
 
     KWTextParag* parag() const { return m_parag; }
 
@@ -114,9 +114,9 @@ protected:
 class KWDocStructTextFrameItem : public KWDocListViewItem
 {
 public:
-    KWDocStructTextFrameItem(QListViewItem* parent, const QString& text,
+    KWDocStructTextFrameItem(TQListViewItem* tqparent, const TQString& text,
         KWTextFrameSet* frameset, KWFrame* frame );
-    KWDocStructTextFrameItem(QListViewItem* parent, QListViewItem* after, const QString& text,
+    KWDocStructTextFrameItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text,
         KWTextFrameSet* frameset, KWFrame* frame );
     virtual int ItemType() { return IT_TEXTFRAME; }
     virtual void selectItem();
@@ -124,7 +124,7 @@ public:
     virtual void deleteItem();
     virtual void editProperties();
     virtual void speakItem();
-    virtual void contextMenu(QListViewItem* item, const QPoint& p, int);
+    virtual void contextMenu(TQListViewItem* item, const TQPoint& p, int);
 
     KWFrame* frame() const { return m_frame; }
     KWTextFrameSet* frameSet() const { return m_frameset; };
@@ -144,8 +144,8 @@ protected:
 class KWDocStructTextFrameSetItem : public KWDocListViewItem
 {
 public:
-    KWDocStructTextFrameSetItem(QListViewItem* parent, const QString& text, KWTextFrameSet* frameset);
-    KWDocStructTextFrameSetItem(QListViewItem* parent, QListViewItem* after, const QString& text,
+    KWDocStructTextFrameSetItem(TQListViewItem* tqparent, const TQString& text, KWTextFrameSet* frameset);
+    KWDocStructTextFrameSetItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text,
         KWTextFrameSet* frameset );
     virtual int ItemType() { return IT_TEXT; }
     virtual void selectItem();
@@ -153,7 +153,7 @@ public:
     virtual void deleteItem();
     virtual void editProperties();
     virtual void speakItem();
-    virtual void contextMenu(QListViewItem* item, const QPoint& p, int);
+    virtual void contextMenu(TQListViewItem* item, const TQPoint& p, int);
 
     KWTextFrameSet* frameSet() const { return m_frameset; };
     void setupTextFrames();
@@ -171,8 +171,8 @@ protected:
 class KWDocStructTableItem : public KWDocListViewItem
 {
 public:
-    KWDocStructTableItem(QListViewItem* parent, const QString& text, KWTableFrameSet* table );
-    KWDocStructTableItem(QListViewItem* parent, QListViewItem* after, const QString& text,
+    KWDocStructTableItem(TQListViewItem* tqparent, const TQString& text, KWTableFrameSet* table );
+    KWDocStructTableItem(TQListViewItem* tqparent, TQListViewItem* after, const TQString& text,
         KWTableFrameSet* table );
     virtual int ItemType() { return IT_TABLE; }
     virtual void selectItem();
@@ -180,7 +180,7 @@ public:
     virtual void deleteItem();
     virtual void editProperties();
     virtual void speakItem();
-    virtual void contextMenu(QListViewItem* item, const QPoint& p, int);
+    virtual void contextMenu(TQListViewItem* item, const TQPoint& p, int);
 
     KWTableFrameSet* table() const { return m_table; };
     void setupCells();
@@ -197,14 +197,14 @@ protected:
 class KWDocStructFormulaItem : public KWDocListViewItem
 {
 public:
-    KWDocStructFormulaItem(QListViewItem* parent, const QString& text, KWFormulaFrameSet* form);
+    KWDocStructFormulaItem(TQListViewItem* tqparent, const TQString& text, KWFormulaFrameSet* form);
     virtual int ItemType() { return IT_FORMULA; }
     virtual void selectItem();
     virtual void editItem();
     virtual void deleteItem();
     virtual void editProperties();
     virtual void speakItem();
-    virtual void contextMenu(QListViewItem* item, const QPoint& p, int);
+    virtual void contextMenu(TQListViewItem* item, const TQPoint& p, int);
 
 protected:
     KWFormulaFrameSet* m_form;
@@ -218,13 +218,13 @@ protected:
 class KWDocStructPictureItem : public KWDocListViewItem
 {
 public:
-    KWDocStructPictureItem(QListViewItem* parent, const QString& text, KWPictureFrameSet* pic);
+    KWDocStructPictureItem(TQListViewItem* tqparent, const TQString& text, KWPictureFrameSet* pic);
     virtual int ItemType() { return IT_PICTURE; }
     virtual void selectItem();
     virtual void editItem();
     virtual void deleteItem();
     virtual void editProperties();
-    virtual void contextMenu(QListViewItem* item, const QPoint& p, int);
+    virtual void contextMenu(TQListViewItem* item, const TQPoint& p, int);
 
 protected:
     KWPictureFrameSet* m_pic;
@@ -237,13 +237,13 @@ protected:
 class KWDocStructPartItem : public KWDocListViewItem
 {
 public:
-    KWDocStructPartItem(QListViewItem* parent, const QString& text, KWPartFrameSet* part);
+    KWDocStructPartItem(TQListViewItem* tqparent, const TQString& text, KWPartFrameSet* part);
     virtual int ItemType() { return IT_PART; }
     virtual void selectItem();
     virtual void editItem();
     virtual void deleteItem();
     virtual void editProperties();
-    virtual void contextMenu(QListViewItem* item, const QPoint& p, int);
+    virtual void contextMenu(TQListViewItem* item, const TQPoint& p, int);
 
 protected:
     KWPartFrameSet* m_part;
@@ -256,7 +256,7 @@ protected:
 class KWDocStructRootItem : public KWDocListViewItem
 {
 public:
-    KWDocStructRootItem(QListView* parent, const QString& text, TypeStructDocItem type);
+    KWDocStructRootItem(TQListView* tqparent, const TQString& text, TypeStructDocItem type);
 
     virtual int ItemType() { return IT_ROOT; }
     void setupArrangement();
@@ -282,15 +282,16 @@ protected:
 class KWDocStructTree : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWDocStructTree( QWidget* parent, KWDocument* doc, KWGUI* gui );
+    KWDocStructTree( TQWidget* tqparent, KWDocument* doc, KWGUI* gui );
     ~KWDocStructTree();
 
     void setup();
     void refreshTree(int _type);
-    QSize minimumSizeHint() const {
-        return QSize( 0, 0 );
+    TQSize tqminimumSizeHint() const {
+        return TQSize( 0, 0 );
     }
     void selectItem();
     void editItem();
@@ -302,10 +303,10 @@ public:
     KWGUI* gui() { return m_gui; };
 
 public slots:
-    void slotContextMenu(KListView* l, QListViewItem* i, const QPoint& p);
-    void slotRightButtonClicked(QListViewItem*, const QPoint&, int);
-    void slotDoubleClicked(QListViewItem* item);
-    void slotReturnPressed(QListViewItem* item);
+    void slotContextMenu(KListView* l, TQListViewItem* i, const TQPoint& p);
+    void slotRightButtonClicked(TQListViewItem*, const TQPoint&, int);
+    void slotDoubleClicked(TQListViewItem* item);
+    void slotReturnPressed(TQListViewItem* item);
 
 protected:
     KWDocument* m_doc;
@@ -318,12 +319,13 @@ protected:
 /* Class: KWDocStruct                                             */
 /******************************************************************/
 
-class KWDocStruct : public QWidget
+class KWDocStruct : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KWDocStruct( QWidget* parent, KWDocument* doc, KWGUI* gui );
+    KWDocStruct( TQWidget* tqparent, KWDocument* doc, KWGUI* gui );
     void selectItem();
     void editItem();
     void deleteItem();
@@ -341,9 +343,9 @@ public slots:
 
 protected:
     KWDocStructTree* m_tree;
-    QVBoxLayout* m_layout;
+    TQVBoxLayout* m_layout;
 
-    virtual void paintEvent(QPaintEvent* ev);
+    virtual void paintEvent(TQPaintEvent* ev);
 
     KWDocument* m_doc;
     KWGUI* m_gui;