From 45fe54edebbcdff09907d5f5b46cd00f379662f3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:17:20 -0600 Subject: Rename additional global functions and variables for tqt3 --- lib/compatibility/kmdi/qextmdi/kdockwidget.cpp | 2 +- lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp | 6 +++--- quanta/treeviews/basetreeview.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index b7fb30ab..6e88e010 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -821,7 +821,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) #ifndef NO_KDE2 #ifdef TQ_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/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp index 2512751b..b1b4342a 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp @@ -705,7 +705,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef TQ_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); + XSetTransientForHint( tqt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); } #endif @@ -715,7 +715,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef TQ_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); + XSetTransientForHint( tqt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); } #endif @@ -1426,7 +1426,7 @@ void KMdiMainFrm::switchToToplevelMode() for ( kmdicvit.toFirst(); ( *kmdicvit ); ++kmdicvit ) { #ifdef TQ_WS_X11 - XSetTransientForHint( qt_xdisplay(), ( *kmdicvit )->winId(), winId() ); + XSetTransientForHint( tqt_xdisplay(), ( *kmdicvit )->winId(), winId() ); #endif ( *kmdicvit )->show(); } diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index ef4fdbc3..9ff82da5 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -868,7 +868,7 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil Window child; int root_x, root_y, win_x, win_y; uint keybstate; - XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, + XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child, &root_x, &root_y, &win_x, &win_y, &keybstate ); int result; -- cgit v1.2.3