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, 33 insertions, 33 deletions

diff --git a/kplato/kptcanvasitem.h b/kplato/kptcanvasitem.h
index fdd5891e..81d0dc0f 100644
--- a/kplato/kptcanvasitem.h
+++ b/kplato/kptcanvasitem.h
@@ -27,10 +27,10 @@
 #include "KDGanttViewTaskItem.h"
 #include "KDGanttViewEventItem.h"
 
-#include <qcanvas.h>
-#include <qrect.h>
+#include <tqcanvas.h>
+#include <tqrect.h>
 
-class QPainter;
+class TQPainter;
 
 namespace KPlato
 {
@@ -42,7 +42,7 @@ class PertRelationItem;
 class PertNodeItem;
 class GanttView;
 
-class PertNodeItem : public QCanvasPolygon
+class PertNodeItem : public TQCanvasPolygon
 {
 private:
     class PertNodeRelation
@@ -64,12 +64,12 @@ public:
 	void setVisible(bool yes);
     void move(PertCanvas *view, int row, int col);
 
-    QPoint exitPoint(Relation::Type type) const;
-	QPoint entryPoint(Relation::Type type) const;
+    TQPoint exitPoint(Relation::Type type) const;
+	TQPoint entryPoint(Relation::Type type) const;
 
 	Node &node() const { return m_node; }
 
-	QRect rect() const { return QRect(m_left, m_right); }
+	TQRect rect() const { return TQRect(m_left, m_right); }
     void setRow(int row) { m_row = row; }
 	int row() const { return m_row; }
     void setColumn(int col) { m_col = col; }
@@ -88,7 +88,7 @@ public:
     bool hasChild() { return m_node.numDependChildNodes(); }
 
 protected:
-    void drawShape(QPainter & p);
+    void drawShape(TQPainter & p);
 
 	int m_wgap;
 	int m_hgap;
@@ -97,15 +97,15 @@ protected:
 	int m_x;
 	int m_y;
 
-    QPtrList<PertNodeRelation> m_childRelations;
+    TQPtrList<PertNodeRelation> m_childRelations;
 
 private:
     Node &m_node;
     int m_row, m_col;
-	QPoint m_right; // Entry/exit point
-	QPoint m_left;  // Entry/exit point
-	QCanvasText *m_name;
-	QCanvasText *m_leader;
+	TQPoint m_right; // Entry/exit point
+	TQPoint m_left;  // Entry/exit point
+	TQCanvasText *m_name;
+	TQCanvasText *m_leader;
 
 #ifndef NDEBUG
     void printDebug( int );
@@ -162,10 +162,10 @@ public:
 
 /////////////////   PertRelationItem   ////////////////////
 
-class PertRelationItem : public QCanvasPolygon
+class PertRelationItem : public TQCanvasPolygon
 {
 public:
-    PertRelationItem(PertCanvas *view, PertNodeItem *parent, PertNodeItem *child, Relation *rel);
+    PertRelationItem(PertCanvas *view, PertNodeItem *tqparent, PertNodeItem *child, Relation *rel);
     virtual ~PertRelationItem();
 
     virtual int rtti() const;
@@ -177,12 +177,12 @@ public:
 	void setFinishStartPoints();
 	void setFinishFinishPoints();
 	void setStartStartPoints();
-	QPointArray areaPoints() const;
+	TQPointArray areaPoints() const;
 
 	bool rowFree(int row, int startCol, int endCol);
 
 protected:
-    void drawShape(QPainter &p);
+    void drawShape(TQPainter &p);
 
 private:
     PertCanvas *m_view;
@@ -191,14 +191,14 @@ private:
     PertNodeItem *m_childItem;
 	int left, top, right, bottom;
 
-	int parentTop;
-	int parentBottom;
+	int tqparentTop;
+	int tqparentBottom;
 	int childTop;
 
 	int childRow;
 	int childCol;
-	int parentRow;
-	int parentCol;
+	int tqparentRow;
+	int tqparentCol;
 
 	int wgap;
 	int hgap;
@@ -222,13 +222,13 @@ protected:
 class GanttViewSummaryItem : public KDGanttViewSummaryItem, public ItemBase
 {
 public:
-    GanttViewSummaryItem(KDGanttView *parent, Node *node);
-    GanttViewSummaryItem(KDGanttViewItem *parent, Node *node);
+    GanttViewSummaryItem(KDGanttView *tqparent, Node *node);
+    GanttViewSummaryItem(KDGanttViewItem *tqparent, Node *node);
 
     Node *getNode() { return m_node; }
     void insertRelations(GanttView *view);
-    KDGanttViewItem *find(Node *node);
-    KDGanttViewItem *find(KDGanttViewItem *item, Node *node);
+    KDGanttViewItem *tqfind(Node *node);
+    KDGanttViewItem *tqfind(KDGanttViewItem *item, Node *node);
     KDGanttView *ganttView() const { return m_view; }
     bool isDrawn() const { return m_drawn; }
     void setDrawn(bool drawn) { m_drawn = drawn; }
@@ -244,13 +244,13 @@ protected:
 class GanttViewTaskItem : public KDGanttViewTaskItem, public ItemBase
 {
 public:
-    GanttViewTaskItem(KDGanttView *parent, KPlato::Task *task);
-    GanttViewTaskItem(KDGanttViewItem *parent, KPlato::Task *task);
+    GanttViewTaskItem(KDGanttView *tqparent, KPlato::Task *task);
+    GanttViewTaskItem(KDGanttViewItem *tqparent, KPlato::Task *task);
 
     KPlato::Task *getTask() const { return m_task; }
     void insertRelations(GanttView *view);
-    KDGanttViewItem *find(Node *node);
-    KDGanttViewItem *find(KDGanttViewItem *item, Node *node);
+    KDGanttViewItem *tqfind(Node *node);
+    KDGanttViewItem *tqfind(KDGanttViewItem *item, Node *node);
     KDGanttView *ganttView() const { return m_view; }
     bool isDrawn() const { return m_drawn; }
     void setDrawn(bool drawn) { m_drawn = drawn; }
@@ -266,13 +266,13 @@ protected:
 class GanttViewEventItem : public KDGanttViewEventItem, public ItemBase
 {
 public:
-    GanttViewEventItem(KDGanttView *parent, KPlato::Task *task);
-    GanttViewEventItem(KDGanttViewItem *parent, KPlato::Task *task);
+    GanttViewEventItem(KDGanttView *tqparent, KPlato::Task *task);
+    GanttViewEventItem(KDGanttViewItem *tqparent, KPlato::Task *task);
 
     KPlato::Task *getTask() { return m_task; }
     void insertRelations(GanttView *view);
-    KDGanttViewItem *find(Node *node);
-    KDGanttViewItem *find(KDGanttViewItem *item, Node *node);
+    KDGanttViewItem *tqfind(Node *node);
+    KDGanttViewItem *tqfind(KDGanttViewItem *item, Node *node);
     KDGanttView *ganttView() const { return m_view; }
     bool isDrawn() const { return m_drawn; }
     void setDrawn(bool drawn) { m_drawn = drawn; }