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, 9 insertions, 9 deletions

diff --git a/kwin/utils.cpp b/kwin/utils.cpp
index 33bdd6299..67c3aa1c9 100644
--- a/kwin/utils.cpp
+++ b/kwin/utils.cpp
@@ -43,11 +43,11 @@ namespace KWinInternal
 
 // used to store the return values of
 // XShapeQueryExtension.
-// Necessary since shaped window are an extension to X
-int Shape::kwin_shape_version = 0;
-int Shape::kwin_shape_event = 0;
+// Necessary since tqshaped window are an extension to X
+int Shape::kwin_tqshape_version = 0;
+int Shape::kwin_tqshape_event = 0;
 
-// does the window w  need a shape combine mask around it?
+// does the window w  need a tqshape combine mask around it?
 bool Shape::hasShape( WId w)
     {
     int xws, yws, xbs, ybs;
@@ -61,21 +61,21 @@ bool Shape::hasShape( WId w)
     return boundingShaped != 0;
     }
 
-int Shape::shapeEvent()
+int Shape::tqshapeEvent()
     {
-    return kwin_shape_event;
+    return kwin_tqshape_event;
     }
 
 void Shape::init()
     {
-    kwin_shape_version = 0;
+    kwin_tqshape_version = 0;
     int dummy;
-    if( !XShapeQueryExtension(qt_xdisplay(), &kwin_shape_event, &dummy))
+    if( !XShapeQueryExtension(qt_xdisplay(), &kwin_tqshape_event, &dummy))
         return;
     int major, minor;
     if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor ))
         return;
-    kwin_shape_version = major * 0x10 + minor;
+    kwin_tqshape_version = major * 0x10 + minor;
     }
 
 void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move,