summaryrefslogtreecommitdiffstats
path: root/kwin/utils.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kwin/utils.cpp
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/utils.cpp')
-rw-r--r--kwin/utils.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kwin/utils.cpp b/kwin/utils.cpp
index 33bdd6299..cfbf3e994 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 tqmask 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,