From 8bd291c0e8a9d8b6eec6f5217e4d5c2f1fd06b96 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:13:02 -0600 Subject: Rename additional global functions and variables for tqt3 --- twin/clients/b2/b2client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'twin/clients/b2') diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 8e62360a6..027987b9c 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -440,8 +440,8 @@ bool B2Client::isModalSystemNotification() int format, result; unsigned long n, left; Atom kde_wm_system_modal_notification; - kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); - result = XGetWindowProperty(qt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); + kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); + result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { return TRUE; @@ -1324,7 +1324,7 @@ bool B2Titlebar::x11Event(XEvent *e) { if (!set_x11mask) { set_x11mask = true; - XSelectInput(qt_xdisplay(), winId(), + XSelectInput(tqt_xdisplay(), winId(), KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | KeymapStateMask | -- cgit v1.2.1