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 --- kopete/libkopete/avdevice/kxv.cpp | 62 ++++++++++++++++++------------------ kopete/libkopete/avdevice/qvideo.cpp | 4 +-- kopete/libkopete/kopeteaway.cpp | 8 ++--- krdc/krdc.cpp | 18 +++++------ krdc/vnc/kvncview.cpp | 2 +- krfb/krfb/rfbcontroller.cc | 14 ++++---- ksirc/servercontroller.cpp | 4 +-- 7 files changed, 56 insertions(+), 56 deletions(-) diff --git a/kopete/libkopete/avdevice/kxv.cpp b/kopete/libkopete/avdevice/kxv.cpp index 33ea9391..6373eeff 100644 --- a/kopete/libkopete/avdevice/kxv.cpp +++ b/kopete/libkopete/avdevice/kxv.cpp @@ -86,7 +86,7 @@ bool KXv::haveXv() return false; #else unsigned int tmp; - if (Success != XvQueryExtension(qt_xdisplay(), + if (Success != XvQueryExtension(tqt_xdisplay(), &tmp, &tmp, &tmp, @@ -120,7 +120,7 @@ bool KXv::init(Drawable d) #ifndef HAVE_LIBXV return false; #else - if (Success != XvQueryExtension(qt_xdisplay(), + if (Success != XvQueryExtension(tqt_xdisplay(), &xv_version, &xv_release, &xv_request, @@ -132,12 +132,12 @@ bool KXv::init(Drawable d) #ifdef HAVE_LIBXVMC // Causes crashes for some people. - // if (Success == XvMCQueryExtension(qt_xdisplay(),0,0)) { + // if (Success == XvMCQueryExtension(tqt_xdisplay(),0,0)) { // kdDebug() << "Found XvMC!" << endl; // } #endif - if (Success != XvQueryAdaptors(qt_xdisplay(), + if (Success != XvQueryAdaptors(tqt_xdisplay(), d, &xv_adaptors, (XvAdaptorInfo **)&xv_adaptor_info)) { @@ -225,13 +225,13 @@ int KXvDevice::displayImage(Window win, const unsigned char *const data, int w, return -1; if (win != xv_last_win && xv_gc) { - XFreeGC(qt_xdisplay(), xv_gc); + XFreeGC(tqt_xdisplay(), xv_gc); xv_gc = 0; } if (!xv_gc) { xv_last_win = win; - xv_gc = XCreateGC(qt_xdisplay(), win, 0, NULL); + xv_gc = XCreateGC(tqt_xdisplay(), win, 0, NULL); } int rc = 0; @@ -239,17 +239,17 @@ int KXvDevice::displayImage(Window win, const unsigned char *const data, int w, if (!_shm) { static_cast(xv_image)->data = (char *)const_cast(data); - rc = XvPutImage(qt_xdisplay(), xv_port, win, xv_gc, + rc = XvPutImage(tqt_xdisplay(), xv_port, win, xv_gc, static_cast(xv_image), x, y, sw, sh, 0, 0, dw, dh); } else { #ifdef HAVE_XSHM memcpy(static_cast(xv_image)->data, data, static_cast(xv_image)->data_size); - rc = XvShmPutImage(qt_xdisplay(), xv_port, win, xv_gc, + rc = XvShmPutImage(tqt_xdisplay(), xv_port, win, xv_gc, static_cast(xv_image), x, y, sw, sh, 0, 0, dw, dh, 0); #endif } - XSync(qt_xdisplay(), False); + XSync(tqt_xdisplay(), False); return rc; #endif } @@ -283,13 +283,13 @@ bool KXvDevice::startVideo(Window w, int dw, int dh) } if (w != xv_last_win && xv_gc) { - XFreeGC(qt_xdisplay(), xv_gc); + XFreeGC(tqt_xdisplay(), xv_gc); xv_gc = 0; } if (!xv_gc) { xv_last_win = w; - xv_gc = XCreateGC(qt_xdisplay(), w, 0, NULL); + xv_gc = XCreateGC(tqt_xdisplay(), w, 0, NULL); } if (-1 != xv_encoding) { @@ -300,11 +300,11 @@ bool KXvDevice::startVideo(Window w, int dw, int dh) // xawtv does this here: // ng_ratio_fixup(&dw, &dh, &dx, &dy); - kdDebug() << "XvPutVideo: " << qt_xdisplay() + kdDebug() << "XvPutVideo: " << tqt_xdisplay() << " " << xv_port << " " << w << " " << xv_gc << " " << sx << " " << sy << " " << sw << " " << sh << " " << dx << " " << dy << " " << dw << " " << dh << endl; - XvPutVideo(qt_xdisplay(), xv_port, w, xv_gc, sx, sy, sw, sh, dx, dy, dw, dh); + XvPutVideo(tqt_xdisplay(), xv_port, w, xv_gc, sx, sy, sw, sh, dx, dy, dw, dh); videoStarted = true; videoWindow = w; @@ -324,7 +324,7 @@ bool KXvDevice::stopVideo() return false; } - XvStopVideo(qt_xdisplay(), xv_port, videoWindow); + XvStopVideo(tqt_xdisplay(), xv_port, videoWindow); videoStarted = false; return true; #endif @@ -345,7 +345,7 @@ KXvDevice::KXvDevice() #ifdef HAVE_LIBXV xv_imageformat = 0x32595559; // FIXME (YUY2) #ifdef HAVE_XSHM - if (!XShmQueryExtension(qt_xdisplay())) { + if (!XShmQueryExtension(tqt_xdisplay())) { _haveShm = false; } else { _shm = true; @@ -381,11 +381,11 @@ KXvDevice::~KXvDevice() destroyImage(); #endif if (xv_gc) - XFreeGC(qt_xdisplay(), xv_gc); + XFreeGC(tqt_xdisplay(), xv_gc); #ifdef HAVE_LIBXV if (xv_port != -1) - XvUngrabPort(qt_xdisplay(), xv_port, CurrentTime); + XvUngrabPort(tqt_xdisplay(), xv_port, CurrentTime); #endif } @@ -397,12 +397,12 @@ bool KXvDevice::init() #else assert(xv_port != -1); // make sure we were prepped by KXv already. - if (XvGrabPort(qt_xdisplay(), xv_port, CurrentTime)) { + if (XvGrabPort(tqt_xdisplay(), xv_port, CurrentTime)) { kdWarning() << "KXvDevice::init(): Unable to grab Xv port." << endl; return false; } - if (Success != XvQueryEncodings(qt_xdisplay(), + if (Success != XvQueryEncodings(tqt_xdisplay(), xv_port, &xv_encodings, (XvEncodingInfo **)&xv_encoding_info)) { @@ -416,7 +416,7 @@ bool KXvDevice::init() _encodingList << ((XvEncodingInfo *)xv_encoding_info)[i].name; } - xv_attr = XvQueryPortAttributes(qt_xdisplay(), + xv_attr = XvQueryPortAttributes(tqt_xdisplay(), xv_port, &xv_encoding_attributes); XvAttribute *xvattr = (XvAttribute *)xv_attr; @@ -438,7 +438,7 @@ bool KXvDevice::init() } XvImageFormatValues *fo; - fo = XvListImageFormats(qt_xdisplay(), xv_port, &xv_formats); + fo = XvListImageFormats(tqt_xdisplay(), xv_port, &xv_formats); xv_formatvalues = (void *)fo; kdDebug() << "Image formats for port " << xv_port << endl; for (int i = 0; i < xv_formats; i++) { @@ -530,7 +530,7 @@ bool KXvDevice::getAttribute(const TQString& attribute, int *val) for (KXvDeviceAttribute *at = _attrs.first(); at != NULL; at = _attrs.next()) { if (at->name == attribute) { if (val) - XvGetPortAttribute(qt_xdisplay(), xv_port, at->atom(), val); + XvGetPortAttribute(tqt_xdisplay(), xv_port, at->atom(), val); return true; } } @@ -546,8 +546,8 @@ bool KXvDevice::setAttribute(const TQString& attribute, int val) #else for (KXvDeviceAttribute *at = _attrs.first(); at != NULL; at = _attrs.next()) { if (at->name == attribute) { - XvSetPortAttribute(qt_xdisplay(), xv_port, at->atom(), val); - XSync(qt_xdisplay(), False); + XvSetPortAttribute(tqt_xdisplay(), xv_port, at->atom(), val); + XSync(tqt_xdisplay(), False); return true; } } @@ -581,7 +581,7 @@ bool KXvDevice::encoding(TQString& encoding) for (KXvDeviceAttribute *at = _attrs.first(); at != 0L; at = _attrs.next()) { if (at->name == "XV_ENCODING") { - XvGetPortAttribute(qt_xdisplay(), xv_port, at->atom(), (int*)&enc); + XvGetPortAttribute(tqt_xdisplay(), xv_port, at->atom(), (int*)&enc); kdDebug() << "KXvDevice: encoding: " << enc << endl; encoding = enc; return true; @@ -643,7 +643,7 @@ void KXvDevice::rebuildImage(int w, int h, bool shm) } #ifdef HAVE_LIBXV if (!shm) { - xv_image = (void*)XvCreateImage(qt_xdisplay(), xv_port, xv_imageformat, + xv_image = (void*)XvCreateImage(tqt_xdisplay(), xv_port, xv_imageformat, 0, w, h); if (!xv_image) { kdWarning() << "KXvDevice::rebuildImage: XvCreateImage failed." << endl; @@ -651,13 +651,13 @@ void KXvDevice::rebuildImage(int w, int h, bool shm) } else { #ifdef HAVE_XSHM memset(xv_shminfo, 0, sizeof(XShmSegmentInfo)); - xv_image = (void*)XvShmCreateImage(qt_xdisplay(), xv_port, xv_imageformat, + xv_image = (void*)XvShmCreateImage(tqt_xdisplay(), xv_port, xv_imageformat, 0, w, h, static_cast(xv_shminfo)); if (!xv_image) { kdWarning() << "KXvDevice::rebuildImage: Error using SHM with Xv! Disabling SHM..." << endl; _haveShm = false; _shm = false; - xv_image = (void*)XvCreateImage(qt_xdisplay(), xv_port, xv_imageformat, + xv_image = (void*)XvCreateImage(tqt_xdisplay(), xv_port, xv_imageformat, 0, w, h); if (!xv_image) { kdWarning() << "KXvDevice::rebuildImage: XvCreateImage failed." << endl; @@ -672,8 +672,8 @@ void KXvDevice::rebuildImage(int w, int h, bool shm) static_cast(xv_shminfo)->readOnly = True; static_cast(xv_image)->data = static_cast(xv_shminfo)->shmaddr; - XShmAttach(qt_xdisplay(), static_cast(xv_shminfo)); - XSync(qt_xdisplay(), False); + XShmAttach(tqt_xdisplay(), static_cast(xv_shminfo)); + XSync(tqt_xdisplay(), False); shmctl(static_cast(xv_shminfo)->shmid, IPC_RMID, 0); } #endif @@ -707,5 +707,5 @@ void KXvDevice::destroyImage() Atom KXvDeviceAttribute::atom() { - return XInternAtom(qt_xdisplay(), name.latin1(), False); + return XInternAtom(tqt_xdisplay(), name.latin1(), False); } diff --git a/kopete/libkopete/avdevice/qvideo.cpp b/kopete/libkopete/avdevice/qvideo.cpp index d8d91602..cc1a0252 100644 --- a/kopete/libkopete/avdevice/qvideo.cpp +++ b/kopete/libkopete/avdevice/qvideo.cpp @@ -72,13 +72,13 @@ bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& b int d = 0; vi_out.screen = TQPaintDevice::x11AppScreen(); - vi_in = XGetVisualInfo(qt_xdisplay(), mask, &vi_out, &nvis); + vi_in = XGetVisualInfo(tqt_xdisplay(), mask, &vi_out, &nvis); if (vi_in) { for (int i = 0; i < nvis; i++) { bpp = 0; int n; - XPixmapFormatValues *pf = XListPixmapFormats(qt_xdisplay(),&n); + XPixmapFormatValues *pf = XListPixmapFormats(tqt_xdisplay(),&n); d = vi_in[i].depth; for (int j = 0; j < n; j++) { if (pf[j].depth == d) { diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 46214376..2b18da9c 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -107,7 +107,7 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") // set the XAutoLock info #ifdef TQ_WS_X11 - Display *dsp = qt_xdisplay(); + Display *dsp = tqt_xdisplay(); #endif d->mouse_x = d->mouse_y=0; d->mouse_mask = 0; @@ -118,11 +118,11 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") d->useXidle = false; d->useMit = false; #ifdef HasXidle - d->useXidle = XidleQueryExtension(qt_xdisplay(), &dummy, &dummy); + d->useXidle = XidleQueryExtension(tqt_xdisplay(), &dummy, &dummy); #endif #ifdef HasScreenSaver if(!d->useXidle) - d->useMit = XScreenSaverQueryExtension(qt_xdisplay(), &dummy, &dummy); + d->useMit = XScreenSaverQueryExtension(tqt_xdisplay(), &dummy, &dummy); #endif #ifdef TQ_WS_X11 d->xIdleTime = 0; @@ -369,7 +369,7 @@ bool Kopete::Away::isActivity() bool activity = false; #ifdef TQ_WS_X11 - Display *dsp = qt_xdisplay(); + Display *dsp = tqt_xdisplay(); Window dummy_w; int dummy_c; unsigned int mask; /* modifier mask */ diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index 68c2d333..75fe99a8 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -287,7 +287,7 @@ void KRDC::showProgressTimeout() { void KRDC::quit() { m_view->releaseKeyboard(); hide(); - vidmodeNormalSwitch(qt_xdisplay(), m_oldResolution); + vidmodeNormalSwitch(tqt_xdisplay(), m_oldResolution); if (m_view) m_view->startQuitting(); emit disconnected(); @@ -415,7 +415,7 @@ void KRDC::switchToFullscreen(bool scaling) if (!fromFullscreen) { hide(); - m_oldResolution = vidmodeFullscreenSwitch(qt_xdisplay(), + m_oldResolution = vidmodeFullscreenSwitch(tqt_xdisplay(), m_desktopWidget.screenNumber(this), fbs.width(), fbs.height(), @@ -539,7 +539,7 @@ void KRDC::switchToFullscreen(bool scaling) if (!fromFullscreen) { if (m_oldResolution.valid) - grabInput(qt_xdisplay(), winId()); + grabInput(tqt_xdisplay(), winId()); m_view->grabKeyboard(); } @@ -562,8 +562,8 @@ void KRDC::switchToNormal(bool scaling) m_view->releaseKeyboard(); if (m_oldResolution.valid) { - ungrabInput(qt_xdisplay()); - vidmodeNormalSwitch(qt_xdisplay(), m_oldResolution); + ungrabInput(tqt_xdisplay()); + vidmodeNormalSwitch(tqt_xdisplay(), m_oldResolution); m_oldResolution = Resolution(); } @@ -671,9 +671,9 @@ void KRDC::iconify() m_view->releaseKeyboard(); if (m_oldResolution.valid) - ungrabInput(qt_xdisplay()); + ungrabInput(tqt_xdisplay()); - vidmodeNormalSwitch(qt_xdisplay(), m_oldResolution); + vidmodeNormalSwitch(tqt_xdisplay(), m_oldResolution); m_oldResolution = Resolution(); showNormal(); showMinimized(); @@ -699,7 +699,7 @@ bool KRDC::event(TQEvent *e) { m_fullscreenMinimized = false; int x, y; - m_oldResolution = vidmodeFullscreenSwitch(qt_xdisplay(), + m_oldResolution = vidmodeFullscreenSwitch(tqt_xdisplay(), m_desktopWidget.screenNumber(this), m_view->width(), m_view->height(), @@ -713,7 +713,7 @@ bool KRDC::event(TQEvent *e) { setGeometry(0, 0, m_fullscreenResolution.width(), m_fullscreenResolution.height()); if (m_oldResolution.valid) - grabInput(qt_xdisplay(), winId()); + grabInput(tqt_xdisplay(), winId()); m_view->switchFullscreen( true ); KWin::setState(winId(), NET::StaysOnTop); diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index 889a5783..6f4066e6 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -88,7 +88,7 @@ KVncView::KVncView(TQWidget *parent, { kvncview = this; password = _password.latin1(); - dpy = qt_xdisplay(); + dpy = tqt_xdisplay(); setFixedSize(16,16); setFocusPolicy(TQ_StrongFocus); 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" diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 73d32daf..bb558b3e 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -662,7 +662,7 @@ void servercontroller::readGlobalProperties(KConfig *ksc) if ( desktop == -1 ) continue; #ifdef TQ_WS_X11 - NETWinInfo winInfo( qt_xdisplay(), topLevel->winId(), qt_xrootwin(), NET::WMDesktop ); + NETWinInfo winInfo( tqt_xdisplay(), topLevel->winId(), tqt_xrootwin(), NET::WMDesktop ); winInfo.setDesktop( desktop ); #endif } @@ -701,7 +701,7 @@ void servercontroller::saveSessionConfig() KSircTopLevel *topLev = dynamic_cast( ksm.current() ); if ( topLev && topLev->isTopLevel() ) { #ifdef TQ_WS_X11 - NETWinInfo winInfo( qt_xdisplay(), topLev->winId(), qt_xrootwin(), NET::WMDesktop ); + NETWinInfo winInfo( tqt_xdisplay(), topLev->winId(), tqt_xrootwin(), NET::WMDesktop ); sessionInfo.desktop = winInfo.desktop(); #endif } -- cgit v1.2.1