Replace Q_WS_* defines with TQ_WS_* equivalents

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 28 insertions, 28 deletions

diff --git a/chalk/chalkcolor/kis_profile.cpp b/chalk/chalkcolor/kis_profile.cpp
index df98a750..7afde3e9 100644
--- a/chalk/chalkcolor/kis_profile.cpp
+++ b/chalk/chalkcolor/kis_profile.cpp
@@ -168,7 +168,7 @@ KisAnnotationSP KisProfile::annotation() const
 KisProfile *  KisProfile::getScreenProfile (int screen)
 {
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
     Atom type;
     int format;
diff --git a/chalk/ui/kis_canvas.cpp b/chalk/ui/kis_canvas.cpp
index 38df814e..910a9e53 100644
--- a/chalk/ui/kis_canvas.cpp
+++ b/chalk/ui/kis_canvas.cpp
@@ -73,7 +73,7 @@
 #include "kis_input_device.h"
 #include "fixx11h.h"
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include <tqdesktopwidget.h>
 #include <tqapplication.h>
@@ -98,14 +98,14 @@ std::map<XID, KisCanvasWidget::X11TabletDevice> KisCanvasWidget::X11TabletDevice
 
 #endif // EXTENDED_X11_TABLET_SUPPORT
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 KisCanvasWidget::KisCanvasWidget()
 {
     m_enableMoveEventCompressionHint = false;
     m_lastPressure = 0;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (!X11SupportInitialised) {
         initX11Support();
     }
@@ -180,7 +180,7 @@ void KisCanvasWidget::widgetGotTabletEvent(TQTabletEvent *e)
     else {
         KisMoveEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), TQt::NoButton);
         translateTabletEvent(&ke);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         // Fix the problem that when you change from using a tablet device to the mouse,
         // the first mouse button event is not recognised. This is because we handle
         // X11 core mouse move events directly so TQt does not get to see them. This breaks
@@ -292,7 +292,7 @@ void KisCanvasWidget::translateTabletEvent(KisEvent *e)
     m_lastPressure = e->pressure();
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 void KisCanvasWidget::initX11Support()
 {
@@ -1058,7 +1058,7 @@ KisInputDevice KisCanvasWidget::findActiveInputDevice()
 #endif // EXTENDED_X11_TABLET_SUPPORT
 
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 /*************************************************************************/
 
diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h
index 737ca5d8..b5b883e0 100644
--- a/chalk/ui/kis_canvas.h
+++ b/chalk/ui/kis_canvas.h
@@ -36,10 +36,10 @@
 #include "kis_input_device.h"
 
 #ifdef Q_MOC_RUN
-#define Q_WS_X11
+#define TQ_WS_X11
 #endif // Q_MOC_RUN
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 // Irix has a different (and better) XInput tablet driver to
 // the XFree/xorg driver. TQt needs a separate code path for that
@@ -55,7 +55,7 @@
 #include <X11/extensions/XInput.h>
 #endif
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 class KisEvent;
 class KisMoveEvent;
@@ -86,7 +86,7 @@ public:
     static void selectTabletDeviceEvents(TQWidget *widget);
 #endif
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     static void initX11Support();
 #endif
 
@@ -129,7 +129,7 @@ protected:
     bool m_enableMoveEventCompressionHint;
     double m_lastPressure;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     // On X11 systems, TQt throws away mouse move events if the application
     // is unable to keep up with them. We override this behaviour so that
     // we receive all move events, so that painting follows the mouse's motion
@@ -278,7 +278,7 @@ protected:
 
 #endif // EXTENDED_X11_TABLET_SUPPORT
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 };
 
 class KisCanvas : public TQObject {
diff --git a/chalk/ui/kis_opengl_canvas.cpp b/chalk/ui/kis_opengl_canvas.cpp
index 82363a0b..bae8a2d1 100644
--- a/chalk/ui/kis_opengl_canvas.cpp
+++ b/chalk/ui/kis_opengl_canvas.cpp
@@ -102,14 +102,14 @@ void KisOpenGLCanvasWidget::dropEvent(TQDropEvent *e)
     widgetGotDropEvent(e);
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 bool KisOpenGLCanvasWidget::x11Event(XEvent *event)
 {
     return KisCanvasWidget::x11Event(event, x11Display(), winId(), mapToGlobal(TQPoint(0, 0)));
 }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 KisCanvasWidgetPainter *KisOpenGLCanvasWidget::createPainter()
 {
diff --git a/chalk/ui/kis_opengl_canvas.h b/chalk/ui/kis_opengl_canvas.h
index 99a67b09..abf504ee 100644
--- a/chalk/ui/kis_opengl_canvas.h
+++ b/chalk/ui/kis_opengl_canvas.h
@@ -32,12 +32,12 @@
 #include "kis_canvas.h"
 
 #ifdef Q_MOC_RUN
-#define Q_WS_X11
+#define TQ_WS_X11
 #endif // Q_MOC_RUN
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 #define KisOpenGLCanvasFormat (TQGL::DoubleBuffer|TQGL::Rgba|TQGL::DirectRendering|TQGL::NoDepthBuffer)
 
@@ -66,9 +66,9 @@ protected:
     virtual void keyReleaseEvent(TQKeyEvent *event);
     virtual void dragEnterEvent(TQDragEnterEvent *event);
     virtual void dropEvent(TQDropEvent *event);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     bool x11Event(XEvent *event);
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 };
 #endif // HAVE_GL
 
diff --git a/chalk/ui/kis_qpaintdevice_canvas.cpp b/chalk/ui/kis_qpaintdevice_canvas.cpp
index cd024c4a..ae469009 100644
--- a/chalk/ui/kis_qpaintdevice_canvas.cpp
+++ b/chalk/ui/kis_qpaintdevice_canvas.cpp
@@ -97,14 +97,14 @@ void KisTQPaintDeviceCanvasWidget::dropEvent(TQDropEvent *e)
     widgetGotDropEvent(e);
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 bool KisTQPaintDeviceCanvasWidget::x11Event(XEvent *event)
 {
     return KisCanvasWidget::x11Event(event, x11Display(), winId(), mapToGlobal(TQPoint(0, 0)));
 }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 KisCanvasWidgetPainter *KisTQPaintDeviceCanvasWidget::createPainter()
 {
diff --git a/chalk/ui/kis_qpaintdevice_canvas.h b/chalk/ui/kis_qpaintdevice_canvas.h
index 706cb195..1680a759 100644
--- a/chalk/ui/kis_qpaintdevice_canvas.h
+++ b/chalk/ui/kis_qpaintdevice_canvas.h
@@ -30,12 +30,12 @@
 #include "kis_canvas.h"
 
 #ifdef Q_MOC_RUN
-#define Q_WS_X11
+#define TQ_WS_X11
 #endif // Q_MOC_RUN
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 class KisTQPaintDeviceCanvasWidget : public virtual TQWidget, public virtual KisCanvasWidget {
 public:
@@ -62,9 +62,9 @@ protected:
     virtual void keyReleaseEvent(TQKeyEvent *event);
     virtual void dragEnterEvent(TQDragEnterEvent *event);
     virtual void dropEvent(TQDropEvent *event);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     bool x11Event(XEvent *event);
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 };
 
 #endif // KIS_TQPAINTDEVICE_CANVAS_H_
diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp
index 79246afc..d1f6e7fa 100644
--- a/chalk/ui/kis_view.cpp
+++ b/chalk/ui/kis_view.cpp
@@ -247,7 +247,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c
     setFocusPolicy( TQWidget::StrongFocus );
 
     // Must come before input devices are referenced as this detects them.
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KisCanvasWidget::initX11Support();
 #endif
     // Install event filter before we create any child widgets so they can see