Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


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

1 files changed, 8 insertions, 8 deletions

diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c
index 713752ee1..f65586be4 100644
--- a/kwin/kompmgr/kompmgr.c
+++ b/kwin/kompmgr/kompmgr.c
@@ -99,7 +99,7 @@ typedef struct _win {
     unsigned int	shadowSize;
     Atom                windowType;
     unsigned long	damage_sequence;    /* sequence when damage was created */
-    Bool                shapable; /* this will allow window managers to exclude windows if just the deco is shaped*/
+    Bool                shapable; /* this will allow window managers to exclude windows if just the deco is tqshaped*/
     unsigned int                 decoHash;
     Picture             dimPicture;
 
@@ -151,7 +151,7 @@ Bool		synchronize;
 int		composite_opcode;
 Bool            disable_argb = False;
 
-int             shapeEvent;
+int             tqshapeEvent;
 
 /* find these once and be done with it */
 Atom		opacityAtom;
@@ -1679,10 +1679,10 @@ get_opacity_percent(Display *dpy, win *w, double def)
 }
 #if 0
 static void
-damage_shape(Display *dpy, win *w, XRectangle *shape_damage)
+damage_tqshape(Display *dpy, win *w, XRectangle *tqshape_damage)
 {
     set_ignore (dpy, NextRequest (dpy));
-    XserverRegion region = XFixesCreateRegion (dpy, shape_damage, 1);
+    XserverRegion region = XFixesCreateRegion (dpy, tqshape_damage, 1);
     set_ignore (dpy, NextRequest (dpy));
     XserverRegion tmpRegion;
     add_damage(dpy, region);
@@ -2707,7 +2707,7 @@ main (int argc, char **argv)
 				VisibilityChangeMask);
 
 		/*shaping stuff*/
-		XShapeQueryExtension(dpy, &shapeEvent, &dummy);
+		XShapeQueryExtension(dpy, &tqshapeEvent, &dummy);
 
 		XQueryTree (dpy, root, &root_return, &parent_return, &children, &nchildren);
 		for (i = 0; i < nchildren; i++)
@@ -2947,7 +2947,7 @@ main (int argc, char **argv)
                     /*                     printf("damaging win: %u\n",ev.xany.window);*/
 		    damage_win (dpy, (XDamageNotifyEvent *) &ev);
                 }
-                else if (ev.type == shapeEvent)
+                else if (ev.type == tqshapeEvent)
                 {
                     win * w = find_win(dpy, ev.xany.window);
 #if 1
@@ -2963,7 +2963,7 @@ main (int argc, char **argv)
                         rect.y = ((XShapeEvent*)&ev)->y;
                         rect.width = ((XShapeEvent*)&ev)->width;
                         rect.height = ((XShapeEvent*)&ev)->height;
-                        damage_shape(dpy, w, &rect);
+                        damage_tqshape(dpy, w, &rect);
 #endif
 #if 0
 			if (w->shadowSize != 0)
@@ -2978,7 +2978,7 @@ main (int argc, char **argv)
 			}
 #endif		
                         /*this is hardly efficient, but a current workaraound 
-                        shaping support isn't that good so far (e.g. we lack shaped shadows)
+                        shaping support isn't that good so far (e.g. we lack tqshaped shadows)
                         IDEA: use XRender to scale/shift a copy of the window and then blurr it*/
 #if 1
                         if (w->picture)