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/client.h b/kwin/client.h
index 1c4d45f51..52fb025f6 100644
--- a/kwin/client.h
+++ b/kwin/client.h
@@ -162,7 +162,7 @@ class Client : public TQObject, public KDecorationDefines
         void setKeepBelow( bool );
         Layer layer() const;
         Layer belongsToLayer() const;
-        void invalidateLayer();
+        void tqinvalidateLayer();
 
         void setModal( bool modal );
         bool isModal() const;
@@ -213,8 +213,8 @@ class Client : public TQObject, public KDecorationDefines
         // window to be redrawn.
         friend void Workspace::updateOverlappingShadows(WId);
 
-    // shape extensions
-        bool shape() const;
+    // tqshape extensions
+        bool tqshape() const;
         void updateShape();
 
         void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet );
@@ -500,7 +500,7 @@ class Client : public TQObject, public KDecorationDefines
         uint active :1;
         uint deleting : 1; // true when doing cleanup and destroying the client
         uint keep_above : 1; // NET::KeepAbove (was stays_on_top)
-        uint is_shape :1;
+        uint is_tqshape :1;
         uint skip_taskbar :1;
         uint original_skip_taskbar :1; // unaffected by KWin
         uint Pdeletewindow :1; // does the window understand the DeleteWindow protocol?
@@ -569,7 +569,7 @@ class Client : public TQObject, public KDecorationDefines
         TQMemArray<double> activeOpacityCache;
         TQMemArray<double> inactiveOpacityCache;
         TQMemArray<double>* opacityCache;
-        TQRegion shapeBoundingRegion;
+        TQRegion tqshapeBoundingRegion;
         TQTimer* shadowDelayTimer;
         bool shadowMe;
 
@@ -801,9 +801,9 @@ inline bool Client::keepBelow() const
     return keep_below;
     }
 
-inline bool Client::shape() const
+inline bool Client::tqshape() const
     {
-    return is_shape;
+    return is_tqshape;
     }
 
 
@@ -832,7 +832,7 @@ inline pid_t Client::pid() const
     return info->pid();
     }
 
-inline void Client::invalidateLayer()
+inline void Client::tqinvalidateLayer()
     {
     in_layer = UnknownLayer;
     }