From 1b79089e1b614992ec6c9ba91441a8851030f75b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:15:34 -0600 Subject: Rename additional global functions and variables for tqt3 --- krfb/krfb/rfbcontroller.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'krfb') diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc index 37ac10b5..debe39f0 100644 --- a/krfb/krfb/rfbcontroller.cc +++ b/krfb/krfb/rfbcontroller.cc @@ -193,7 +193,7 @@ void KeyboardEvent::initKeycodes() { KeySym key,*keymap; int i,j,minkey,maxkey,syms_per_keycode; - dpy = qt_xdisplay(); + dpy = tqt_xdisplay(); memset(modifiers,-1,sizeof(modifiers)); @@ -284,7 +284,7 @@ PointerEvent::PointerEvent(int b, int _x, int _y) : y(_y) { if (!initialized) { initialized = true; - dpy = qt_xdisplay(); + dpy = tqt_xdisplay(); buttonMask = 0; } } @@ -385,7 +385,7 @@ RFBController::~RFBController() void RFBController::startServer(int inetdFd, bool xtestGrab) { - framebufferImage = XGetImage(qt_xdisplay(), + framebufferImage = XGetImage(tqt_xdisplay(), TQApplication::desktop()->winId(), 0, 0, @@ -455,7 +455,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab) passwordChanged(); - scanner = new XUpdateScanner(qt_xdisplay(), + scanner = new XUpdateScanner(tqt_xdisplay(), TQApplication::desktop()->winId(), (unsigned char*)fb, w, h, server->rfbServerFormat.bitsPerPixel, @@ -467,7 +467,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab) if (xtestGrab) { disabler.disable = false; - XTestGrabControl(qt_xdisplay(), true); + XTestGrabControl(tqt_xdisplay(), true); } rfbRunEventLoop(server, -1, TRUE); @@ -877,7 +877,7 @@ extern "C" Bool XShmQueryExtension(Display*); bool RFBController::checkX11Capabilities() { int bp1, bp2, majorv, minorv; - Bool r = XTestQueryExtension(qt_xdisplay(), &bp1, &bp2, + Bool r = XTestQueryExtension(tqt_xdisplay(), &bp1, &bp2, &majorv, &minorv); if ((!r) || (((majorv*1000)+minorv) < 2002)) { KMessageBox::error(0, @@ -896,7 +896,7 @@ XTestDisabler::XTestDisabler() : void XTestDisabler::exec() { if (disable) - XTestDiscard(qt_xdisplay()); + XTestDiscard(tqt_xdisplay()); } #include "rfbcontroller.moc" -- cgit v1.2.1