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, 15 insertions, 14 deletions

diff --git a/krita/ui/kis_tool_non_paint.h b/krita/ui/kis_tool_non_paint.h
index 21726627..0b618109 100644
--- a/krita/ui/kis_tool_non_paint.h
+++ b/krita/ui/kis_tool_non_paint.h
@@ -19,19 +19,19 @@
 #ifndef KIS_TOOL_NON_PAINT_H_
 #define KIS_TOOL_NON_PAINT_H_
 
-#include <qcursor.h>
-#include <qcolor.h>
-#include <qwidget.h>
+#include <tqcursor.h>
+#include <tqcolor.h>
+#include <tqwidget.h>
 
 #include "kis_global.h"
 #include "kis_types.h"
 #include "kis_tool.h"
 #include <koffice_export.h>
 
-class QEvent;
-class QKeyEvent;
-class QPaintEvent;
-class QRect;
+class TQEvent;
+class TQKeyEvent;
+class TQPaintEvent;
+class TQRect;
 class KDialog;
 class KisCanvasSubject;
 
@@ -39,10 +39,11 @@ class KisCanvasSubject;
 class KRITACORE_EXPORT KisToolNonPaint : public KisTool {
 
     Q_OBJECT
+  TQ_OBJECT
     typedef KisTool super;
 
 public:
-    KisToolNonPaint(const QString & UIName);
+    KisToolNonPaint(const TQString & UIName);
     virtual ~KisToolNonPaint();
 
 // CanvasObserver
@@ -52,17 +53,17 @@ public:
 // KisTool
 public:
     virtual void paint(KisCanvasPainter& gc);
-    virtual void paint(KisCanvasPainter& gc, const QRect& rc);
+    virtual void paint(KisCanvasPainter& gc, const TQRect& rc);
 
     virtual void buttonPress(KisButtonPressEvent *e);
     virtual void move(KisMoveEvent *e);
     virtual void buttonRelease(KisButtonReleaseEvent *e);
     virtual void doubleClick(KisDoubleClickEvent *e);
-    virtual void keyPress(QKeyEvent *e);
-    virtual void keyRelease(QKeyEvent *e);
+    virtual void keyPress(TQKeyEvent *e);
+    virtual void keyRelease(TQKeyEvent *e);
 
-    virtual QCursor cursor();
-    virtual void setCursor(const QCursor& cursor);
+    virtual TQCursor cursor();
+    virtual void setCursor(const TQCursor& cursor);
 
     virtual enumToolType toolType() { return TOOL_VIEW; }
 
@@ -77,7 +78,7 @@ protected:
     KisCanvasSubject *m_subject;
 
 private:
-    QCursor m_cursor;
+    TQCursor m_cursor;
 };
 
 #endif // KIS_TOOL_NON_PAINT_H_