Rename additional global functions and variables for tqt3

1 files changed, 82 insertions, 82 deletions

diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index b46697d99..fb59002f8 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -63,9 +63,9 @@ bool supportsCompMgr()
 {
     int i;
 
-    bool damageExt = XQueryExtension(qt_xdisplay(), "DAMAGE", &i, &i, &i);
-    bool compositeExt = XQueryExtension(qt_xdisplay(), "Composite", &i, &i, &i);
-    bool xfixesExt = XQueryExtension(qt_xdisplay(), "XFIXES", &i, &i, &i);
+    bool damageExt = XQueryExtension(tqt_xdisplay(), "DAMAGE", &i, &i, &i);
+    bool compositeExt = XQueryExtension(tqt_xdisplay(), "Composite", &i, &i, &i);
+    bool xfixesExt = XQueryExtension(tqt_xdisplay(), "XFIXES", &i, &i, &i);
 
     return damageExt && compositeExt && xfixesExt;
 }
@@ -140,8 +140,8 @@ Workspace::Workspace( bool restore )
     {
     _self = this;
     mgr = new PluginMgr;
-    root = qt_xrootwin();
-    default_colormap = DefaultColormap(qt_xdisplay(), qt_xscreen() );
+    root = tqt_xrootwin();
+    default_colormap = DefaultColormap(tqt_xdisplay(), tqt_xscreen() );
     installed_colormap = default_colormap;
     session.setAutoDelete( TRUE );
 
@@ -176,7 +176,7 @@ Workspace::Workspace( bool restore )
         KStartupInfo::DisableKWinModule | KStartupInfo::AnnounceSilenceChanges, this );
 
     // select windowmanager privileges
-    XSelectInput(qt_xdisplay(), root,
+    XSelectInput(tqt_xdisplay(), root,
                  KeyPressMask |
                  PropertyChangeMask |
                  ColormapChangeMask |
@@ -191,8 +191,8 @@ Workspace::Workspace( bool restore )
     long data = 1;
 
     XChangeProperty(
-      qt_xdisplay(),
-      qt_xrootwin(),
+      tqt_xdisplay(),
+      tqt_xrootwin(),
       atoms->twin_running,
       atoms->twin_running,
       32,
@@ -286,13 +286,13 @@ void Workspace::init()
 //     maximizedWindowCounter = 0;
     
     supportWindow = new TQWidget;
-    XLowerWindow( qt_xdisplay(), supportWindow->winId()); // see usage in layers.cpp
+    XLowerWindow( tqt_xdisplay(), supportWindow->winId()); // see usage in layers.cpp
 
     XSetWindowAttributes attr;
     attr.override_redirect = 1;
-    null_focus_window = XCreateWindow( qt_xdisplay(), qt_xrootwin(), -1,-1, 1, 1, 0, CopyFromParent,
+    null_focus_window = XCreateWindow( tqt_xdisplay(), tqt_xrootwin(), -1,-1, 1, 1, 0, CopyFromParent,
         InputOnly, CopyFromParent, CWOverrideRedirect, &attr );
-    XMapWindow(qt_xdisplay(), null_focus_window);
+    XMapWindow(tqt_xdisplay(), null_focus_window);
 
     unsigned long protocols[ 5 ] =
         {
@@ -375,13 +375,13 @@ void Workspace::init()
         ,
         };
 
-    rootInfo = new RootInfo( this, qt_xdisplay(), supportWindow->winId(), "KWin",
-        protocols, 5, qt_xscreen() );
+    rootInfo = new RootInfo( this, tqt_xdisplay(), supportWindow->winId(), "KWin",
+        protocols, 5, tqt_xscreen() );
 
     loadDesktopSettings();
     updateDesktopLayout();
     // extra NETRootInfo instance in Client mode is needed to get the values of the properties
-    NETRootInfo client_info( qt_xdisplay(), NET::ActiveWindow | NET::CurrentDesktop );
+    NETRootInfo client_info( tqt_xdisplay(), NET::ActiveWindow | NET::CurrentDesktop );
     int initial_desktop;
     if( !kapp->isSessionRestored())
         initial_desktop = client_info.currentDesktop();
@@ -413,8 +413,8 @@ void Workspace::init()
         ++block_focus; // because it will be set below
 
     char nm[ 100 ];
-    sprintf( nm, "_KDE_TOPMENU_OWNER_S%d", DefaultScreen( qt_xdisplay()));
-    Atom topmenu_atom = XInternAtom( qt_xdisplay(), nm, False );
+    sprintf( nm, "_KDE_TOPMENU_OWNER_S%d", DefaultScreen( tqt_xdisplay()));
+    Atom topmenu_atom = XInternAtom( tqt_xdisplay(), nm, False );
     topmenu_selection = new KSelectionOwner( topmenu_atom );
     topmenu_watcher = new KSelectionWatcher( topmenu_atom );
 // TODO grabXServer(); - where exactly put this? topmenu selection claiming down belong must be before
@@ -429,11 +429,11 @@ void Workspace::init()
 
         unsigned int i, nwins;
         Window root_return, parent_return, *wins;
-        XQueryTree(qt_xdisplay(), root, &root_return, &parent_return, &wins, &nwins);
+        XQueryTree(tqt_xdisplay(), root, &root_return, &parent_return, &wins, &nwins);
         for (i = 0; i < nwins; i++) 
             {
             XWindowAttributes attr;
-            XGetWindowAttributes(qt_xdisplay(), wins[i], &attr);
+            XGetWindowAttributes(tqt_xdisplay(), wins[i], &attr);
             if (attr.override_redirect )
                 continue;
             if( topmenu_space && topmenu_space->winId() == wins[ i ] )
@@ -443,10 +443,10 @@ void Workspace::init()
                 if ( addSystemTrayWin( wins[i] ) )
                     continue;
                 Client* c = createClient( wins[i], true );
-                if ( c != NULL && root != qt_xrootwin() ) 
+                if ( c != NULL && root != tqt_xrootwin() ) 
                     { // TODO what is this?
                 // TODO may use TQWidget:.create
-                    XReparentWindow( qt_xdisplay(), c->frameId(), root, 0, 0 );
+                    XReparentWindow( tqt_xdisplay(), c->frameId(), root, 0, 0 );
                     c->move(0,0);
                     }
                 }
@@ -518,8 +518,8 @@ Workspace::~Workspace()
     delete tab_box;
     delete popupinfo;
     delete popup;
-    if ( root == qt_xrootwin() )
-        XDeleteProperty(qt_xdisplay(), qt_xrootwin(), atoms->twin_running);
+    if ( root == tqt_xrootwin() )
+        XDeleteProperty(tqt_xdisplay(), tqt_xrootwin(), atoms->twin_running);
 
     writeWindowRules();
     KGlobal::config()->sync();
@@ -540,7 +540,7 @@ Workspace::~Workspace()
         delete rules.front();
         rules.pop_front();
         }
-    XDestroyWindow( qt_xdisplay(), null_focus_window );
+    XDestroyWindow( tqt_xdisplay(), null_focus_window );
 // TODO    ungrabXServer();
     _self = 0;
     }
@@ -984,7 +984,7 @@ void Workspace::updateColormap()
         cmap = activeClient()->colormap();
     if ( cmap != installed_colormap ) 
         {
-        XInstallColormap(qt_xdisplay(), cmap );
+        XInstallColormap(tqt_xdisplay(), cmap );
         installed_colormap = cmap;
         }
     }
@@ -1301,14 +1301,14 @@ void ObscuringWindows::create( Client* c )
         XSetWindowAttributes a;
         a.background_pixmap = None;
         a.override_redirect = True;
-        obs_win = XCreateWindow( qt_xdisplay(), qt_xrootwin(), c->x(), c->y(),
+        obs_win = XCreateWindow( tqt_xdisplay(), tqt_xrootwin(), c->x(), c->y(),
             c->width(), c->height(), 0, CopyFromParent, InputOutput,
             CopyFromParent, CWBackPixmap | CWOverrideRedirect, &a );
         }
     chngs.sibling = c->frameId();
     chngs.stack_mode = Below;
-    XConfigureWindow( qt_xdisplay(), obs_win, mask, &chngs );
-    XMapWindow( qt_xdisplay(), obs_win );
+    XConfigureWindow( tqt_xdisplay(), obs_win, mask, &chngs );
+    XMapWindow( tqt_xdisplay(), obs_win );
     obscuring_windows.append( obs_win );
     }
 
@@ -1319,11 +1319,11 @@ ObscuringWindows::~ObscuringWindows()
          it != obscuring_windows.end();
          ++it ) 
         {
-        XUnmapWindow( qt_xdisplay(), *it );
+        XUnmapWindow( tqt_xdisplay(), *it );
         if( cached->count() < max_cache_size )
             cached->prepend( *it );
         else
-            XDestroyWindow( qt_xdisplay(), *it );
+            XDestroyWindow( tqt_xdisplay(), *it );
         }
     }
 
@@ -1386,7 +1386,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
         if (desktopHasCompositing) {
             // If composition is in use then we cannot hide the old windows before showing the new ones, 
             // unless you happen to like the "flicker annoyingly to desktop" effect... :-P
-            XSync( qt_xdisplay(), false);	// Make absolutely certain all new windows are shown before hiding the old ones
+            XSync( tqt_xdisplay(), false);	// Make absolutely certain all new windows are shown before hiding the old ones
             for ( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it) {
                 if ( !(*it)->isOnDesktop( new_desktop ) && (*it) != movingClient )
                 {
@@ -1812,15 +1812,15 @@ bool Workspace::addSystemTrayWin( WId w )
     if ( systemTrayWins.contains( w ) )
         return TRUE;
 
-    NETWinInfo ni( qt_xdisplay(), w, root, NET::WMKDESystemTrayWinFor );
+    NETWinInfo ni( tqt_xdisplay(), w, root, NET::WMKDESystemTrayWinFor );
     WId trayWinFor = ni.kdeSystemTrayWinFor();
     if ( !trayWinFor )
         return FALSE;
     systemTrayWins.append( SystemTrayWindow( w, trayWinFor ) );
-    XSelectInput( qt_xdisplay(), w,
+    XSelectInput( tqt_xdisplay(), w,
                   StructureNotifyMask
                   );
-    XAddToSaveSet( qt_xdisplay(), w );
+    XAddToSaveSet( tqt_xdisplay(), w );
     propagateSystemTrayWins();
     return TRUE;
     }
@@ -1843,7 +1843,7 @@ bool Workspace::removeSystemTrayWin( WId w, bool check )
     // embedding it, allowing KWin to figure out. Kicker just mustn't
     // crash before removing it again ... *shrug* .
         int num_props;
-        Atom* props = XListProperties( qt_xdisplay(), w, &num_props );
+        Atom* props = XListProperties( tqt_xdisplay(), w, &num_props );
         if( props != NULL )
             {
             for( int i = 0;
@@ -1858,7 +1858,7 @@ bool Workspace::removeSystemTrayWin( WId w, bool check )
             }
         }
     systemTrayWins.remove( w );
-    XRemoveFromSaveSet (qt_xdisplay (), w);
+    XRemoveFromSaveSet (tqt_xdisplay (), w);
     propagateSystemTrayWins();
     return TRUE;
     }
@@ -1896,7 +1896,7 @@ void Workspace::killWindowId( Window window_to_kill )
         Window parent, root;
         Window* children;
         unsigned int children_count;
-        XQueryTree( qt_xdisplay(), window, &root, &parent, &children, &children_count );
+        XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count );
         if( children != NULL )
             XFree( children );
         if( window == root ) // we didn't find the client, probably an override-redirect window
@@ -1906,7 +1906,7 @@ void Workspace::killWindowId( Window window_to_kill )
     if( client != NULL )
         client->killWindow();
     else
-        XKillClient( qt_xdisplay(), window_to_kill );
+        XKillClient( tqt_xdisplay(), window_to_kill );
     }
 
 void Workspace::suspendWindowId( Window window_to_suspend )
@@ -1923,7 +1923,7 @@ void Workspace::suspendWindowId( Window window_to_suspend )
         Window parent, root;
         Window* children;
         unsigned int children_count;
-        XQueryTree( qt_xdisplay(), window, &root, &parent, &children, &children_count );
+        XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count );
         if( children != NULL )
             XFree( children );
         if( window == root ) // we didn't find the client, probably an override-redirect window
@@ -1950,7 +1950,7 @@ void Workspace::resumeWindowId( Window window_to_resume )
         Window parent, root;
         Window* children;
         unsigned int children_count;
-        XQueryTree( qt_xdisplay(), window, &root, &parent, &children, &children_count );
+        XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count );
         if( children != NULL )
             XFree( children );
         if( window == root ) // we didn't find the client, probably an override-redirect window
@@ -1990,7 +1990,7 @@ void Workspace::slotGrabWindow()
             {
 	    //As the first step, get the mask from XShape.
             int count, order;
-            XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), active_client->frameId(),
+            XRectangle* rects = XShapeGetRectangles( tqt_xdisplay(), active_client->frameId(),
                                                      ShapeBounding, &count, &order);
 	    //The ShapeBounding region is the outermost shape of the window;
 	    //ShapeBounding - ShapeClipping is defined to be the border.
@@ -2035,7 +2035,7 @@ void Workspace::slotGrabWindow()
 */
 void Workspace::slotGrabDesktop()
     {
-    TQPixmap p = TQPixmap::grabWindow( qt_xrootwin() );
+    TQPixmap p = TQPixmap::grabWindow( tqt_xrootwin() );
     TQClipboard *cb = TQApplication::clipboard();
     cb->setPixmap( p );
     }
@@ -2049,12 +2049,12 @@ void Workspace::slotMouseEmulation()
 
     if ( mouse_emulation ) 
         {
-        XUngrabKeyboard(qt_xdisplay(), GET_QT_X_TIME());
+        XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME());
         mouse_emulation = FALSE;
         return;
         }
 
-    if ( XGrabKeyboard(qt_xdisplay(),
+    if ( XGrabKeyboard(tqt_xdisplay(),
                        root, FALSE,
                        GrabModeAsync, GrabModeAsync,
                        GET_QT_X_TIME()) == GrabSuccess ) 
@@ -2074,7 +2074,7 @@ void Workspace::slotMouseEmulation()
 WId Workspace::getMouseEmulationWindow()
     {
     Window root;
-    Window child = qt_xrootwin();
+    Window child = tqt_xrootwin();
     int root_x, root_y, lx, ly;
     uint state;
     Window w;
@@ -2084,7 +2084,7 @@ WId Workspace::getMouseEmulationWindow()
         w = child;
         if (!c)
             c = findClient( FrameIdMatchPredicate( w ));
-        XQueryPointer( qt_xdisplay(), w, &root, &child,
+        XQueryPointer( tqt_xdisplay(), w, &root, &child,
                        &root_x, &root_y, &lx, &ly, &state );
         } while  ( child != None && child != w );
 
@@ -2105,13 +2105,13 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
         {
         int x, y;
         Window xw;
-        XTranslateCoordinates( qt_xdisplay(), qt_xrootwin(), w, pos.x(), pos.y(), &x, &y, &xw );
+        XTranslateCoordinates( tqt_xdisplay(), tqt_xrootwin(), w, pos.x(), pos.y(), &x, &y, &xw );
         if ( type == EmuMove ) 
             { // motion notify events
             XEvent e;
             e.type = MotionNotify;
             e.xmotion.window = w;
-            e.xmotion.root = qt_xrootwin();
+            e.xmotion.root = tqt_xrootwin();
             e.xmotion.subwindow = w;
             e.xmotion.time = GET_QT_X_TIME();
             e.xmotion.x = x;
@@ -2120,14 +2120,14 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
             e.xmotion.y_root = pos.y();
             e.xmotion.state = state;
             e.xmotion.is_hint = NotifyNormal;
-            XSendEvent( qt_xdisplay(), w, TRUE, ButtonMotionMask, &e );
+            XSendEvent( tqt_xdisplay(), w, TRUE, ButtonMotionMask, &e );
             }
         else 
             {
             XEvent e;
             e.type = type == EmuRelease ? ButtonRelease : ButtonPress;
             e.xbutton.window = w;
-            e.xbutton.root = qt_xrootwin();
+            e.xbutton.root = tqt_xrootwin();
             e.xbutton.subwindow = w;
             e.xbutton.time = GET_QT_X_TIME();
             e.xbutton.x = x;
@@ -2136,7 +2136,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
             e.xbutton.y_root = pos.y();
             e.xbutton.state = state;
             e.xbutton.button = button;
-            XSendEvent( qt_xdisplay(), w, TRUE, ButtonPressMask, &e );
+            XSendEvent( tqt_xdisplay(), w, TRUE, ButtonPressMask, &e );
 
             if ( type == EmuPress ) 
                 {
@@ -2178,9 +2178,9 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
  */
 bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
     {
-    if ( root != qt_xrootwin() )
+    if ( root != tqt_xrootwin() )
         return FALSE;
-    int kc = XKeycodeToKeysym(qt_xdisplay(), ev.keycode, 0);
+    int kc = XKeycodeToKeysym(tqt_xdisplay(), ev.keycode, 0);
     int km = ev.state & (ControlMask | Mod1Mask | ShiftMask);
 
     bool is_control = km & ControlMask;
@@ -2255,7 +2255,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
             }
     // fall through
         case XK_Escape:
-            XUngrabKeyboard(qt_xdisplay(), GET_QT_X_TIME());
+            XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME());
             mouse_emulation = FALSE;
             return TRUE;
         default:
@@ -2340,58 +2340,58 @@ void Workspace::createBorderWindows()
     attributes.override_redirect = True;
     attributes.event_mask =  ( EnterWindowMask | LeaveWindowMask );
     valuemask=  (CWOverrideRedirect | CWEventMask | CWCursor );
-    attributes.cursor = XCreateFontCursor(qt_xdisplay(),
+    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
                                           XC_sb_up_arrow);
-    electric_top_border = XCreateWindow (qt_xdisplay(), qt_xrootwin(),
+    electric_top_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
                                 0,0,
                                 r.width(),1,
                                 0,
                                 CopyFromParent, InputOnly,
                                 CopyFromParent,
                                 valuemask, &attributes);
-    XMapWindow(qt_xdisplay(), electric_top_border);
+    XMapWindow(tqt_xdisplay(), electric_top_border);
 
-    attributes.cursor = XCreateFontCursor(qt_xdisplay(),
+    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
                                           XC_sb_down_arrow);
-    electric_bottom_border = XCreateWindow (qt_xdisplay(), qt_xrootwin(),
+    electric_bottom_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
                                    0,r.height()-1,
                                    r.width(),1,
                                    0,
                                    CopyFromParent, InputOnly,
                                    CopyFromParent,
                                    valuemask, &attributes);
-    XMapWindow(qt_xdisplay(), electric_bottom_border);
+    XMapWindow(tqt_xdisplay(), electric_bottom_border);
 
-    attributes.cursor = XCreateFontCursor(qt_xdisplay(),
+    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
                                           XC_sb_left_arrow);
-    electric_left_border = XCreateWindow (qt_xdisplay(), qt_xrootwin(),
+    electric_left_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
                                  0,0,
                                  1,r.height(),
                                  0,
                                  CopyFromParent, InputOnly,
                                  CopyFromParent,
                                  valuemask, &attributes);
-    XMapWindow(qt_xdisplay(), electric_left_border);
+    XMapWindow(tqt_xdisplay(), electric_left_border);
 
-    attributes.cursor = XCreateFontCursor(qt_xdisplay(),
+    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
                                           XC_sb_right_arrow);
-    electric_right_border = XCreateWindow (qt_xdisplay(), qt_xrootwin(),
+    electric_right_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
                                   r.width()-1,0,
                                   1,r.height(),
                                   0,
                                   CopyFromParent, InputOnly,
                                   CopyFromParent,
                                   valuemask, &attributes);
-    XMapWindow(qt_xdisplay(),  electric_right_border);
+    XMapWindow(tqt_xdisplay(),  electric_right_border);
     // Set XdndAware on the windows, so that DND enter events are received (#86998)
     Atom version = 4; // XDND version
-    XChangeProperty( qt_xdisplay(), electric_top_border, atoms->xdnd_aware, XA_ATOM,
+    XChangeProperty( tqt_xdisplay(), electric_top_border, atoms->xdnd_aware, XA_ATOM,
         32, PropModeReplace, ( unsigned char* )&version, 1 );
-    XChangeProperty( qt_xdisplay(), electric_bottom_border, atoms->xdnd_aware, XA_ATOM,
+    XChangeProperty( tqt_xdisplay(), electric_bottom_border, atoms->xdnd_aware, XA_ATOM,
         32, PropModeReplace, ( unsigned char* )&version, 1 );
-    XChangeProperty( qt_xdisplay(), electric_left_border, atoms->xdnd_aware, XA_ATOM,
+    XChangeProperty( tqt_xdisplay(), electric_left_border, atoms->xdnd_aware, XA_ATOM,
         32, PropModeReplace, ( unsigned char* )&version, 1 );
-    XChangeProperty( qt_xdisplay(), electric_right_border, atoms->xdnd_aware, XA_ATOM,
+    XChangeProperty( tqt_xdisplay(), electric_right_border, atoms->xdnd_aware, XA_ATOM,
         32, PropModeReplace, ( unsigned char* )&version, 1 );
     }
 
@@ -2409,13 +2409,13 @@ void Workspace::destroyBorderWindows()
     electric_have_borders = false;
 
     if(electric_top_border)
-      XDestroyWindow(qt_xdisplay(),electric_top_border);
+      XDestroyWindow(tqt_xdisplay(),electric_top_border);
     if(electric_bottom_border)
-      XDestroyWindow(qt_xdisplay(),electric_bottom_border);
+      XDestroyWindow(tqt_xdisplay(),electric_bottom_border);
     if(electric_left_border)
-      XDestroyWindow(qt_xdisplay(),electric_left_border);
+      XDestroyWindow(tqt_xdisplay(),electric_left_border);
     if(electric_right_border)
-      XDestroyWindow(qt_xdisplay(),electric_right_border);
+      XDestroyWindow(tqt_xdisplay(),electric_right_border);
 
     electric_top_border    = None;
     electric_bottom_border = None;
@@ -2565,10 +2565,10 @@ void Workspace::raiseElectricBorders()
 
     if(electric_have_borders)
         {
-        XRaiseWindow(qt_xdisplay(), electric_top_border);
-        XRaiseWindow(qt_xdisplay(), electric_left_border);
-        XRaiseWindow(qt_xdisplay(), electric_bottom_border);
-        XRaiseWindow(qt_xdisplay(), electric_right_border);
+        XRaiseWindow(tqt_xdisplay(), electric_top_border);
+        XRaiseWindow(tqt_xdisplay(), electric_left_border);
+        XRaiseWindow(tqt_xdisplay(), electric_bottom_border);
+        XRaiseWindow(tqt_xdisplay(), electric_right_border);
         }
     }
 
@@ -2647,7 +2647,7 @@ void Workspace::setupTopMenuHandling()
     Window stack[ 2 ];
     stack[ 0 ] = supportWindow->winId();
     stack[ 1 ] = topmenu_space->winId();
-    XRestackWindows(qt_xdisplay(), stack, 2);
+    XRestackWindows(tqt_xdisplay(), stack, 2);
     updateTopMenuGeometry();
     topmenu_space->show();
     updateClientArea();
@@ -2686,7 +2686,7 @@ bool Workspace::checkStartupNotification( Window w, KStartupInfoId& id, KStartup
  */
 void Workspace::focusToNull()
     {
-    XSetInputFocus(qt_xdisplay(), null_focus_window, RevertToPointerRoot, GET_QT_X_TIME() );
+    XSetInputFocus(tqt_xdisplay(), null_focus_window, RevertToPointerRoot, GET_QT_X_TIME() );
     }
 
 void Workspace::helperDialog( const TQString& message, const Client* c )
@@ -2746,8 +2746,8 @@ void Workspace::startKompmgr()
     unsigned long length, after;
     unsigned char* data_root;
     Atom prop_root;
-    prop_root = XInternAtom(qt_xdisplay(), "_XROOTPMAP_ID", False);
-    if( XGetWindowProperty( qt_xdisplay(), qt_xrootwin(), prop_root, 0L, 1L, False, AnyPropertyType, &type, &format, &length, &after, &data_root) == Success && data_root != NULL ) {
+    prop_root = XInternAtom(tqt_xdisplay(), "_XROOTPMAP_ID", False);
+    if( XGetWindowProperty( tqt_xdisplay(), tqt_xrootwin(), prop_root, 0L, 1L, False, AnyPropertyType, &type, &format, &length, &after, &data_root) == Success && data_root != NULL ) {
         // Root pixmap is available; OK to load...
     }
     else {
@@ -2770,7 +2770,7 @@ void Workspace::startKompmgr()
     {
         delete kompmgr_selection;
         char selection_name[ 100 ];
-        sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( qt_xdisplay()));
+        sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( tqt_xdisplay()));
         kompmgr_selection = new KSelectionOwner( selection_name );
         connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr()));
         kompmgr_selection->claim( true );