summaryrefslogtreecommitdiffstats
path: root/kdecore/kxmessages.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
commit560378aaca1784ba19806a0414a32b20c744de39 (patch)
treece0dfd7c3febf2a1adc7603d1019a8be2083c415 /kdecore/kxmessages.cpp
parentd4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff)
downloadtdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz
tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kxmessages.cpp')
-rw-r--r--kdecore/kxmessages.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kdecore/kxmessages.cpp b/kdecore/kxmessages.cpp
index 6b6f971a2..85b573e81 100644
--- a/kdecore/kxmessages.cpp
+++ b/kdecore/kxmessages.cpp
@@ -150,7 +150,7 @@ bool KXMessages::sendMessageX( Display* disp, WId w_P, const char* msg_type_P,
return true;
}
-void KXMessages::send_message_internal( WId w_P, const TQString& msg_P, long mask_P,
+void KXMessages::send_message_internal( WId w_P, const TQString& msg_P, long tqmask_P,
Display* disp, Atom atom1_P, Atom atom2_P, Window handle_P )
{
unsigned int pos = 0;
@@ -169,7 +169,7 @@ void KXMessages::send_message_internal( WId w_P, const TQString& msg_P, long mas
i < 20 && i + pos <= len;
++i )
e.xclient.data.b[ i ] = msg[ i + pos ];
- XSendEvent( disp, w_P, false, mask_P, &e );
+ XSendEvent( disp, w_P, false, tqmask_P, &e );
e.xclient.message_type = atom2_P; // following messages
pos += i;
} while( pos <= len );
@@ -189,7 +189,7 @@ bool KXMessages::x11Event( XEvent* ev_P )
++i )
buf[ i ] = ev_P->xclient.data.b[ i ];
buf[ i ] = '\0';
- if( incoming_messages.contains( ev_P->xclient.window ))
+ if( incoming_messages.tqcontains( ev_P->xclient.window ))
{
if( ev_P->xclient.message_type == accept_atom1 && accept_atom1 != accept_atom2 )
// two different messages on the same window at the same time shouldn't happen anyway