From c2ff0b2158a151e4bfdccdf5dd96a22c5ddd95b6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:16:16 -0600 Subject: Rename additional global functions and variables for tqt3 --- kalarm/functions.cpp | 2 +- kalarm/traywindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kalarm') diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 0221ea86..e1e897e3 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -1074,7 +1074,7 @@ bool runKOrganizer() void x11_cancelScreenSaver() { kdDebug(5950) << "KAlarm::cancelScreenSaver()" << endl; - Display* display = qt_xdisplay(); + Display* display = tqt_xdisplay(); static int XTestKeyCode = 0; if (!XTestKeyCode) XTestKeyCode = XKeysymToKeycode(display, XK_Shift_L); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 81af3926..62c93f6e 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -329,7 +329,7 @@ bool TrayWindow::inSystemTray() const Window* children = 0; unsigned int nchildren; // Find the X parent window of the widget. This is not the same as the TQt parent widget. - if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &children, &nchildren)) + if (!XQueryTree(tqt_xdisplay(), winId(), &root, &xParent, &children, &nchildren)) return true; // error determining its parent X window if (children) XFree(children); -- cgit v1.2.3