Rename additional global functions and variables for tqt3

2 files changed, 13 insertions, 13 deletions

diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 2a4944c20..63944e710 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -97,14 +97,14 @@ void DockBarExtension::windowAdded(WId win)
     int argc;
     char **argv;
     TQString command;
-    if (XGetCommand(qt_xdisplay(), win, &argv, &argc)) {
+    if (XGetCommand(tqt_xdisplay(), win, &argv, &argc)) {
 	command = KShell::joinArgs(argv, argc);
 	XFreeStringList(argv);
     }
 
     // try to read wm hints
     WId resIconwin = 0;
-    XWMHints *wmhints = XGetWMHints(qt_xdisplay(), win);
+    XWMHints *wmhints = XGetWMHints(tqt_xdisplay(), win);
     if (0 != wmhints) { // we managed to read wm hints
 	// read IconWindowHint
         bool is_valid = false;
@@ -146,7 +146,7 @@ void DockBarExtension::windowAdded(WId win)
     // try to read class hint
     XClassHint hint;
     TQString resClass, resName;
-    if (XGetClassHint(qt_xdisplay(), win, &hint)) {
+    if (XGetClassHint(tqt_xdisplay(), win, &hint)) {
         resName =  hint.res_name;
         resClass = hint.res_class;
     }
@@ -158,7 +158,7 @@ void DockBarExtension::windowAdded(WId win)
        which causes the double-launch bug (one instance from the twin 
        session, and one from the dockbar) bug when kde is restarted */
     if (resIconwin != win) {
-        XWithdrawWindow( qt_xdisplay(), win, qt_xscreen() );
+        XWithdrawWindow( tqt_xdisplay(), win, tqt_xscreen() );
         while( KWin::windowInfo(win, NET::XAWMState).mappingState() != NET::Withdrawn );
     }
 
diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp
index f6ac6bd33..181884276 100644
--- a/kicker/extensions/dockbar/dockcontainer.cpp
+++ b/kicker/extensions/dockbar/dockcontainer.cpp
@@ -49,7 +49,7 @@ DockContainer::DockContainer( TQString command, TQWidget *parent,
       _resName(resname),
       _resClass(resclass)
 {
-    XSelectInput( qt_xdisplay(), winId(),
+    XSelectInput( tqt_xdisplay(), winId(),
 		  KeyPressMask | KeyReleaseMask |
 		  ButtonPressMask | ButtonReleaseMask |
 		  KeymapStateMask |
@@ -79,21 +79,21 @@ void DockContainer::embed( WId id )
     TQRect geom = KWin::windowInfo(id,NET::WMKDEFrameStrut).frameGeometry();
 
     // does the same as KWM::prepareForSwallowing()
-    XWithdrawWindow( qt_xdisplay(), id, qt_xscreen() );
+    XWithdrawWindow( tqt_xdisplay(), id, tqt_xscreen() );
     while( KWin::windowInfo(id, NET::XAWMState).mappingState() != NET::Withdrawn );
 
-    XReparentWindow( qt_xdisplay(), id, winId(), 0, 0 );
+    XReparentWindow( tqt_xdisplay(), id, winId(), 0, 0 );
 
     // resize if window is bigger than frame
     if( (geom.width() > width()) ||
         (geom.height() > height()) )
-        XResizeWindow( qt_xdisplay(), id, width(), height() );
+        XResizeWindow( tqt_xdisplay(), id, width(), height() );
     else
-        XMoveWindow(qt_xdisplay(), id,
+        XMoveWindow(tqt_xdisplay(), id,
                     (sz() -  geom.width())/2 - border(),
                     (sz() - geom.height())/2 - border());
-    XMapWindow( qt_xdisplay(), id );
-    XUngrabButton( qt_xdisplay(), AnyButton, AnyModifier, winId() );
+    XMapWindow( tqt_xdisplay(), id );
+    XUngrabButton( tqt_xdisplay(), AnyButton, AnyModifier, winId() );
 
     _embeddedWinId = id;
 }
@@ -101,13 +101,13 @@ void DockContainer::embed( WId id )
 void DockContainer::unembed()
 {
     if( _embeddedWinId )
-        XReparentWindow( qt_xdisplay(), _embeddedWinId, qt_xrootwin(), 0, 0 );
+        XReparentWindow( tqt_xdisplay(), _embeddedWinId, tqt_xrootwin(), 0, 0 );
 }
 
 void DockContainer::kill()
 {
     if ( _embeddedWinId ) {
-        XKillClient( qt_xdisplay(), _embeddedWinId );
+        XKillClient( tqt_xdisplay(), _embeddedWinId );
         _embeddedWinId = 0; // in case the window does not exist anymore..
     }
     else emit embeddedWindowDestroyed(this); /* enable killing of empty windows.. */