Rename additional global functions and variables for tqt3

16 files changed, 79 insertions, 79 deletions

diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 82aa51c87..daec7a98f 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -143,7 +143,7 @@ int Lockout::heightForWidth( int width ) const
 void Lockout::lock()
 {
     TQCString appname( "kdesktop" );
-    int kicker_screen_number = qt_xscreen();
+    int kicker_screen_number = tqt_xscreen();
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
     kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 0798c84b3..2b864e33a 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -107,7 +107,7 @@ Applet::~Applet()
 
 void Applet::windowAdded( WId w_P )
     {
-    NETWinInfo info( qt_xdisplay(), w_P, qt_xrootwin(), NET::WMWindowType );
+    NETWinInfo info( tqt_xdisplay(), w_P, tqt_xrootwin(), NET::WMWindowType );
     if( info.windowType( SUPPORTED_WINDOW_TYPES ) != NET::TopMenu )
 	return;
 //    kdDebug() << "embedding:" << w_P << endl;
@@ -115,7 +115,7 @@ void Applet::windowAdded( WId w_P )
     if( transient_for == None )
 	return;
     MenuEmbed* embed;
-    if( transient_for == qt_xrootwin())
+    if( transient_for == tqt_xrootwin())
     {
         embed = new MenuEmbed( transient_for, true, this );
     }
@@ -224,7 +224,7 @@ WId Applet::tryTransientFor( WId w_P )
     if( info.state() & NET::Modal )
 	return None;
     WId ret = KWin::transientFor( w_P );
-    if( ret == qt_xrootwin())
+    if( ret == tqt_xrootwin())
         ret = None;
     return ret;
     }
@@ -292,7 +292,7 @@ void Applet::setBackground()
 void Applet::claimSelection()
     {
     assert( selection == NULL );
-    selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( qt_xdisplay()));
+    selection = new KSelectionOwner( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
 // force taking the selection, but don't kill previous owner
     if( selection->claim( true, false ))
 	{
@@ -327,7 +327,7 @@ void Applet::lostSelection()
     active_menu = NULL;
     if( selection_watcher == NULL )
         {
-        selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( qt_xdisplay()));
+        selection_watcher = new KSelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay()));
         connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection()));
         }
     delete module;
@@ -378,11 +378,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 ];
     }
@@ -432,7 +432,7 @@ bool MenuEmbed::x11Event( XEvent* ev_P )
 //        int x, y;
 //        unsigned int w, h, d, b;
 //        Window root;
-//        XGetGeometry( qt_xdisplay(), embeddedWinId(), &root, &x, &y, &w, &h, &b, &d );
+//        XGetGeometry( tqt_xdisplay(), embeddedWinId(), &root, &x, &y, &w, &h, &b, &d );
 //        kdDebug() << "RES3:" << width() << ":" << height() << ":" << w << ":" << h << endl;
 	return true;
 	}
@@ -446,7 +446,7 @@ void MenuEmbed::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 = embeddedWinId();
         c.window = winId();
@@ -457,7 +457,7 @@ void MenuEmbed::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);
     }
 }
 
@@ -470,7 +470,7 @@ void MenuEmbed::setMinimumSize( int w, int h )
         {
 //        kdDebug() << "RES2:" << width() << ":" << height() << ":" << minimumWidth() << ":" << minimumHeight() << endl;
         XEvent ev;
-        ev.xclient.display = qt_xdisplay();
+        ev.xclient.display = tqt_xdisplay();
         ev.xclient.type = ClientMessage;
         ev.xclient.window = embeddedWinId();
         assert( msg_type_atom != None );
@@ -481,7 +481,7 @@ void MenuEmbed::setMinimumSize( int w, int h )
         ev.xclient.data.l[2] = minimumHeight();
         ev.xclient.data.l[3] = 0;
         ev.xclient.data.l[4] = 0;
-        XSendEvent( qt_xdisplay(), embeddedWinId(), False, NoEventMask, &ev );
+        XSendEvent( tqt_xdisplay(), embeddedWinId(), False, NoEventMask, &ev );
         }
 }
 
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index f60f87f64..4379da6c0 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -364,7 +364,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
         y = 0;
     if( m_desktopLayoutOwner == NULL )
     { // must own manager selection before setting global desktop layout
-        int screen = DefaultScreen( qt_xdisplay());
+        int screen = DefaultScreen( tqt_xdisplay());
         m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
             screen, TQT_TQOBJECT(this) );
         if( !m_desktopLayoutOwner->claim( false ))
@@ -375,7 +375,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
         }
     }
     NET::Orientation orient = o == Qt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
-    NETRootInfo i( qt_xdisplay(), 0 );
+    NETRootInfo i( tqt_xdisplay(), 0 );
     i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft );
 }
 
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 1c1663366..b7a1590c5 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -220,7 +220,7 @@ void KMiniPagerButton::loadBgPixmap()
     }
 
     TQCString kdesktop_name;
-    int screen_number = DefaultScreen(qt_xdisplay());
+    int screen_number = DefaultScreen(tqt_xdisplay());
     if (screen_number == 0)
         kdesktop_name = "kdesktop";
     else
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 03be831e3..21a36f35b 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -307,7 +307,7 @@ void SwallowApp::windowAdded(WId win)
 {
     // determine title of newly mapped window
     XTextProperty nameProp;
-    XGetWMName(qt_xdisplay(), win, &nameProp);
+    XGetWMName(tqt_xdisplay(), win, &nameProp);
     char **names;
     int count;
     XTextPropertyToStringList(&nameProp, &names, &count);
@@ -328,7 +328,7 @@ void SwallowApp::windowAdded(WId win)
 	resize( r.width(), r.height() );
 
 	embed(win);
-	XReparentWindow(qt_xdisplay(), win, winId(), 0, 0);
+	XReparentWindow(tqt_xdisplay(), win, winId(), 0, 0);
 
 	disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)),
 		   this, TQT_SLOT(windowAdded(WId)));
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 3303135b3..0079ee9f4 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -145,10 +145,10 @@ void SystemTrayApplet::initialize()
              this, TQT_SLOT( updateTrayWindows() ) );
 
     TQCString screenstr;
-    screenstr.setNum(qt_xscreen());
+    screenstr.setNum(tqt_xscreen());
     TQCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr;
 
-    Display *display = qt_xdisplay();
+    Display *display = tqt_xdisplay();
 
     net_system_tray_selection = XInternAtom(display, trayatom, false);
     net_system_tray_opcode = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", false);
@@ -159,7 +159,7 @@ void SystemTrayApplet::initialize()
                        winId(),
                        CurrentTime);
 
-    WId root = qt_xrootwin();
+    WId root = tqt_xrootwin();
 
     if (XGetSelectionOwner (display, net_system_tray_selection) == winId())
     {
@@ -531,10 +531,10 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray )
 
     if (kde_tray)
     {
-        static Atom hack_atom = XInternAtom( qt_xdisplay(), "_KDE_SYSTEM_TRAY_EMBEDDING", False );
-        XChangeProperty( qt_xdisplay(), w, hack_atom, hack_atom, 32, PropModeReplace, NULL, 0 );
+        static Atom hack_atom = XInternAtom( tqt_xdisplay(), "_KDE_SYSTEM_TRAY_EMBEDDING", False );
+        XChangeProperty( tqt_xdisplay(), w, hack_atom, hack_atom, 32, PropModeReplace, NULL, 0 );
         emb->embed(w);
-        XDeleteProperty( qt_xdisplay(), w, hack_atom );
+        XDeleteProperty( tqt_xdisplay(), w, hack_atom );
     }
     else
     {
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.. */
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 4679d9d31..87ed34267 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -292,7 +292,7 @@ TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &m
 
 static bool isnetwm12_below()
 {
-  NETRootInfo info( qt_xdisplay(), NET::Supported );
+  NETRootInfo info( tqt_xdisplay(), NET::Supported );
   return info.supportedProperties()[ NETRootInfo::STATES ] & NET::KeepBelow;
 }
 
diff --git a/kicker/kicker/core/kmenubase.ui.h b/kicker/kicker/core/kmenubase.ui.h
index 492ae4aab..5d8f7f9c6 100644
--- a/kicker/kicker/core/kmenubase.ui.h
+++ b/kicker/kicker/core/kmenubase.ui.h
@@ -4,6 +4,6 @@ void KMenuBase::init()
 {
     XSetWindowAttributes attrs;
     attrs.override_redirect = True;
-    XChangeWindowAttributes( qt_xdisplay(), winId(), CWOverrideRedirect, &attrs );
+    XChangeWindowAttributes( tqt_xdisplay(), winId(), CWOverrideRedirect, &attrs );
     setWFlags( (WFlags)TQt::WType_Popup );
 }
diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp
index e41ddb549..748850eee 100644
--- a/kicker/kicker/core/showdesktop.cpp
+++ b/kicker/kicker/core/showdesktop.cpp
@@ -45,7 +45,7 @@ ShowDesktop::ShowDesktop()
 {
     // This feature is implemented in KWin. Keep old code in Kicker for the case
     // KDE is running with another WM without the feature.
-    NETRootInfo i( qt_xdisplay(), NET::Supported );
+    NETRootInfo i( tqt_xdisplay(), NET::Supported );
     m_wmSupport = i.isSupported( NET::WM2ShowingDesktop );
     if( m_wmSupport )
     {
@@ -67,7 +67,7 @@ void ShowDesktop::slotWindowAdded(WId w)
         return;
     }
 
-    NETWinInfo inf(qt_xdisplay(), w, qt_xrootwin(),
+    NETWinInfo inf(tqt_xdisplay(), w, tqt_xrootwin(),
                    NET::XAWMState | NET::WMWindowType);
     NET::WindowType windowType = inf.windowType(NET::AllTypesMask);
 
@@ -99,7 +99,7 @@ void ShowDesktop::slotWindowChanged(WId w, unsigned int dirty)
 
     if (dirty & NET::XAWMState)
     {
-        NETWinInfo inf(qt_xdisplay(), w, qt_xrootwin(),
+        NETWinInfo inf(tqt_xdisplay(), w, tqt_xrootwin(),
                        NET::XAWMState | NET::WMWindowType);
         NET::WindowType windowType = inf.windowType(NET::AllTypesMask);
 
@@ -123,7 +123,7 @@ void ShowDesktop::showDesktop( bool b )
     
     if( m_wmSupport )
     {
-        NETRootInfo i( qt_xdisplay(), 0 );
+        NETRootInfo i( tqt_xdisplay(), 0 );
         i.setShowingDesktop( b );
         return;
     }
@@ -140,7 +140,7 @@ void ShowDesktop::showDesktop( bool b )
         {
             WId w = *it;
 
-            NETWinInfo info( qt_xdisplay(), w, qt_xrootwin(),
+            NETWinInfo info( tqt_xdisplay(), w, tqt_xrootwin(),
                              NET::XAWMState | NET::WMDesktop );
 
             if (info.mappingState() == NET::Visible &&
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 3d78f18ec..0ed6d03f7 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -1509,7 +1509,7 @@ void KMenu::searchAccept()
     if ( lock )
     {
         TQCString appname( "kdesktop" );
-        int kicker_screen_number = qt_xscreen();
+        int kicker_screen_number = tqt_xscreen();
         if ( kicker_screen_number )
             appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
         kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 490f5bbfe..351b59084 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -105,8 +105,8 @@ void KickerTip::display()
 
     {
         // prevent tips from showing when the active window is fullscreened
-        NETRootInfo ri(qt_xdisplay(), NET::ActiveWindow);
-        NETWinInfo wi(qt_xdisplay(), ri.activeWindow(), ri.rootWindow(), NET::WMState);
+        NETRootInfo ri(tqt_xdisplay(), NET::ActiveWindow);
+        NETWinInfo wi(tqt_xdisplay(), ri.activeWindow(), ri.rootWindow(), NET::WMState);
         if (wi.state() & NET::FullScreen)
         {
             return;
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index b472356e1..e427cbe74 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -280,8 +280,8 @@ void AppletProxy::dock(const TQCString& callbackID)
 	// we use "call" to know whether it was sucessful
 
 	int screen_number = 0;
-	if (qt_xdisplay())
-	    screen_number = DefaultScreen(qt_xdisplay());
+	if (tqt_xdisplay())
+	    screen_number = DefaultScreen(tqt_xdisplay());
 	TQCString appname;
 	if (screen_number == 0)
 	    appname = "kicker";
@@ -455,8 +455,8 @@ void AppletProxy::slotUpdateLayout()
 
     TQByteArray data;
     int screen_number = 0;
-    if (qt_xdisplay())
-	screen_number = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+	screen_number = DefaultScreen(tqt_xdisplay());
     TQCString appname;
     if (screen_number == 0)
 	appname = "kicker";
@@ -472,8 +472,8 @@ void AppletProxy::slotRequestFocus()
 
     TQByteArray data;
     int screen_number = 0;
-    if (qt_xdisplay())
-	screen_number = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+	screen_number = DefaultScreen(tqt_xdisplay());
     TQCString appname;
     if (screen_number == 0)
 	appname = "kicker";
@@ -486,8 +486,8 @@ void AppletProxy::slotRequestFocus()
 void AppletProxy::slotApplicationRemoved(const TQCString& appId)
 {
     int screen_number = 0;
-    if (qt_xdisplay())
-	screen_number = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+	screen_number = DefaultScreen(tqt_xdisplay());
     TQCString appname;
     if (screen_number == 0)
 	appname = "kicker";
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 48a64c612..0bce08e91 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -220,8 +220,8 @@ void ExtensionProxy::dock(const TQCString& callbackID)
 	// we use "call" to know whether it was sucessful
 
 	int screen_number = 0;
-	if (qt_xdisplay())
-	    screen_number = DefaultScreen(qt_xdisplay());
+	if (tqt_xdisplay())
+	    screen_number = DefaultScreen(tqt_xdisplay());
 	TQCString appname;
 	if (screen_number == 0)
 	    appname = "kicker";
@@ -372,8 +372,8 @@ void ExtensionProxy::slotUpdateLayout()
 
     TQByteArray data;
     int screen_number = 0;
-    if (qt_xdisplay())
-	screen_number = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+	screen_number = DefaultScreen(tqt_xdisplay());
     TQCString appname;
     if (screen_number == 0)
 	appname = "kicker";
@@ -386,8 +386,8 @@ void ExtensionProxy::slotUpdateLayout()
 void ExtensionProxy::slotApplicationRemoved(const TQCString& appId)
 {
     int screen_number = 0;
-    if (qt_xdisplay())
-	screen_number = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+	screen_number = DefaultScreen(tqt_xdisplay());
     TQCString appname;
     if (screen_number == 0)
 	appname = "kicker";
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 6f84efae4..2ae85819c 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -263,7 +263,7 @@ Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p)
 
 void TaskManager::windowAdded(WId w )
 {
-    NETWinInfo info(qt_xdisplay(),  w, qt_xrootwin(),
+    NETWinInfo info(tqt_xdisplay(),  w, tqt_xrootwin(),
                     NET::WMWindowType | NET::WMPid | NET::WMState);
 
     // ignore NET::Tool and other special window types
@@ -290,7 +290,7 @@ void TaskManager::windowAdded(WId w )
     }
 
     Window transient_for_tmp;
-    if (XGetTransientForHint( qt_xdisplay(), (Window) w, &transient_for_tmp ))
+    if (XGetTransientForHint( tqt_xdisplay(), (Window) w, &transient_for_tmp ))
     {
         WId transient_for = (WId) transient_for_tmp;
 
@@ -299,7 +299,7 @@ void TaskManager::windowAdded(WId w )
             return;
 
         // lets see if this is a transient for an existing task
-        if( transient_for != qt_xrootwin()
+        if( transient_for != tqt_xrootwin()
             && transient_for != 0
             && wType != NET::Utility )
         {
@@ -358,7 +358,7 @@ void TaskManager::windowChanged(WId w, unsigned int dirty)
 {
     if (dirty & NET::WMState)
     {
-        NETWinInfo info (qt_xdisplay(),  w, qt_xrootwin(),
+        NETWinInfo info (tqt_xdisplay(),  w, tqt_xrootwin(),
                          NET::WMState | NET::XAWMState);
         if (info.state() & NET::SkipTaskbar)
         {
@@ -828,7 +828,7 @@ void Task::updateDemandsAttentionState( WId w )
     if (window() != w)
     {
         // 'w' is a transient for this task
-        NETWinInfo i( qt_xdisplay(), w, qt_xrootwin(), NET::WMState );
+        NETWinInfo i( tqt_xdisplay(), w, tqt_xrootwin(), NET::WMState );
         if(i.state() & NET::DemandsAttention)
         {
             if (!_transients_demanding_attention.contains(w))
@@ -862,7 +862,7 @@ void Task::removeTransient(WId w)
 TQString Task::className()
 {
     XClassHint hint;
-    if(XGetClassHint(qt_xdisplay(), _win, &hint)) {
+    if(XGetClassHint(tqt_xdisplay(), _win, &hint)) {
         TQString nh( hint.res_name );
         XFree( hint.res_name );
         XFree( hint.res_class );
@@ -874,7 +874,7 @@ TQString Task::className()
 TQString Task::classClass()
 {
     XClassHint hint;
-    if(XGetClassHint(qt_xdisplay(), _win, &hint)) {
+    if(XGetClassHint(tqt_xdisplay(), _win, &hint)) {
         TQString ch( hint.res_class );
         XFree( hint.res_name );
         XFree( hint.res_class );
@@ -1012,7 +1012,7 @@ void Task::move()
     TQRect geom = _info.geometry();
     TQCursor::setPos(geom.center());
 
-    NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize);
+    NETRootInfo ri(tqt_xdisplay(), NET::WMMoveResize);
     ri.moveResizeRequest(_win, geom.center().x(),
                          geom.center().y(), NET::Move);
 }
@@ -1035,7 +1035,7 @@ void Task::resize()
     TQRect geom = _info.geometry();
     TQCursor::setPos(geom.bottomRight());
 
-    NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize);
+    NETRootInfo ri(tqt_xdisplay(), NET::WMMoveResize);
     ri.moveResizeRequest(_win, geom.bottomRight().x(),
                          geom.bottomRight().y(), NET::BottomRight);
 }
@@ -1055,7 +1055,7 @@ void Task::setMaximized(bool maximize)
         KWin::deIconifyWindow(_win);
     }
 
-    NETWinInfo ni(qt_xdisplay(), _win, qt_xrootwin(), NET::WMState);
+    NETWinInfo ni(tqt_xdisplay(), _win, tqt_xrootwin(), NET::WMState);
 
     if (maximize)
     {
@@ -1092,7 +1092,7 @@ void Task::restore()
         KWin::deIconifyWindow(_win);
     }
 
-    NETWinInfo ni(qt_xdisplay(), _win, qt_xrootwin(), NET::WMState);
+    NETWinInfo ni(tqt_xdisplay(), _win, tqt_xrootwin(), NET::WMState);
     ni.setState(0, NET::Max);
 
     if (!on_current)
@@ -1133,7 +1133,7 @@ void Task::toggleIconified()
 
 void Task::close()
 {
-    NETRootInfo ri( qt_xdisplay(),  NET::CloseWindow );
+    NETRootInfo ri( tqt_xdisplay(),  NET::CloseWindow );
     ri.closeWindowRequest( _win );
 }
 
@@ -1178,7 +1178,7 @@ void Task::activateRaiseOrIconify()
 
 void Task::toDesktop(int desk)
 {
-    NETWinInfo ni(qt_xdisplay(), _win, qt_xrootwin(), NET::WMDesktop);
+    NETWinInfo ni(tqt_xdisplay(), _win, tqt_xrootwin(), NET::WMDesktop);
     if (desk == 0)
     {
         if (_info.valid() && _info.onAllDesktops())
@@ -1205,7 +1205,7 @@ void Task::toCurrentDesktop()
 
 void Task::setAlwaysOnTop(bool stay)
 {
-    NETWinInfo ni( qt_xdisplay(),  _win, qt_xrootwin(), NET::WMState);
+    NETWinInfo ni( tqt_xdisplay(),  _win, tqt_xrootwin(), NET::WMState);
     if(stay)
         ni.setState( NET::StaysOnTop, NET::StaysOnTop );
     else
@@ -1219,7 +1219,7 @@ void Task::toggleAlwaysOnTop()
 
 void Task::setKeptBelowOthers(bool below)
 {
-    NETWinInfo ni(qt_xdisplay(), _win, qt_xrootwin(), NET::WMState);
+    NETWinInfo ni(tqt_xdisplay(), _win, tqt_xrootwin(), NET::WMState);
 
     if (below)
     {
@@ -1238,7 +1238,7 @@ void Task::toggleKeptBelowOthers()
 
 void Task::setFullScreen(bool fullscreen)
 {
-    NETWinInfo ni(qt_xdisplay(), _win, qt_xrootwin(), NET::WMState);
+    NETWinInfo ni(tqt_xdisplay(), _win, tqt_xrootwin(), NET::WMState);
 
     if (fullscreen)
     {
@@ -1257,7 +1257,7 @@ void Task::toggleFullScreen()
 
 void Task::setShaded(bool shade)
 {
-    NETWinInfo ni( qt_xdisplay(),  _win, qt_xrootwin(), NET::WMState);
+    NETWinInfo ni( tqt_xdisplay(),  _win, tqt_xrootwin(), NET::WMState);
     if(shade)
         ni.setState( NET::Shaded, NET::Shaded );
     else
@@ -1277,7 +1277,7 @@ void Task::publishIconGeometry(TQRect rect)
     }
 
     m_iconGeometry = rect;
-    NETWinInfo ni(qt_xdisplay(), _win, qt_xrootwin(), 0);
+    NETWinInfo ni(tqt_xdisplay(), _win, tqt_xrootwin(), 0);
     NETRect r;
 
     if (rect.isValid())