From 90a4df90811f0f978ae768939d8567f737e4c553 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:14:46 -0600 Subject: Rename additional global functions and variables for tqt3 --- tdecore/kxmessages.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tdecore/kxmessages.cpp') diff --git a/tdecore/kxmessages.cpp b/tdecore/kxmessages.cpp index 6b6f971a2..52781188f 100644 --- a/tdecore/kxmessages.cpp +++ b/tdecore/kxmessages.cpp @@ -44,7 +44,7 @@ KXMessages::KXMessages( const char* accept_broadcast_P, TQWidget* parent_P ) { ( void ) kapp->desktop(); //trigger desktop widget creation to select root window events kapp->installX11EventFilter( this ); // i.e. PropertyChangeMask - accept_atom1 = XInternAtom( qt_xdisplay(), accept_broadcast_P, false ); + accept_atom1 = XInternAtom( tqt_xdisplay(), accept_broadcast_P, false ); accept_atom2 = accept_atom1; } else @@ -61,9 +61,9 @@ KXMessages::KXMessages( const char* accept_broadcast_P, TQWidget* parent_P, bool { ( void ) kapp->desktop(); //trigger desktop widget creation to select root window events kapp->installX11EventFilter( this ); // i.e. PropertyChangeMask - accept_atom2 = XInternAtom( qt_xdisplay(), accept_broadcast_P, false ); + accept_atom2 = XInternAtom( tqt_xdisplay(), accept_broadcast_P, false ); accept_atom1 = obsolete_P ? accept_atom2 - : XInternAtom( qt_xdisplay(), TQCString( accept_broadcast_P ) + "_BEGIN", false ); + : XInternAtom( tqt_xdisplay(), TQCString( accept_broadcast_P ) + "_BEGIN", false ); } else { @@ -86,10 +86,10 @@ void KXMessages::broadcastMessage( const char* msg_type_P, const TQString& messa void KXMessages::broadcastMessage( const char* msg_type_P, const TQString& message_P, int screen_P, bool obsolete_P ) { - Atom a2 = XInternAtom( qt_xdisplay(), msg_type_P, false ); - Atom a1 = obsolete_P ? a2 : XInternAtom( qt_xdisplay(), TQCString( msg_type_P ) + "_BEGIN", false ); - Window root = screen_P == -1 ? qt_xrootwin() : qt_xrootwin( screen_P ); - send_message_internal( root, message_P, BROADCAST_MASK, qt_xdisplay(), + Atom a2 = XInternAtom( tqt_xdisplay(), msg_type_P, false ); + Atom a1 = obsolete_P ? a2 : XInternAtom( tqt_xdisplay(), TQCString( msg_type_P ) + "_BEGIN", false ); + Window root = screen_P == -1 ? tqt_xrootwin() : tqt_xrootwin( screen_P ); + send_message_internal( root, message_P, BROADCAST_MASK, tqt_xdisplay(), a1, a2, handle->winId()); } @@ -101,9 +101,9 @@ void KXMessages::sendMessage( WId w_P, const char* msg_type_P, const TQString& m void KXMessages::sendMessage( WId w_P, const char* msg_type_P, const TQString& message_P, bool obsolete_P ) { - Atom a2 = XInternAtom( qt_xdisplay(), msg_type_P, false ); - Atom a1 = obsolete_P ? a2 : XInternAtom( qt_xdisplay(), TQCString( msg_type_P ) + "_BEGIN", false ); - send_message_internal( w_P, message_P, 0, qt_xdisplay(), a1, a2, handle->winId()); + Atom a2 = XInternAtom( tqt_xdisplay(), msg_type_P, false ); + Atom a1 = obsolete_P ? a2 : XInternAtom( tqt_xdisplay(), TQCString( msg_type_P ) + "_BEGIN", false ); + send_message_internal( w_P, message_P, 0, tqt_xdisplay(), a1, a2, handle->winId()); } bool KXMessages::broadcastMessageX( Display* disp, const char* msg_type_P, -- cgit v1.2.1