2 files changed, 14 insertions, 10 deletions
diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp
index 606c6a93..a0dca0ee 100644
--- a/kivio/kiviopart/stencilbardockmanager.cpp
+++ b/kivio/kiviopart/stencilbardockmanager.cpp
@@ -308,14 +308,14 @@ void StencilBarDockManager::setAllStackBarsShown(bool shown)
 KoToolDockMoveManager::KoToolDockMoveManager()
   : TQObject()
 {
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
     XGCValues gv;
 #endif
 
     working=false;
     noLast=true;
 
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
     scr = qt_xscreen();
     root = qt_xrootwin();
 
@@ -386,7 +386,7 @@ void KoToolDockMoveManager::doMoveInternal()
   if (check(xp, yp, w, h)) {
     paintProcess(false,xp, yp, w, h);
 
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
         XFlush(qt_xdisplay());
         XSync(qt_xdisplay(),false);
 #endif
@@ -402,7 +402,7 @@ void KoToolDockMoveManager::stop()
   TQApplication::restoreOverrideCursor();
 
   paintProcess();
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
     XFlush(qt_xdisplay());
 #endif
 
@@ -424,7 +424,7 @@ void KoToolDockMoveManager::setGeometry(int _x, int _y, int _w, int _h)
   check(_x, _y, _w, _h, true);
   paintProcess(false,_x, _y, _w, _h);
 
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
     XFlush(qt_xdisplay());
     XSync(qt_xdisplay(),false);
 #endif
@@ -440,7 +440,7 @@ void KoToolDockMoveManager::drawRectangle( int _x, int _y, int _w, int _h)
   ow = _w;
   oh = _h;
 
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
     XDrawRectangle(qt_xdisplay(), root, rootgc, _x, _y, _w, _h);
 #endif
     noLast = false;
@@ -454,7 +454,7 @@ void KoToolDockMoveManager::paintProcess( bool onlyDelete, int _x, int _y, int _
   if ( ox == _x && oy == _y && ow ==_w && oh == _h )
     return;
 
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
     XDrawRectangle(qt_xdisplay(), root, rootgc, ox, oy, ow, oh);
 #endif
     noLast = true;
@@ -546,7 +546,7 @@ void KoToolDockMoveManager::doResizeInternal()
   if (check(xp, yp, w, h)) {
     paintProcess(false,xp, yp, w, h);
 
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
         XFlush(qt_xdisplay());
         XSync(qt_xdisplay(),false);
 #endif
diff --git a/kivio/kiviopart/stencilbardockmanager.h b/kivio/kiviopart/stencilbardockmanager.h
index 12eb18c9..8894def1 100644
--- a/kivio/kiviopart/stencilbardockmanager.h
+++ b/kivio/kiviopart/stencilbardockmanager.h
@@ -19,9 +19,13 @@
 #ifndef STENCILBARDOCKMANAGER_H
 #define STENCILBARDOCKMANAGER_H
 
+#ifdef Q_MOC_RUN
+#define Q_WS_X11
+#endif // Q_MOC_RUN
+
 #include <tqwidget.h>
 #include <tqptrlist.h>
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -167,7 +171,7 @@ class KoToolDockMoveManager: public TQObject
     int offX, offY;
 
     /* X-stuff */
-#if defined TQ_WS_X11 && !defined K_WS_TQTONLY
+#if defined Q_WS_X11 && !defined K_WS_TQTONLY
     Window root;
     GC rootgc;
     int scr;