summaryrefslogtreecommitdiffstats
path: root/kdesktop/xautolock_diy.c
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 /kdesktop/xautolock_diy.c
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 'kdesktop/xautolock_diy.c')
-rw-r--r--kdesktop/xautolock_diy.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/kdesktop/xautolock_diy.c b/kdesktop/xautolock_diy.c
index b9df2f895..52a4254d5 100644
--- a/kdesktop/xautolock_diy.c
+++ b/kdesktop/xautolock_diy.c
@@ -115,7 +115,7 @@ selectEvents (Window window, Bool substructureOnly)
if (nofChildren) (void) XFree ((char*) children);
/*
- * Build the appropriate event mask. The basic idea is that we don't
+ * Build the appropriate event tqmask. The basic idea is that we don't
* want to interfere with the normal event propagation mechanism if
* we don't have to.
*
@@ -134,8 +134,8 @@ selectEvents (Window window, Bool substructureOnly)
{
if (parent == None) /* the *real* rootwindow */
{
- attribs.all_event_masks =
- attribs.do_not_propagate_mask = KeyPressMask;
+ attribs.all_event_tqmasks =
+ attribs.do_not_propagate_tqmask = KeyPressMask;
}
else if (!XGetWindowAttributes (queue.display, window, &attribs))
#else
@@ -149,19 +149,19 @@ selectEvents (Window window, Bool substructureOnly)
#if 0
(void) XSelectInput (queue.display, window,
SubstructureNotifyMask
- | ( ( attribs.all_event_masks
- | attribs.do_not_propagate_mask)
+ | ( ( attribs.all_event_tqmasks
+ | attribs.do_not_propagate_tqmask)
& KeyPressMask));
#else
{
- int mask = SubstructureNotifyMask | attribs.your_event_mask;
+ int tqmask = SubstructureNotifyMask | attribs.your_event_mask;
if( !substructureOnly )
{
- mask |= ( ( attribs.all_event_masks
+ tqmask |= ( ( attribs.all_event_masks
| attribs.do_not_propagate_mask)
& KeyPressMask );
}
- (void) XSelectInput (queue.display, window, mask );
+ (void) XSelectInput (queue.display, window, tqmask );
}
#endif