Rename additional global functions and variables for tqt3

pull/1/head
Timothy Pearson 13 years ago
parent 0965aa3478
commit 8beee0fd02

@ -100,10 +100,10 @@ KbStateApplet::KbStateApplet(const TQString& configFile, Type t, int actions,
slow = new TimeoutIcon (instance, "", "kbstate_slowkeys", this, "slow"); slow = new TimeoutIcon (instance, "", "kbstate_slowkeys", this, "slow");
bounce = new TimeoutIcon (instance, "", "", this, "bounce"); bounce = new TimeoutIcon (instance, "", "", this, "bounce");
xkb = XkbGetMap(qt_xdisplay(), 0, XkbUseCoreKbd); xkb = XkbGetMap(tqt_xdisplay(), 0, XkbUseCoreKbd);
if (xkb != 0) { if (xkb != 0) {
XkbGetControls (qt_xdisplay(), XkbAllControlsMask, xkb); XkbGetControls (tqt_xdisplay(), XkbAllControlsMask, xkb);
if (xkb->ctrls != 0) if (xkb->ctrls != 0)
accessxFeatures = xkb->ctrls->enabled_ctrls; accessxFeatures = xkb->ctrls->enabled_ctrls;
else else
@ -597,7 +597,7 @@ bool KbStateApplet::x11Event (XEvent *evt) {
accessxFeatures = event->enabled_ctrls; accessxFeatures = event->enabled_ctrls;
if ((accessxFeatures & XkbMouseKeysMask) != 0) { if ((accessxFeatures & XkbMouseKeysMask) != 0) {
XkbGetControls (qt_xdisplay(), XkbMouseKeysMask, xkb); XkbGetControls (tqt_xdisplay(), XkbMouseKeysMask, xkb);
if (xkb->ctrls->mk_dflt_btn < 1) if (xkb->ctrls->mk_dflt_btn < 1)
mouse->setActiveKey (1); mouse->setActiveKey (1);
else if (xkb->ctrls->mk_dflt_btn > 3) else if (xkb->ctrls->mk_dflt_btn > 3)

@ -82,15 +82,15 @@ static uchar phand_bits[] = {
static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Window start = 0, int level = -1) { static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Window start = 0, int level = -1) {
Window root, parent, *children; uint nchildren; Window root, parent, *children; uint nchildren;
if (0 == start) if (0 == start)
start = qt_xrootwin(); start = tqt_xrootwin();
bool winIdFound = false; 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) { for (uint i=0; i < nchildren; ++i) {
if (winIdFound) { if (winIdFound) {
if (ignoreId != children [i]) { if (ignoreId != children [i]) {
XWindowAttributes atts; XWindowAttributes atts;
XGetWindowAttributes (qt_xdisplay(), children [i], &atts); XGetWindowAttributes (tqt_xdisplay(), children [i], &atts);
if (atts.map_state == IsViewable) if (atts.map_state == IsViewable)
region -= TQRegion (atts.x, atts.y, atts.width, atts.height, TQRegion::Rectangle); region -= TQRegion (atts.x, atts.y, atts.width, atts.height, TQRegion::Rectangle);
} }

Loading…
Cancel
Save