From 90a4df90811f0f978ae768939d8567f737e4c553 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:14:46 -0600 Subject: Rename additional global functions and variables for tqt3 --- tdeui/kcolordialog.cpp | 10 ++-- tdeui/kdetrayproxy/kdetrayproxy.cpp | 26 ++++----- tdeui/kdialog.cpp | 6 +- tdeui/kdockwidget.cpp | 2 +- tdeui/kmainwindow.cpp | 2 +- tdeui/kmenubar.cpp | 12 ++-- tdeui/kmessagebox.cpp | 20 +++---- tdeui/kpassivepopup.cpp | 4 +- tdeui/kpixmapio.cpp | 26 ++++----- tdeui/krootpixmap.cpp | 6 +- tdeui/ksharedpixmap.cpp | 32 +++++------ tdeui/ksystemtray.cpp | 2 +- tdeui/qxembed.cpp | 112 ++++++++++++++++++------------------ tdeui/tests/qxembedtest.cpp | 2 +- tdeui/twindowlistmenu.cpp | 4 +- 15 files changed, 133 insertions(+), 133 deletions(-) (limited to 'tdeui') diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index ac0251107..ec3930fa3 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -70,7 +70,7 @@ // defined in qapplication_x11.cpp typedef int (*QX11EventFilter) (XEvent*); -extern QX11EventFilter qt_set_x11_event_filter (QX11EventFilter filter); +extern QX11EventFilter tqt_set_x11_event_filter (QX11EventFilter filter); #endif struct ColorPaletteNameType @@ -1179,7 +1179,7 @@ KColorDialog::~KColorDialog() { #ifdef Q_WS_X11 if (d->bColorPicking) - qt_set_x11_event_filter(d->oldfilter); + tqt_set_x11_event_filter(d->oldfilter); #endif delete d; } @@ -1504,7 +1504,7 @@ KColorDialog::slotColorPicker() { d->bColorPicking = true; #ifdef Q_WS_X11 - d->oldfilter = qt_set_x11_event_filter(kde_color_dlg_handler); + d->oldfilter = tqt_set_x11_event_filter(kde_color_dlg_handler); #endif kde_color_dlg_widget = this; grabMouse( tqcrossCursor ); @@ -1518,7 +1518,7 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e ) { d->bColorPicking = false; #ifdef Q_WS_X11 - qt_set_x11_event_filter(d->oldfilter); + tqt_set_x11_event_filter(d->oldfilter); d->oldfilter = 0; #endif releaseMouse(); @@ -1547,7 +1547,7 @@ KColorDialog::keyPressEvent( TQKeyEvent *e ) { d->bColorPicking = false; #ifdef Q_WS_X11 - qt_set_x11_event_filter(d->oldfilter); + tqt_set_x11_event_filter(d->oldfilter); d->oldfilter = 0; #endif releaseMouse(); diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp index 7cb621bd8..c6302a3cc 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp @@ -45,12 +45,12 @@ KDETrayProxy::KDETrayProxy() Atom KDETrayProxy::makeSelectionAtom() { - return XInternAtom( qt_xdisplay(), "_NET_SYSTEM_TRAY_S" + TQCString().setNum( qt_xscreen()), False ); + return XInternAtom( tqt_xdisplay(), "_NET_SYSTEM_TRAY_S" + TQCString().setNum( tqt_xscreen()), False ); } void KDETrayProxy::windowAdded( WId w ) { - NETWinInfo ni( qt_xdisplay(), w, qt_xrootwin(), NET::WMKDESystemTrayWinFor ); + NETWinInfo ni( tqt_xdisplay(), w, tqt_xrootwin(), NET::WMKDESystemTrayWinFor ); WId trayWinFor = ni.kdeSystemTrayWinFor(); if ( !trayWinFor ) // not a KDE tray window return; @@ -93,7 +93,7 @@ bool KDETrayProxy::x11Event( XEvent* e ) } if( e->type == ReparentNotify && tray_windows.contains( e->xreparent.window )) { - if( e->xreparent.parent == qt_xrootwin()) + if( e->xreparent.parent == tqt_xrootwin()) { if( !docked_windows.contains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] ) { @@ -114,7 +114,7 @@ bool KDETrayProxy::x11Event( XEvent* e ) if( docked_windows.contains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] ) { // kdDebug() << "Window unmapped:" << e->xunmap.window << endl; - XReparentWindow( qt_xdisplay(), e->xunmap.window, qt_xrootwin(), 0, 0 ); + XReparentWindow( tqt_xdisplay(), e->xunmap.window, tqt_xrootwin(), 0, 0 ); // ReparentNotify will take care of the rest } } @@ -124,21 +124,21 @@ bool KDETrayProxy::x11Event( XEvent* e ) void KDETrayProxy::dockWindow( Window w, Window owner ) { // kdDebug() << "Docking " << w << " into " << owner << endl; - docked_windows[ w ] = XNextRequest( qt_xdisplay()); - static Atom prop = XInternAtom( qt_xdisplay(), "_XEMBED_INFO", False ); + docked_windows[ w ] = XNextRequest( tqt_xdisplay()); + static Atom prop = XInternAtom( tqt_xdisplay(), "_XEMBED_INFO", False ); long data[ 2 ] = { 0, 1 }; - XChangeProperty( qt_xdisplay(), w, prop, prop, 32, PropModeReplace, (unsigned char*)data, 2 ); + XChangeProperty( tqt_xdisplay(), w, prop, prop, 32, PropModeReplace, (unsigned char*)data, 2 ); XSizeHints hints; hints.flags = PMinSize | PMaxSize; hints.min_width = 24; hints.max_width = 24; hints.min_height = 24; hints.max_height = 24; - XSetWMNormalHints( qt_xdisplay(), w, &hints ); + XSetWMNormalHints( tqt_xdisplay(), w, &hints ); // kxerrorhandler ? XEvent ev; memset(&ev, 0, sizeof( ev )); - static Atom atom = XInternAtom( qt_xdisplay(), "_NET_SYSTEM_TRAY_OPCODE", False ); + static Atom atom = XInternAtom( tqt_xdisplay(), "_NET_SYSTEM_TRAY_OPCODE", False ); ev.xclient.type = ClientMessage; ev.xclient.window = owner; ev.xclient.message_type = atom; @@ -148,20 +148,20 @@ void KDETrayProxy::dockWindow( Window w, Window owner ) ev.xclient.data.l[ 2 ] = w; ev.xclient.data.l[ 3 ] = 0; // unused ev.xclient.data.l[ 4 ] = 0; // unused - XSendEvent( qt_xdisplay(), owner, False, NoEventMask, &ev ); + XSendEvent( tqt_xdisplay(), owner, False, NoEventMask, &ev ); } void KDETrayProxy::withdrawWindow( Window w ) { - XWithdrawWindow( qt_xdisplay(), w, qt_xscreen()); - static Atom wm_state = XInternAtom( qt_xdisplay(), "WM_STATE", False ); + XWithdrawWindow( tqt_xdisplay(), w, tqt_xscreen()); + static Atom wm_state = XInternAtom( tqt_xdisplay(), "WM_STATE", False ); for(;;) { Atom type; int format; unsigned long length, after; unsigned char *data; - int r = XGetWindowProperty( qt_xdisplay(), w, wm_state, 0, 2, + int r = XGetWindowProperty( tqt_xdisplay(), w, wm_state, 0, 2, False, AnyPropertyType, &type, &format, &length, &after, &data ); bool withdrawn = true; diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index f1fc79061..2d4d53977 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -130,7 +130,7 @@ void KDialog::setPlainCaption( const TQString &caption ) TQDialog::setCaption( caption ); #ifdef Q_WS_X11 - NETWinInfo info( qt_xdisplay(), winId(), qt_xrootwin(), 0 ); + NETWinInfo info( tqt_xdisplay(), winId(), tqt_xrootwin(), 0 ); info.setName( caption.utf8().data() ); #endif } @@ -398,8 +398,8 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent) { // Signal that we do not want any window controls to be shown at all Atom kde_wm_system_modal_notification; - kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); - XChangeProperty(qt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); + kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); + XChangeProperty(tqt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); TQVBoxLayout* vbox = new TQVBoxLayout( this ); diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 591b7bb06..258dd72d0 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -820,7 +820,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) #ifndef NO_KDE2 #ifdef Q_WS_X11 if (d->transient && d->_parent) - XSetTransientForHint( qt_xdisplay(), winId(), d->_parent->winId() ); + XSetTransientForHint( tqt_xdisplay(), winId(), d->_parent->winId() ); #ifdef BORDERLESS_WINDOWS KWin::setType( winId(), NET::Override); //d->windowType ); diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index f4292029d..ffb59588b 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -592,7 +592,7 @@ void KMainWindow::setPlainCaption( const TQString &caption ) { TQMainWindow::setCaption( caption ); #if defined Q_WS_X11 - NETWinInfo info( qt_xdisplay(), winId(), qt_xrootwin(), 0 ); + NETWinInfo info( tqt_xdisplay(), winId(), tqt_xrootwin(), 0 ); info.setName( caption.utf8().data() ); #endif } diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp index 7c13b6911..7f6983275 100644 --- a/tdeui/kmenubar.cpp +++ b/tdeui/kmenubar.cpp @@ -109,11 +109,11 @@ static void initAtoms() { char nm[ 100 ]; - sprintf( nm, "_KDE_TOPMENU_OWNER_S%d", DefaultScreen( qt_xdisplay())); + sprintf( nm, "_KDE_TOPMENU_OWNER_S%d", DefaultScreen( tqt_xdisplay())); char nm2[] = "_KDE_TOPMENU_MINSIZE"; char* names[ 2 ] = { nm, nm2 }; Atom atoms[ 2 ]; - XInternAtoms( qt_xdisplay(), names, 2, False, atoms ); + XInternAtoms( tqt_xdisplay(), names, 2, False, atoms ); selection_atom = atoms[ 0 ]; msg_type_atom = atoms[ 1 ]; } @@ -178,7 +178,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) { #ifdef Q_WS_X11 d->selection = new KSelectionWatcher( KMenuBarPrivate::makeSelectionAtom(), - DefaultScreen( qt_xdisplay())); + DefaultScreen( tqt_xdisplay())); connect( d->selection, TQT_SIGNAL( newOwner( Window )), this, TQT_SLOT( updateFallbackSize())); connect( d->selection, TQT_SIGNAL( lostOwner()), @@ -193,7 +193,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) #ifdef Q_WS_X11 KWin::setType( winId(), NET::TopMenu ); if( parentWidget()) - XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); + XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); #endif TQMenuBar::setFrameStyle( NoFrame ); TQMenuBar::setLineWidth( 0 ); @@ -260,7 +260,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); + XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); #else //TODO: WIN32? #endif @@ -271,7 +271,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) if( ev->type() == TQEvent::Show ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); + XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); #else //TODO: WIN32? #endif diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp index 8ffdc0e6d..ee526dcdb 100644 --- a/tdeui/kmessagebox.cpp +++ b/tdeui/kmessagebox.cpp @@ -434,7 +434,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text, dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif bool checkboxResult = false; @@ -485,7 +485,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id, dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif bool checkboxResult = false; @@ -567,7 +567,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text, dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif bool checkboxResult = false; @@ -639,7 +639,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text, dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif bool checkboxResult = false; @@ -715,7 +715,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text, dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif bool checkboxResult = false; @@ -766,7 +766,7 @@ KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringLi dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif createKMessageBox(dialog, TQMessageBox::Critical, text, strlist, TQString::null, 0, options); @@ -796,7 +796,7 @@ KMessageBox::detailedErrorWId(WId parent_id, const TQString &text, dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif createKMessageBox(dialog, TQMessageBox::Critical, text, TQStringList(), TQString::null, 0, options, details); @@ -843,7 +843,7 @@ KMessageBox::sorryWId(WId parent_id, const TQString &text, dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif createKMessageBox(dialog, TQMessageBox::Warning, text, TQStringList(), TQString::null, 0, options); @@ -873,7 +873,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text, dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif createKMessageBox(dialog, TQMessageBox::Warning, text, TQStringList(), TQString::null, 0, options, details); @@ -919,7 +919,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri dialog->setPlainCaption( caption ); #ifdef Q_WS_X11 if( parent == NULL && parent_id ) - XSetTransientForHint( qt_xdisplay(), dialog->winId(), parent_id ); + XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id ); #endif bool checkboxResult = false; diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index b348e1040..1e86bc57f 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -234,7 +234,7 @@ void KPassivePopup::hideEvent( TQHideEvent * ) TQRect KPassivePopup::defaultArea() const { #ifdef Q_WS_X11 - NETRootInfo info( qt_xdisplay(), + NETRootInfo info( tqt_xdisplay(), NET::NumberOfDesktops | NET::CurrentDesktop | NET::WorkArea, @@ -261,7 +261,7 @@ void KPassivePopup::positionSelf() } else { - NETWinInfo ni( qt_xdisplay(), window, qt_xrootwin(), + NETWinInfo ni( tqt_xdisplay(), window, tqt_xrootwin(), NET::WMIconGeometry | NET::WMKDESystemTrayWinFor ); // Figure out where to put the popup. Note that we must handle diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp index 1900da11f..aafb7f3c2 100644 --- a/tdeui/kpixmapio.cpp +++ b/tdeui/kpixmapio.cpp @@ -92,9 +92,9 @@ KPixmapIO::KPixmapIO() return; int ignore; - if (XQueryExtension(qt_xdisplay(), "MIT-SHM", &ignore, &ignore, &ignore)) + if (XQueryExtension(tqt_xdisplay(), "MIT-SHM", &ignore, &ignore, &ignore)) { - if (XShmQueryExtension(qt_xdisplay())) + if (XShmQueryExtension(tqt_xdisplay())) m_bShm = true; } if (!m_bShm) @@ -108,7 +108,7 @@ KPixmapIO::KPixmapIO() // Sort out bit format. Create a temporary XImage for this. d->shminfo = new XShmSegmentInfo; - d->ximage = XShmCreateImage(qt_xdisplay(), (Visual *) TQPaintDevice::x11AppVisual(), + d->ximage = XShmCreateImage(tqt_xdisplay(), (Visual *) TQPaintDevice::x11AppVisual(), TQPaintDevice::x11AppDepth(), ZPixmap, 0L, d->shminfo, 10, 10); d->bpp = d->ximage->bits_per_pixel; d->first_try = true; @@ -231,10 +231,10 @@ void KPixmapIO::putImage(TQPixmap *dst, int dx, int dy, const TQImage *src) if( initXImage(src->width(), src->height())) { convertToXImage(*src); - XShmPutImage(qt_xdisplay(), dst->handle(), qt_xget_temp_gc(qt_xscreen(), false), d->ximage, + XShmPutImage(tqt_xdisplay(), dst->handle(), tqt_xget_temp_gc(tqt_xscreen(), false), d->ximage, dx, dy, 0, 0, src->width(), src->height(), false); // coolo: do we really need this here? I see no good for it - XSync(qt_xdisplay(), false); + XSync(tqt_xdisplay(), false); doneXImage(); fallback = false; } @@ -265,7 +265,7 @@ TQImage KPixmapIO::getImage(const TQPixmap *src, int sx, int sy, int sw, int sh) #ifdef HAVE_MITSHM if( initXImage(sw, sh)) { - XShmGetImage(qt_xdisplay(), src->handle(), d->ximage, sx, sy, AllPlanes); + XShmGetImage(tqt_xdisplay(), src->handle(), d->ximage, sx, sy, AllPlanes); image = convertFromXImage(); doneXImage(); fallback = false; @@ -353,7 +353,7 @@ void KPixmapIO::destroyXImage() bool KPixmapIO::createXImage(int w, int h) { destroyXImage(); - d->ximage = XShmCreateImage(qt_xdisplay(), (Visual *) TQPaintDevice::x11AppVisual(), + d->ximage = XShmCreateImage(tqt_xdisplay(), (Visual *) TQPaintDevice::x11AppVisual(), TQPaintDevice::x11AppDepth(), ZPixmap, 0L, d->shminfo, w, h); return d->ximage != None; } @@ -363,7 +363,7 @@ void KPixmapIO::destroyShmSegment() { if (d->shmsize) { - XShmDetach(qt_xdisplay(), d->shminfo); + XShmDetach(tqt_xdisplay(), d->shminfo); shmdt(d->shminfo->shmaddr); shmctl(d->shminfo->shmid, IPC_RMID, 0); d->shmsize = 0; @@ -412,12 +412,12 @@ bool KPixmapIO::createShmSegment(int size) if (d->first_try) { // make sure that we don't get errors of old stuff - XSync(qt_xdisplay(), False); + XSync(tqt_xdisplay(), False); old_errhandler = XSetErrorHandler(kpixmapio_errorhandler); - kpixmapio_serial = NextRequest(qt_xdisplay()); + kpixmapio_serial = NextRequest(tqt_xdisplay()); } - if ( !XShmAttach(qt_xdisplay(), d->shminfo)) + if ( !XShmAttach(tqt_xdisplay(), d->shminfo)) { kdWarning() << "X-Server could not attach shared memory segment.\n"; m_bShm = false; @@ -426,7 +426,7 @@ bool KPixmapIO::createShmSegment(int size) } if (d->first_try) { - XSync(qt_xdisplay(), false); + XSync(tqt_xdisplay(), false); if (!use_xshm) m_bShm = false; @@ -464,7 +464,7 @@ TQImage KPixmapIO::convertFromXImage() XColor *cmap = new XColor[ncells]; for (i=0; ipixmap = XInternAtom(qt_xdisplay(), "PIXMAP", false); + d->pixmap = XInternAtom(tqt_xdisplay(), "PIXMAP", false); TQCString atom; atom.sprintf("target prop for window %lx", static_cast(winId())); - d->target = XInternAtom(qt_xdisplay(), atom.data(), false); + d->target = XInternAtom(tqt_xdisplay(), atom.data(), false); d->selection = None; } @@ -88,10 +88,10 @@ void KSharedPixmap::init() bool KSharedPixmap::isAvailable(const TQString & name) const { TQString str = TQString("KDESHPIXMAP:%1").arg(name); - Atom sel = XInternAtom(qt_xdisplay(), str.latin1(), true); + Atom sel = XInternAtom(tqt_xdisplay(), str.latin1(), true); if (sel == None) return false; - return XGetSelectionOwner(qt_xdisplay(), sel) != None; + return XGetSelectionOwner(tqt_xdisplay(), sel) != None; } @@ -105,16 +105,16 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) TQPixmap::resize(0, 0); // invalidate TQString str = TQString("KDESHPIXMAP:%1").arg(name); - d->selection = XInternAtom(qt_xdisplay(), str.latin1(), true); + d->selection = XInternAtom(tqt_xdisplay(), str.latin1(), true); if (d->selection == None) return false; - if (XGetSelectionOwner(qt_xdisplay(), d->selection) == None) + if (XGetSelectionOwner(tqt_xdisplay(), d->selection) == None) { d->selection = None; return false; } - XConvertSelection(qt_xdisplay(), d->selection, d->pixmap, d->target, + XConvertSelection(tqt_xdisplay(), d->selection, d->pixmap, d->target, winId(), CurrentTime); return true; } @@ -144,7 +144,7 @@ bool KSharedPixmap::x11Event(XEvent *event) unsigned char *pixmap_id = 0; Atom type; - XGetWindowProperty(qt_xdisplay(), winId(), ev->property, 0, 1, false, + XGetWindowProperty(tqt_xdisplay(), winId(), ev->property, 0, 1, false, d->pixmap, &type, &format, &nitems, &ldummy, &pixmap_id); @@ -160,7 +160,7 @@ bool KSharedPixmap::x11Event(XEvent *event) void *drawable_id = (void *) pixmap_id; Drawable pixmap = *(Drawable*) drawable_id; - Status status = XGetGeometry(qt_xdisplay(), pixmap, &root, &dummy, &dummy, &width, &height, &udummy, &udummy); + Status status = XGetGeometry(tqt_xdisplay(), pixmap, &root, &dummy, &dummy, &width, &height, &udummy, &udummy); if (status == BadDrawable) return false; @@ -168,11 +168,11 @@ bool KSharedPixmap::x11Event(XEvent *event) if (d->rect.isEmpty()) { TQPixmap::resize(width, height); - XCopyArea(qt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), qt_xget_temp_gc(qt_xscreen(), false), + XCopyArea(tqt_xdisplay(), pixmap, ((KPixmap*)this)->handle(), tqt_xget_temp_gc(tqt_xscreen(), false), 0, 0, width, height, 0, 0); XFree(pixmap_id); - XDeleteProperty(qt_xdisplay(), winId(), ev->property); + XDeleteProperty(tqt_xdisplay(), winId(), ev->property); d->selection = None; emit done(true); return true; @@ -206,19 +206,19 @@ bool KSharedPixmap::x11Event(XEvent *event) TQPixmap::resize( tw+origin.x(), th+origin.y() ); - XCopyArea(qt_xdisplay(), pixmap, (static_cast(this))->handle(), qt_xget_temp_gc(qt_xscreen(), false), + XCopyArea(tqt_xdisplay(), pixmap, (static_cast(this))->handle(), tqt_xget_temp_gc(tqt_xscreen(), false), xa, ya, t1w+origin.x(), t1h+origin.y(), origin.x(), origin.y() ); - XCopyArea(qt_xdisplay(), pixmap, (static_cast(this))->handle(), qt_xget_temp_gc(qt_xscreen(), false), + XCopyArea(tqt_xdisplay(), pixmap, (static_cast(this))->handle(), tqt_xget_temp_gc(tqt_xscreen(), false), 0, ya, tw-t1w, t1h, t1w, 0); - XCopyArea(qt_xdisplay(), pixmap, (static_cast(this))->handle(), qt_xget_temp_gc(qt_xscreen(), false), + XCopyArea(tqt_xdisplay(), pixmap, (static_cast(this))->handle(), tqt_xget_temp_gc(tqt_xscreen(), false), xa, 0, t1w, th-t1h, 0, t1h); - XCopyArea(qt_xdisplay(), pixmap, (static_cast(this))->handle(), qt_xget_temp_gc(qt_xscreen(), false), + XCopyArea(tqt_xdisplay(), pixmap, (static_cast(this))->handle(), tqt_xget_temp_gc(tqt_xscreen(), false), 0, 0, tw-t1w, th-t1h, t1w, t1h); XFree(pixmap_id); d->selection = None; - XDeleteProperty(qt_xdisplay(), winId(), ev->property); + XDeleteProperty(tqt_xdisplay(), winId(), ev->property); emit done(true); return true; } diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 100f86df8..1ae786d67 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -69,7 +69,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->actionCollection = new KActionCollection(this); #ifdef Q_WS_X11 - KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): qt_xrootwin() ); + KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): tqt_xrootwin() ); #endif setBackgroundMode(X11ParentRelative); setBackgroundOrigin(WindowOrigin); diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp index 95bd1bc9b..b62f45ead 100644 --- a/tdeui/qxembed.cpp +++ b/tdeui/qxembed.cpp @@ -97,10 +97,10 @@ const int XKeyRelease = KeyRelease; # undef FocusIn // L0005: Variables defined in qapplication_x11.cpp -extern Atom qt_wm_protocols; -extern Atom qt_wm_delete_window; -extern Atom qt_wm_take_focus; -extern Atom qt_wm_state; +extern Atom tqt_wm_protocols; +extern Atom tqt_wm_delete_window; +extern Atom tqt_wm_take_focus; +extern Atom tqt_wm_state; // L0006: X11 atoms private to QXEmbed static Atom xembed = 0; @@ -184,7 +184,7 @@ public: // L0400: This sets a very low level filter for X11 messages. // See qapplication_x11.cpp typedef int (*QX11EventFilter) (XEvent*); -extern QX11EventFilter qt_set_x11_event_filter (QX11EventFilter filter); +extern QX11EventFilter tqt_set_x11_event_filter (QX11EventFilter filter); static QX11EventFilter oldFilter = 0; @@ -204,7 +204,7 @@ static void sendXEmbedMessage( WId window, long message, long detail = 0, ev.xclient.data.l[2] = detail; ev.xclient.data.l[3] = data1; ev.xclient.data.l[4] = data2; - XSendEvent(qt_xdisplay(), window, false, NoEventMask, &ev); + XSendEvent(tqt_xdisplay(), window, false, NoEventMask, &ev); } // L0501: Helper to send ICCCM Client messages. @@ -220,7 +220,7 @@ static void sendClientMessage(Window window, Atom a, long x) ev.xclient.format = 32; ev.xclient.data.l[0] = x; ev.xclient.data.l[1] = GET_QT_X_TIME(); - XSendEvent(qt_xdisplay(), window, false, NoEventMask, &ev); + XSendEvent(tqt_xdisplay(), window, false, NoEventMask, &ev); } // L0502: Helper to send fake X11 focus messages. @@ -234,7 +234,7 @@ static void sendFocusMessage(Window window, int type, int mode, int detail) ev.xfocus.window = window; ev.xfocus.mode = mode; ev.xfocus.detail = detail; - XSendEvent(qt_xdisplay(), window, false, FocusChangeMask, &ev); + XSendEvent(tqt_xdisplay(), window, false, FocusChangeMask, &ev); } @@ -462,7 +462,7 @@ static int qxembed_x11_event_filter( XEvent* e) // widget might later be set in L0680. XEvent ev; memset(&ev, 0, sizeof(ev)); - ev.xfocus.display = qt_xdisplay(); + ev.xfocus.display = tqt_xdisplay(); ev.xfocus.type = XFocusIn; ev.xfocus.window = w->topLevelWidget()->winId(); ev.xfocus.mode = NotifyNormal; @@ -476,7 +476,7 @@ static int qxembed_x11_event_filter( XEvent* e) // receive extra Qt FocusOut events but we do not care. XEvent ev; memset(&ev, 0, sizeof(ev)); - ev.xfocus.display = qt_xdisplay(); + ev.xfocus.display = tqt_xdisplay(); ev.xfocus.type = XFocusOut; ev.xfocus.window = w->topLevelWidget()->winId(); ev.xfocus.mode = NotifyNormal; @@ -555,7 +555,7 @@ static int qxembed_x11_event_filter( XEvent* e) break; } } else if ( e->xclient.format == 32 && e->xclient.message_type ) { - if ( e->xclient.message_type == qt_wm_protocols ) { + if ( e->xclient.message_type == tqt_wm_protocols ) { TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); if ( !w ) break; @@ -567,7 +567,7 @@ static int qxembed_x11_event_filter( XEvent* e) // changed the X11 focus. We want to make sure it goes // to the focus proxy window eventually. Atom a = e->xclient.data.l[0]; - if ( a == qt_wm_take_focus ) { + if ( a == tqt_wm_take_focus ) { // L0695: update Qt message time variable if ( (ulong) e->xclient.data.l[1] > GET_QT_X_TIME() ) SET_QT_X_TIME(e->xclient.data.l[1]); @@ -607,9 +607,9 @@ void QXEmbed::initialize() return; // L0710: Atom used by the XEMBED protocol. - xembed = XInternAtom( qt_xdisplay(), "_XEMBED", false ); + xembed = XInternAtom( tqt_xdisplay(), "_XEMBED", false ); // L0720: Install low level filter for X11 events (L0650) - oldFilter = qt_set_x11_event_filter( qxembed_x11_event_filter ); + oldFilter = tqt_set_x11_event_filter( qxembed_x11_event_filter ); // L0730: See L0610 for an explanation about focusMap. focusMap = new TQPtrDict >; focusMap->setAutoDelete( true ); @@ -670,7 +670,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // L0912: We are mostly interested in SubstructureNotify // This is sent when something happens to the children of // the X11 window associated with the QXEmbed widget. - XSelectInput(qt_xdisplay(), winId(), + XSelectInput(tqt_xdisplay(), winId(), KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | KeymapStateMask | @@ -693,7 +693,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // See L1581 to know why we do not use isActiveWindow(). if ( tqApp->activeWindow() == topLevelWidget() ) if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) - XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), + XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), RevertToParent, GET_QT_X_TIME() ); // L0915: ??? [drag&drop?] setAcceptDrops( true ); @@ -704,7 +704,7 @@ QXEmbed::~QXEmbed() { // L1010: Make sure no pointer grab is left. if ( d && d->xgrab) - XUngrabButton( qt_xdisplay(), AnyButton, AnyModifier, winId() ); + XUngrabButton( tqt_xdisplay(), AnyButton, AnyModifier, winId() ); if ( window && ( autoDelete() || !d->xplain )) { // L1021: Hide the window and safely reparent it into the root, @@ -720,17 +720,17 @@ QXEmbed::~QXEmbed() // themselves they have been released from systray, but KWin requires them // to be visible to allow next Kicker instance to swallow them. // See also below the L1022 comment. -// XUnmapWindow( qt_xdisplay(), window ); +// XUnmapWindow( tqt_xdisplay(), window ); #else if( autoDelete()) - XUnmapWindow( qt_xdisplay(), window ); + XUnmapWindow( tqt_xdisplay(), window ); #endif - XReparentWindow(qt_xdisplay(), window, qt_xrootwin(), 0, 0); + XReparentWindow(tqt_xdisplay(), window, tqt_xrootwin(), 0, 0); if( !d->xplain ) - XRemoveFromSaveSet( qt_xdisplay(), window ); + XRemoveFromSaveSet( tqt_xdisplay(), window ); if( d->mapAfterRelease ) - XMapWindow( qt_xdisplay(), window ); - XSync(qt_xdisplay(), false); + XMapWindow( tqt_xdisplay(), window ); + XSync(tqt_xdisplay(), false); // L1022: Send the WM_DELETE_WINDOW message if( autoDelete() /*&& d->xplain*/ ) // This sendDelete should only apply to XPLAIN. @@ -744,9 +744,9 @@ QXEmbed::~QXEmbed() // Make sure that the X11 focus is not lost in the process. Window focus; int revert; - XGetInputFocus( qt_xdisplay(), &focus, &revert ); + XGetInputFocus( tqt_xdisplay(), &focus, &revert ); if( focus == d->focusProxy->winId()) - XSetInputFocus( qt_xdisplay(), topLevelWidget()->winId(), RevertToParent, GET_QT_X_TIME() ); + XSetInputFocus( tqt_xdisplay(), topLevelWidget()->winId(), RevertToParent, GET_QT_X_TIME() ); // L01045: Delete our private data. delete d; } @@ -759,8 +759,8 @@ void QXEmbed::sendDelete( void ) { if (window) { - sendClientMessage(window, qt_wm_protocols, qt_wm_delete_window); - XFlush( qt_xdisplay() ); + sendClientMessage(window, tqt_wm_protocols, tqt_wm_delete_window); + XFlush( tqt_xdisplay() ); } } @@ -793,14 +793,14 @@ QXEmbed::Protocol QXEmbed::protocol() void QXEmbed::resizeEvent(TQResizeEvent*) { if (window) - XResizeWindow(qt_xdisplay(), window, width(), height()); + XResizeWindow(tqt_xdisplay(), window, width(), height()); } // L1250: QXEmbed widget is shown: make sure embedded window is visible. void QXEmbed::showEvent(TQShowEvent*) { if (window) - XMapRaised(qt_xdisplay(), window); + XMapRaised(tqt_xdisplay(), window); } @@ -815,7 +815,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) // Make sure the X11 focus is on the focus proxy window. See L0686. if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) if (! hasFocus() ) - XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), + XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), RevertToParent, GET_QT_X_TIME() ); if (d->xplain) // L1311: Activation has changed. Grab state might change. See L2800. @@ -874,7 +874,7 @@ void QXEmbed::keyPressEvent( TQKeyEvent *) if (!window) return; last_key_event.window = window; - XSendEvent(qt_xdisplay(), window, false, KeyPressMask, (XEvent*)&last_key_event); + XSendEvent(tqt_xdisplay(), window, false, KeyPressMask, (XEvent*)&last_key_event); } @@ -885,7 +885,7 @@ void QXEmbed::keyReleaseEvent( TQKeyEvent *) if (!window) return; last_key_event.window = window; - XSendEvent(qt_xdisplay(), window, false, KeyReleaseMask, (XEvent*)&last_key_event); + XSendEvent(tqt_xdisplay(), window, false, KeyReleaseMask, (XEvent*)&last_key_event); } // L1500: Handle Qt focus in event. @@ -899,7 +899,7 @@ void QXEmbed::focusInEvent( TQFocusEvent * e ){ // L1511: Alter X focus only when window is active. // This is dual safety here because FocusIn implies this. // But see L1581 for an example where this really matters. - XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), + XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), RevertToParent, GET_QT_X_TIME() ); if (d->xplain) { // L1520: Qt focus has changed. Grab state might change. See L2800. @@ -949,7 +949,7 @@ void QXEmbed::focusOutEvent( TQFocusEvent * ){ // The test above is not the same as isActiveWindow(). // Function isActiveWindow() also returns true when a modal // dialog child of this window is active. - XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), + XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), RevertToParent, GET_QT_X_TIME() ); } @@ -973,7 +973,7 @@ static bool wstate_withdrawn( WId winid ) int format; unsigned long length, after; unsigned char *data; - int r = XGetWindowProperty( qt_xdisplay(), winid, qt_wm_state, 0, 2, + int r = XGetWindowProperty( tqt_xdisplay(), winid, tqt_wm_state, 0, 2, false, AnyPropertyType, &type, &format, &length, &after, &data ); bool withdrawn = true; @@ -993,7 +993,7 @@ static int get_parent(WId winid, Window *out_parent) { Window root, *children=0; unsigned int nchildren; - int st = XQueryTree(qt_xdisplay(), winid, &root, out_parent, &children, &nchildren); + int st = XQueryTree(tqt_xdisplay(), winid, &root, out_parent, &children, &nchildren); if (st && children) XFree(children); return st; @@ -1016,14 +1016,14 @@ void QXEmbed::embed(WId w) // This makes sure that the window manager will // no longer try to manage this window. if ( !wstate_withdrawn(window) ) { - XWithdrawWindow(qt_xdisplay(), window, qt_xscreen()); + XWithdrawWindow(tqt_xdisplay(), window, tqt_xscreen()); TQApplication::flushX(); // L1711: See L1610 for (int i=0; i < 10000; ++i) { if (wstate_withdrawn(window)) { Window parent = 0; get_parent(w, &parent); - if (parent == qt_xrootwin()) break; + if (parent == tqt_xrootwin()) break; } USLEEP(1000); } @@ -1039,8 +1039,8 @@ void QXEmbed::embed(WId w) // this is done once more when finishing embedding, but it's done also here // just in case we crash before reaching that place if( !d->xplain ) - XAddToSaveSet( qt_xdisplay(), w ); - XReparentWindow(qt_xdisplay(), w, winId(), 0, 0); + XAddToSaveSet( tqt_xdisplay(), w ); + XReparentWindow(tqt_xdisplay(), w, winId(), 0, 0); if (get_parent(w, &parent) && parent == winId()) { kdDebug() << TQString(TQString("> Loop %1: ").arg(i)) << TQString(TQString("> reparent of 0x%1").arg(w,0,16)) @@ -1066,9 +1066,9 @@ void QXEmbed::handleEmbed() // only XEMBED apps can survive crash, // see http://lists.kde.org/?l=kfm-devel&m=106752026501968&w=2 if( !d->xplain ) - XAddToSaveSet( qt_xdisplay(), window ); - XResizeWindow(qt_xdisplay(), window, width(), height()); - XMapRaised(qt_xdisplay(), window); + XAddToSaveSet( tqt_xdisplay(), window ); + XResizeWindow(tqt_xdisplay(), window, width(), height()); + XMapRaised(tqt_xdisplay(), window); // L2024: see L2900. sendSyntheticConfigureNotifyEvent(); // L2025: ??? [any idea about drag&drop?] @@ -1155,7 +1155,7 @@ bool QXEmbed::x11Event( XEvent* e) // ??? [not sure it is good to touch this window since // someone else has taken control of it already.] if( !d->xplain ) - XRemoveFromSaveSet( qt_xdisplay(), window ); + XRemoveFromSaveSet( tqt_xdisplay(), window ); } else if ( e->xreparent.parent == winId()){ if( window == 0 ) // something started embedding from the outside window = e->xreparent.window; @@ -1176,7 +1176,7 @@ bool QXEmbed::x11Event( XEvent* e) TQFocusEvent::resetReason(); #endif // USE_QT4 // L2064: Resume X11 event processing. - XAllowEvents(qt_xdisplay(), ReplayPointer, CurrentTime); + XAllowEvents(tqt_xdisplay(), ReplayPointer, CurrentTime); // L2065: Qt should not know about this. return true; } @@ -1184,14 +1184,14 @@ bool QXEmbed::x11Event( XEvent* e) case ButtonRelease: if (d->xplain && d->xgrab) { // L2064: Resume X11 event processing after passive grab (see L2060) - XAllowEvents(qt_xdisplay(), SyncPointer, CurrentTime); + XAllowEvents(tqt_xdisplay(), SyncPointer, CurrentTime); return true; } break; case MapRequest: // L2070: Behave like a window manager. if ( window && e->xmaprequest.window == window ) - XMapRaised(qt_xdisplay(), window ); + XMapRaised(tqt_xdisplay(), window ); break; case ClientMessage: // L2080: This is where the QXEmbed object receives XEMBED @@ -1268,7 +1268,7 @@ void QXEmbed::enterWhatsThisMode() TQWhatsThis::leaveWhatsThisMode(); if ( !context_help ) context_help = XInternAtom( x11Display(), "_NET_WM_CONTEXT_HELP", false ); - sendClientMessage(window , qt_wm_protocols, context_help ); + sendClientMessage(window , tqt_wm_protocols, context_help ); } @@ -1315,7 +1315,7 @@ bool QXEmbed::processClientCmdline( TQWidget* client, int& argc, char ** argv ) void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) { initialize(); - XReparentWindow(qt_xdisplay(), client->winId(), window, 0, 0); + XReparentWindow(tqt_xdisplay(), client->winId(), window, 0, 0); // L2451: These two lines are redundant. See L0680. ((QXEmbed*)client)->topData()->embedded = true; #ifdef USE_QT4 @@ -1353,7 +1353,7 @@ TQSize QXEmbed::minimumSizeHint() const if ( window ) { XSizeHints size; long msize; - if (XGetWMNormalHints(qt_xdisplay(), window, &size, &msize) + if (XGetWMNormalHints(tqt_xdisplay(), window, &size, &msize) && ( size.flags & PMinSize) ) { minw = size.min_width; minh = size.min_height; @@ -1391,13 +1391,13 @@ void QXEmbed::checkGrab() { if (d->xplain && isActiveWindow() && !hasFocus()) { if (! d->xgrab) - XGrabButton(qt_xdisplay(), AnyButton, AnyModifier, winId(), + XGrabButton(tqt_xdisplay(), AnyButton, AnyModifier, winId(), false, ButtonPressMask, GrabModeSync, GrabModeAsync, None, None ); d->xgrab = true; } else { if (d->xgrab) - XUngrabButton( qt_xdisplay(), AnyButton, AnyModifier, winId() ); + XUngrabButton( tqt_xdisplay(), AnyButton, AnyModifier, winId() ); d->xgrab = false; } } @@ -1415,7 +1415,7 @@ void QXEmbed::sendSyntheticConfigureNotifyEvent() XConfigureEvent c; memset(&c, 0, sizeof(c)); c.type = ConfigureNotify; - c.display = qt_xdisplay(); + c.display = tqt_xdisplay(); c.send_event = True; c.event = window; c.window = window; @@ -1426,11 +1426,11 @@ void QXEmbed::sendSyntheticConfigureNotifyEvent() c.border_width = 0; c.above = None; c.override_redirect = 0; - XSendEvent( qt_xdisplay(), c.event, true, StructureNotifyMask, (XEvent*)&c ); + XSendEvent( tqt_xdisplay(), c.event, true, StructureNotifyMask, (XEvent*)&c ); #endif // Yes, this doesn't make sense at all. See the commit message. - XSetWindowBorderWidth( qt_xdisplay(), window, 1 ); - XSetWindowBorderWidth( qt_xdisplay(), window, 0 ); + XSetWindowBorderWidth( tqt_xdisplay(), window, 1 ); + XSetWindowBorderWidth( tqt_xdisplay(), window, 0 ); } } diff --git a/tdeui/tests/qxembedtest.cpp b/tdeui/tests/qxembedtest.cpp index 5e870ba8f..4965e5487 100644 --- a/tdeui/tests/qxembedtest.cpp +++ b/tdeui/tests/qxembedtest.cpp @@ -84,5 +84,5 @@ Window Window_With_Name(Display *dpy, Window top, const char *name) WId windowWithName(const char *name) { - return Window_With_Name(qt_xdisplay(), qt_xrootwin(), name); + return Window_With_Name(tqt_xdisplay(), tqt_xrootwin(), name); } diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp index 5058695a3..b1d05c57e 100644 --- a/tdeui/twindowlistmenu.cpp +++ b/tdeui/twindowlistmenu.cpp @@ -47,7 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. static TQCString twinName() { TQCString appname; - int screen_number = DefaultScreen(qt_xdisplay()); + int screen_number = DefaultScreen(tqt_xdisplay()); if (screen_number == 0) appname = "twin"; else @@ -100,7 +100,7 @@ static bool standaloneDialog( const KWin::WindowInfo* info, const NameSortedInfo WId group = info->groupLeader(); if( group == 0 ) { - return info->transientFor() == qt_xrootwin(); + return info->transientFor() == tqt_xrootwin(); } for( TQPtrListIterator< KWin::WindowInfo > it( list ); it.current() != NULL; -- cgit v1.2.1