TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 3 insertions, 3 deletions

diff --git a/kscd/kscdmagic/xlib.h b/kscd/kscdmagic/xlib.h
index 73113292..fa079775 100644
--- a/kscd/kscdmagic/xlib.h
+++ b/kscd/kscdmagic/xlib.h
@@ -58,7 +58,7 @@ typedef struct {
     int privatecolormap;
     xlibparam *params;
     Display *display;
-    Window parent_window;
+    Window tqparent_window;
     Window window;
     unsigned int width, height;
     unsigned int border_width;
@@ -66,9 +66,9 @@ typedef struct {
     int depth;
     unsigned int classX;
     Visual *visual;
-    unsigned long valuemask;
+    unsigned long valuetqmask;
     XSetWindowAttributes *attributes;
-    unsigned long attr_mask;
+    unsigned long attr_tqmask;
     XSizeHints sizehints;
     int screen;
     const char *window_name;