From 8beee0fd02a1bb9a86aed32c1ea7b3d3348c4663 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:10:42 -0600 Subject: [PATCH] Rename additional global functions and variables for tqt3 --- kbstateapplet/kbstate.cpp | 6 +++--- kmag/kmagzoomview.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 4afc15d..43a9fc4 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -100,10 +100,10 @@ KbStateApplet::KbStateApplet(const TQString& configFile, Type t, int actions, slow = new TimeoutIcon (instance, "", "kbstate_slowkeys", this, "slow"); bounce = new TimeoutIcon (instance, "", "", this, "bounce"); - xkb = XkbGetMap(qt_xdisplay(), 0, XkbUseCoreKbd); + xkb = XkbGetMap(tqt_xdisplay(), 0, XkbUseCoreKbd); if (xkb != 0) { - XkbGetControls (qt_xdisplay(), XkbAllControlsMask, xkb); + XkbGetControls (tqt_xdisplay(), XkbAllControlsMask, xkb); if (xkb->ctrls != 0) accessxFeatures = xkb->ctrls->enabled_ctrls; else @@ -597,7 +597,7 @@ bool KbStateApplet::x11Event (XEvent *evt) { accessxFeatures = event->enabled_ctrls; if ((accessxFeatures & XkbMouseKeysMask) != 0) { - XkbGetControls (qt_xdisplay(), XkbMouseKeysMask, xkb); + XkbGetControls (tqt_xdisplay(), XkbMouseKeysMask, xkb); if (xkb->ctrls->mk_dflt_btn < 1) mouse->setActiveKey (1); else if (xkb->ctrls->mk_dflt_btn > 3) diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index 47f6a46..a490de8 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -82,15 +82,15 @@ static uchar phand_bits[] = { static bool obscuredRegion (TQRegion ®ion, Window winId, Window ignoreId, Window start = 0, int level = -1) { Window root, parent, *children; uint nchildren; if (0 == start) - start = qt_xrootwin(); + start = tqt_xrootwin(); bool winIdFound = false; - if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &children, &nchildren)) { + if (0 != XQueryTree (tqt_xdisplay(), start, &root, &parent, &children, &nchildren)) { for (uint i=0; i < nchildren; ++i) { if (winIdFound) { if (ignoreId != children [i]) { XWindowAttributes atts; - XGetWindowAttributes (qt_xdisplay(), children [i], &atts); + XGetWindowAttributes (tqt_xdisplay(), children [i], &atts); if (atts.map_state == IsViewable) region -= TQRegion (atts.x, atts.y, atts.width, atts.height, TQRegion::Rectangle); }