Rename additional global functions and variables for tqt3

23 files changed, 85 insertions, 85 deletions

diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index be6b11204..188353d5c 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -107,7 +107,7 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)
 
   initMasks();
   XkbStateRec state_return;
-  XkbGetState (qt_xdisplay(), XkbUseCoreKbd, &state_return);
+  XkbGetState (tqt_xdisplay(), XkbUseCoreKbd, &state_return);
   unsigned char latched = XkbStateMods (&state_return);
   unsigned char locked  = XkbModLocks  (&state_return);
   state = ((int)locked)<<8 | latched;
@@ -138,23 +138,23 @@ void KAccessApp::readSettings()
 
   // select bell events if we need them
   int state = (_artsBell || _visibleBell) ? XkbBellNotifyMask : 0;
-  XkbSelectEvents(qt_xdisplay(), XkbUseCoreKbd, XkbBellNotifyMask, state);
+  XkbSelectEvents(tqt_xdisplay(), XkbUseCoreKbd, XkbBellNotifyMask, state);
 
   // deactivate system bell if not needed
   if (!_systemBell)
-    XkbChangeEnabledControls(qt_xdisplay(), XkbUseCoreKbd, XkbAudibleBellMask, 0);
+    XkbChangeEnabledControls(tqt_xdisplay(), XkbUseCoreKbd, XkbAudibleBellMask, 0);
   else
-    XkbChangeEnabledControls(qt_xdisplay(), XkbUseCoreKbd, XkbAudibleBellMask, XkbAudibleBellMask);
+    XkbChangeEnabledControls(tqt_xdisplay(), XkbUseCoreKbd, XkbAudibleBellMask, XkbAudibleBellMask);
 
   // keyboard -------------------------------------------------------------
 
   config->setGroup("Keyboard");
 
   // get keyboard state
-  XkbDescPtr xkb = XkbGetMap(qt_xdisplay(), 0, XkbUseCoreKbd);
+  XkbDescPtr xkb = XkbGetMap(tqt_xdisplay(), 0, XkbUseCoreKbd);
   if (!xkb)
     return;
-  if (XkbGetControls(qt_xdisplay(), XkbAllControlsMask, xkb) != Success)
+  if (XkbGetControls(tqt_xdisplay(), XkbAllControlsMask, xkb) != Success)
     return;
 
   // sticky keys
@@ -279,10 +279,10 @@ void KAccessApp::readSettings()
    if (dialog == 0)
       requestedFeatures = features;
   // set state
-  XkbSetControls(qt_xdisplay(), XkbControlsEnabledMask | XkbMouseKeysAccelMask | XkbStickyKeysMask | XkbSlowKeysMask | XkbBounceKeysMask | XkbAccessXKeysMask | XkbAccessXTimeoutMask, xkb);
+  XkbSetControls(tqt_xdisplay(), XkbControlsEnabledMask | XkbMouseKeysAccelMask | XkbStickyKeysMask | XkbSlowKeysMask | XkbBounceKeysMask | XkbAccessXKeysMask | XkbAccessXTimeoutMask, xkb);
 
   // select AccessX events
-  XkbSelectEvents(qt_xdisplay(), XkbUseCoreKbd, XkbAllEventsMask, XkbAllEventsMask);
+  XkbSelectEvents(tqt_xdisplay(), XkbUseCoreKbd, XkbAllEventsMask, XkbAllEventsMask);
 
   if (!_artsBell && !_visibleBell && !_gestureConfirmation
       && !_kNotifyModifiers && !_kNotifyAccessX) {
@@ -290,13 +290,13 @@ void KAccessApp::readSettings()
      // We will exit, but the features need to stay configured
      uint ctrls = XkbStickyKeysMask | XkbSlowKeysMask | XkbBounceKeysMask | XkbMouseKeysMask | XkbAudibleBellMask | XkbControlsNotifyMask;
      uint values = xkb->ctrls->enabled_ctrls & ctrls;
-     XkbSetAutoResetControls(qt_xdisplay(), ctrls, &ctrls, &values);
+     XkbSetAutoResetControls(tqt_xdisplay(), ctrls, &ctrls, &values);
      exit(0);
   } else {
      // reset them after program exit
      uint ctrls = XkbStickyKeysMask | XkbSlowKeysMask | XkbBounceKeysMask | XkbMouseKeysMask | XkbAudibleBellMask | XkbControlsNotifyMask;
      uint values = XkbAudibleBellMask;
-     XkbSetAutoResetControls(qt_xdisplay(), ctrls, &ctrls, &values);
+     XkbSetAutoResetControls(tqt_xdisplay(), ctrls, &ctrls, &values);
   }
 
   delete overlay;
@@ -319,14 +319,14 @@ void KAccessApp::initMasks() {
       int mask = modifierKeys[i].mask;
       if (mask == 0)
          if (modifierKeys[i].keysym != 0)
-            mask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
+            mask = XkbKeysymToModifiers (tqt_xdisplay(), modifierKeys[i].keysym);
          else if (!strcmp(modifierKeys[i].name, "Win"))
             mask = KKeyNative::modX(KKey::WIN);
          else
-            mask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
-                 | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Shift)
-                 | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Latch)
-                 | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Lock);
+            mask = XkbKeysymToModifiers (tqt_xdisplay(), XK_Mode_switch)
+                 | XkbKeysymToModifiers (tqt_xdisplay(), XK_ISO_Level3_Shift)
+                 | XkbKeysymToModifiers (tqt_xdisplay(), XK_ISO_Level3_Latch)
+                 | XkbKeysymToModifiers (tqt_xdisplay(), XK_ISO_Level3_Lock);
 
       int bit = maskToBit (mask);
       if (bit != -1 && keys[bit] == -1)
@@ -376,7 +376,7 @@ void KAccessApp::activeWindowChanged(WId wid)
 
 void KAccessApp::xkbStateNotify () {
    XkbStateRec state_return;
-   XkbGetState (qt_xdisplay(), XkbUseCoreKbd, &state_return);
+   XkbGetState (tqt_xdisplay(), XkbUseCoreKbd, &state_return);
    unsigned char latched = XkbStateMods (&state_return);
    unsigned char locked  = XkbModLocks  (&state_return);
    int mods = ((int)locked)<<8 | latched;
@@ -430,7 +430,7 @@ void KAccessApp::xkbBellNotify(XkbBellNotifyEvent *event)
       WId id = _activeWindow;
 
       NETRect frame, window;
-      NETWinInfo net(qt_xdisplay(), id, desktop()->winId(), 0);
+      NETWinInfo net(tqt_xdisplay(), id, desktop()->winId(), 0);
 
       net.kdeGeometry(frame, window);
 
@@ -733,7 +733,7 @@ void KAccessApp::xkbControlsNotify(XkbControlsNotifyEvent *event)
               else if ((enabled | disabled) == XkbStickyKeysMask)
                  explanation = i18n("You pressed the Shift key 5 consecutive times or an application has requested to change this setting.");
               else if ((enabled | disabled) == XkbMouseKeysMask) {
-                 TQString shortcut = mouseKeysShortcut(qt_xdisplay());
+                 TQString shortcut = mouseKeysShortcut(tqt_xdisplay());
                  if (!shortcut.isEmpty() && !shortcut.isNull())
                     explanation = i18n("You pressed %1 or an application has requested to change this setting.").arg(shortcut);
               }
diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp
index a2dd0d5c7..48c9e8423 100644
--- a/kcontrol/access/main.cpp
+++ b/kcontrol/access/main.cpp
@@ -27,7 +27,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
     }
   kdDebug() << "Xlib XKB extension major=" << major << " minor=" << minor << endl;
 
-  // we need an application object for qt_xdisplay()
+  // we need an application object for tqt_xdisplay()
   KAccessApp app;
 
   // verify the X server has matching XKB extension
@@ -35,7 +35,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
   int opcode_rtrn;
   int error_rtrn;
   int xkb_opcode;
-  if (!XkbQueryExtension(qt_xdisplay(), &opcode_rtrn, &xkb_opcode, &error_rtrn,
+  if (!XkbQueryExtension(tqt_xdisplay(), &opcode_rtrn, &xkb_opcode, &error_rtrn,
 			 &major, &minor))
     {
       kdError() << "X server has not matching XKB extension" << endl;
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 0917bfe0f..da216aaf3 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -51,8 +51,8 @@
 static TQCString desktopConfigname()
 {
     int desktop=0;
-    if (qt_xdisplay())
-        desktop = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+        desktop = DefaultScreen(tqt_xdisplay());
     TQCString name;
     if (desktop == 0)
         name = "kdesktoprc";
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 5842412e8..d65d9b038 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -192,7 +192,7 @@ int KBackgroundRenderer::doBackground(bool quit)
     // some dithering may be needed even with bpb==15/16, so don't use tileWidth==1
     // for them
     // with tileWidth>2, repainting the desktop causes nasty effect (XFree86 4.1.0 )
-        if( XQueryBestTile( qt_xdisplay(), qt_xrootwin(), tile_val, tile_val,
+        if( XQueryBestTile( tqt_xdisplay(), tqt_xrootwin(), tile_val, tile_val,
             &tileWidth, &tileHeight ) != Success )
             tileWidth = tileHeight = tile_val; // some defaults
     }
@@ -549,12 +549,12 @@ bool KBackgroundRenderer::canTile() const
     return m_TilingEnabled && optimize();
 }
 
-extern bool qt_use_xrender; // in Qt ( qapplication_x11.cpp )
+extern bool tqt_use_xrender; // in Qt ( qapplication_x11.cpp )
 
 void KBackgroundRenderer::wallpaperBlend()
 {
     if( !enabled() || wallpaperMode() == NoWallpaper
-        || (blendMode() == NoBlending && ( qt_use_xrender || !m_Wallpaper.hasAlphaBuffer()))) {
+        || (blendMode() == NoBlending && ( tqt_use_xrender || !m_Wallpaper.hasAlphaBuffer()))) {
         fastWallpaperBlend();
     }
     else {
@@ -1030,8 +1030,8 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
     // The following code is borrowed from KBackgroundSettings::KBackgroundSettings
     if (!config) {
         int screen_number = 0;
-        if (qt_xdisplay())
-            screen_number = DefaultScreen(qt_xdisplay());
+        if (tqt_xdisplay())
+            screen_number = DefaultScreen(tqt_xdisplay());
         TQCString configname;
         if (screen_number == 0)
             configname = "kdesktoprc";
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 818a00f31..b89731c42 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -493,8 +493,8 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou
 
     if (!config) {
         int screen_number = 0;
-        if (qt_xdisplay())
-            screen_number = DefaultScreen(qt_xdisplay());
+        if (tqt_xdisplay())
+            screen_number = DefaultScreen(tqt_xdisplay());
         TQCString configname;
         if (screen_number == 0)
             configname = "kdesktoprc";
@@ -1215,7 +1215,7 @@ void KGlobalBackgroundSettings::readSettings()
     m_CacheSize = m_pConfig->readNumEntry("CacheSize", _defCacheSize);
     
     m_Names.clear();
-    NETRootInfo info( qt_xdisplay(), NET::DesktopNames | NET::NumberOfDesktops );
+    NETRootInfo info( tqt_xdisplay(), NET::DesktopNames | NET::NumberOfDesktops );
     m_bDrawBackgroundPerScreen.resize(info.numberOfDesktops());
     for ( int i = 0 ; i < info.numberOfDesktops() ; ++i )
         m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen );
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 321eef90a..6d22d2384 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -45,8 +45,8 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
     : KCModule(KBackGndFactory::instance(), parent, name)
 {
     int screen_number = 0;
-    if (qt_xdisplay())
-	screen_number = DefaultScreen(qt_xdisplay());
+    if (tqt_xdisplay())
+	screen_number = DefaultScreen(tqt_xdisplay());
     TQCString configname;
     if (screen_number == 0)
 	configname = "kdesktoprc";
@@ -105,8 +105,8 @@ void KBackground::save()
 	client->attach();
 
     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 = "kdesktop";
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index b66d839fc..3a67306a6 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -399,7 +399,7 @@ void KColorScheme::save()
 #if defined Q_WS_X11 && !defined K_WS_QTONLY
         // Undo the property xrdb has placed on the root window (if any),
         // i.e. remove all entries, including ours
-        XDeleteProperty( qt_xdisplay(), qt_xrootwin(), XA_RESOURCE_MANAGER );
+        XDeleteProperty( tqt_xdisplay(), tqt_xrootwin(), XA_RESOURCE_MANAGER );
 #endif
     }
     runRdb( flags );	// Save the palette to qtrc for KStyles
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 5cb1fb71c..7d610b6c5 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -856,7 +856,7 @@ void KDisplayConfig::identifyMonitors () {
 	ScreenInfo *randr_screen_info;
 	XRROutputInfo *output_info;
 
-	randr_display = qt_xdisplay();
+	randr_display = tqt_xdisplay();
 	randr_screen_info = m_randrsimple->read_screen_info(randr_display);
 
 	for (i = 0; i < m_screenInfoArray.count(); i++) {
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index d9fa4cb08..40495aaa3 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -94,7 +94,7 @@ extern "C" {
         KConfig *cfg = new KConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
         cfg->setGroup("DisplayEnergy");
 
-	Display *dpy = qt_xdisplay();
+	Display *dpy = tqt_xdisplay();
 	CARD16 pre_configured_status;
 	BOOL pre_configured_enabled;
 	CARD16 pre_configured_standby;
@@ -153,7 +153,7 @@ KEnergy::KEnergy(TQWidget *parent, const char *name)
 
 #ifdef HAVE_DPMS
     int dummy;
-    m_bDPMS = DPMSQueryExtension(qt_xdisplay(), &dummy, &dummy);
+    m_bDPMS = DPMSQueryExtension(tqt_xdisplay(), &dummy, &dummy);
 #endif
 
     TQVBoxLayout *top = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -333,7 +333,7 @@ void KEnergy::applySettings(bool enable, int standby, int suspend, int off)
     XErrFunc defaultHandler;
     defaultHandler = XSetErrorHandler(dropError);
 
-    Display *dpy = qt_xdisplay();
+    Display *dpy = tqt_xdisplay();
 
     int dummy;
     bool hasDPMS = DPMSQueryExtension(dpy, &dummy, &dummy);
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 48f9e14c5..8196cfd6c 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -164,7 +164,7 @@ int main(int argc, char ** argv)
     bool ok;
     long id = args->getOption("parent").toLong(&ok);
     if (ok)
-      XSetTransientForHint( qt_xdisplay(), dlg.winId(), id );
+      XSetTransientForHint( tqt_xdisplay(), dlg.winId(), id );
   }
 #endif
   args->clear();
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 3bea0f1e4..70bbd162e 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -495,8 +495,8 @@ int FontAASettings::exec()
 static TQCString desktopConfigName()
 {
   int desktop=0;
-  if (qt_xdisplay())
-    desktop = DefaultScreen(qt_xdisplay());
+  if (tqt_xdisplay())
+    desktop = DefaultScreen(tqt_xdisplay());
   TQCString name;
   if (desktop == 0)
     name = "kdesktoprc";
diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index f42498aab..439e5f676 100644
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -62,23 +62,23 @@ extern "C"
 
     // use a default value for theme only if it's not configured at all, not even in X resources
     if( theme.isEmpty()
-        && TQCString( XGetDefault( qt_xdisplay(), "Xcursor", "theme" )).isEmpty()
-        && TQCString( XcursorGetTheme( qt_xdisplay())).isEmpty())
+        && TQCString( XGetDefault( tqt_xdisplay(), "Xcursor", "theme" )).isEmpty()
+        && TQCString( XcursorGetTheme( tqt_xdisplay())).isEmpty())
     {
         theme = "default";
     }
 
      // Apply the KDE cursor theme to ourselves
     if( !theme.isEmpty())
-        XcursorSetTheme(qt_xdisplay(), theme.data());
+        XcursorSetTheme(tqt_xdisplay(), theme.data());
 
     if (!size.isEmpty())
-    	XcursorSetDefaultSize(qt_xdisplay(), size.toUInt());
+    	XcursorSetDefaultSize(tqt_xdisplay(), size.toUInt());
 
     // Load the default cursor from the theme and apply it to the root window.
-    Cursor handle = XcursorLibraryLoadCursor(qt_xdisplay(), "left_ptr");
-    XDefineCursor(qt_xdisplay(), qt_xrootwin(), handle);
-    XFreeCursor(qt_xdisplay(), handle); // Don't leak the cursor
+    Cursor handle = XcursorLibraryLoadCursor(tqt_xdisplay(), "left_ptr");
+    XDefineCursor(tqt_xdisplay(), tqt_xrootwin(), handle);
+    XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor
 
     // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
     // variables when launching applications.
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index ceb399648..326178a7a 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -34,8 +34,8 @@
 #include "previewwidget.h"
 
 
-extern bool qt_has_xft;
-extern bool qt_use_xrender;
+extern bool tqt_has_xft;
+extern bool tqt_use_xrender;
 
 
 namespace {
@@ -314,7 +314,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * )
 	p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
 	Picture dest;
 
-	if ( !qt_has_xft || !qt_use_xrender ) {
+	if ( !tqt_has_xft || !tqt_use_xrender ) {
 		XRenderPictFormat *fmt = XRenderFindVisualFormat( x11Display(), (Visual*)buffer.x11Visual() );
 		dest = XRenderCreatePicture( x11Display(), buffer.handle(), fmt, 0, NULL );
 	} else
@@ -334,7 +334,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * )
 
 	bitBlt( this, 0, 0, &buffer );
 
-	if ( !qt_has_xft || !qt_use_xrender )
+	if ( !tqt_has_xft || !tqt_use_xrender )
 		XRenderFreePicture( x11Display(), dest );
 }
 
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 5ec30ef76..5be813dc0 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -90,7 +90,7 @@ ProxyWidget *ConfigModule::module()
 void ConfigModule::deleteClient()
 {
   if (_embedWidget)
-    XKillClient(qt_xdisplay(), _embedWidget->embeddedWinId());
+    XKillClient(tqt_xdisplay(), _embedWidget->embeddedWinId());
 
   delete _rootProcess;
   _rootProcess = 0;
@@ -229,7 +229,7 @@ void ConfigModule::runAsRoot()
 void ConfigModule::rootExited(KProcess *)
 {
   if (_embedWidget->embeddedWinId())
-    XDestroyWindow(qt_xdisplay(), _embedWidget->embeddedWinId());
+    XDestroyWindow(tqt_xdisplay(), _embedWidget->embeddedWinId());
 
   delete _embedWidget;
   _embedWidget = 0;
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 8cde6989e..ebe099aa5 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -139,10 +139,10 @@ void ModifiersModule::setupMacModifierKeys()
 	//const int CODE_Alt_L  = 0x40, CODE_Alt_R  = 0x71;
 	int keyCodeMin, keyCodeMax, nKeyCodes, nSymsPerCode;
 
-	XDisplayKeycodes( qt_xdisplay(), &keyCodeMin, &keyCodeMax );
+	XDisplayKeycodes( tqt_xdisplay(), &keyCodeMin, &keyCodeMax );
 	nKeyCodes = keyCodeMax - keyCodeMin + 1;
-	KeySym* rgKeySyms = XGetKeyboardMapping( qt_xdisplay(), keyCodeMin, nKeyCodes, &nSymsPerCode );
-	XModifierKeymap* xmk = XGetModifierMapping( qt_xdisplay() );
+	KeySym* rgKeySyms = XGetKeyboardMapping( tqt_xdisplay(), keyCodeMin, nKeyCodes, &nSymsPerCode );
+	XModifierKeymap* xmk = XGetModifierMapping( tqt_xdisplay() );
 
 	SET_CODE_SYM( CODE_Ctrl_L, XK_Super_L )
 	SET_CODE_SYM( CODE_Ctrl_R, XK_Super_R )
@@ -159,8 +159,8 @@ void ModifiersModule::setupMacModifierKeys()
 	//SET_MOD_CODE( Mod1MapIndex,    CODE_Win_L, CODE_Win_R );
 	//SET_MOD_CODE( Mod4MapIndex,    CODE_Ctrl_L, CODE_Ctrl_R );
 
-	XSetModifierMapping( qt_xdisplay(), xmk );
-	XChangeKeyboardMapping( qt_xdisplay(), keyCodeMin, nSymsPerCode, rgKeySyms, nKeyCodes );
+	XSetModifierMapping( tqt_xdisplay(), xmk );
+	XChangeKeyboardMapping( tqt_xdisplay(), keyCodeMin, nSymsPerCode, rgKeySyms, nKeyCodes );
 	XFree( rgKeySyms );
 	XFreeModifiermap( xmk );
 }
@@ -291,7 +291,7 @@ void ModifiersModule::updateWidgets()
 		m_pchkMacSwap->setEnabled( false );
 	}
 
-	XModifierKeymap* xmk = XGetModifierMapping( qt_xdisplay() );
+	XModifierKeymap* xmk = XGetModifierMapping( tqt_xdisplay() );
 
 	for( int iKey = m_plstXMods->columns()-1; iKey < xmk->max_keypermod; iKey++ )
 		m_plstXMods->addColumn( i18n("Key %1").arg(iKey+1) );
@@ -300,7 +300,7 @@ void ModifiersModule::updateWidgets()
 	for( int iMod = 0; iMod < 8; iMod++ ) {
 		// Find the default modifier index for the Win key.
 		/*if( iMod > Mod2Index ) {
-			uint symX = XKeycodeToKeysym( qt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod], 0 );
+			uint symX = XKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod], 0 );
 			if( symX == XK_Super_L || symX == XK_Super_R )
 				iModWinDef = iMod;
 			else if( iModWinDef == -1 && (symX == XK_Meta_L || symX == XK_Meta_R) )
@@ -309,7 +309,7 @@ void ModifiersModule::updateWidgets()
 
 		// Insert items into X modifier map list
 		for( int iKey = 0; iKey < xmk->max_keypermod; iKey++ ) {
-			uint symX = XKeycodeToKeysym( qt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod + iKey], 0 );
+			uint symX = XKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod + iKey], 0 );
 			m_plstXMods->itemAtIndex( iMod )->setText( 1 + iKey, XKeysymToString( symX ) );
 		}
 	}
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 95d80cc31..1117e49a0 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -57,7 +57,7 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name)
     configFileWatch(new KDirWatch(this)),
     m_currentPanelIndex(0)
 {
-    m_screenNumber = qt_xdisplay() ? DefaultScreen(qt_xdisplay()) : 0;
+    m_screenNumber = tqt_xdisplay() ? DefaultScreen(tqt_xdisplay()) : 0;
 
     KickerSettings::instance(configName().latin1());
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index cf884c0be..4be13ef3f 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -128,12 +128,12 @@ void KDesktopConfig::load()
 void KDesktopConfig::load( bool useDefaults )
 {
   // get number of desktops
-  NETRootInfo info( qt_xdisplay(), NET::NumberOfDesktops | NET::DesktopNames );
+  NETRootInfo info( tqt_xdisplay(), NET::NumberOfDesktops | NET::DesktopNames );
   int n = info.numberOfDesktops();
 
   int konq_screen_number = 0;
-  if (qt_xdisplay())
-     konq_screen_number = DefaultScreen(qt_xdisplay());
+  if (tqt_xdisplay())
+     konq_screen_number = DefaultScreen(tqt_xdisplay());
 
   TQCString groupname;
   if (konq_screen_number == 0)
@@ -193,7 +193,7 @@ void KDesktopConfig::load( bool useDefaults )
 
 void KDesktopConfig::save()
 {
-  NETRootInfo info( qt_xdisplay(), NET::NumberOfDesktops | NET::DesktopNames );
+  NETRootInfo info( tqt_xdisplay(), NET::NumberOfDesktops | NET::DesktopNames );
   // set desktop names
   for(int i = 1; i <= maxDesktops; i++)
   {
@@ -204,11 +204,11 @@ void KDesktopConfig::save()
   info.setNumberOfDesktops(_numInput->value());
   info.activate();
 
-  XSync(qt_xdisplay(), FALSE);
+  XSync(tqt_xdisplay(), FALSE);
 
   int konq_screen_number = 0;
-  if (qt_xdisplay())
-     konq_screen_number = DefaultScreen(qt_xdisplay());
+  if (tqt_xdisplay())
+     konq_screen_number = DefaultScreen(tqt_xdisplay());
 
   TQCString appname;
   if (konq_screen_number == 0)
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index b31b1ae6b..60ee13bfe 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -596,13 +596,13 @@ void runRdb( uint flags )
     if (!qt_settings_timestamp) {
 	 TQString atomname("_QT_SETTINGS_TIMESTAMP_");
 	 atomname += XDisplayName( 0 ); // Use the $DISPLAY envvar.
-	 qt_settings_timestamp = XInternAtom( qt_xdisplay(), atomname.latin1(), False);
+	 qt_settings_timestamp = XInternAtom( tqt_xdisplay(), atomname.latin1(), False);
     }
 
     TQBuffer stamp;
     TQDataStream s(stamp.buffer(), IO_WriteOnly);
     s << settingsstamp;
-    XChangeProperty( qt_xdisplay(), qt_xrootwin(), qt_settings_timestamp,
+    XChangeProperty( tqt_xdisplay(), tqt_xrootwin(), qt_settings_timestamp,
 		     qt_settings_timestamp, 8, PropModeReplace,
 		     (unsigned char*) stamp.buffer().data(),
 		     stamp.buffer().size() );
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 0eba57304..064b5ab10 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -869,7 +869,7 @@ void KTheme::addPreview()
 {
     TQString file = m_kgd->saveLocation( "themes", m_name + "/" ) + m_name + ".preview.png";
     kdDebug() << "Adding preview: " << file << endl;
-    TQPixmap snapshot = TQPixmap::grabWindow( qt_xrootwin() );
+    TQPixmap snapshot = TQPixmap::grabWindow( tqt_xrootwin() );
     snapshot.save( file, "PNG" );
 }
 
diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp
index c32073243..48dbb475d 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/krandrmodule.cpp
@@ -56,7 +56,7 @@ extern "C"
 	KDE_EXPORT bool test_randr()
 	{
 	        int eventBase, errorBase;
-		if( XRRQueryExtension(qt_xdisplay(), &eventBase, &errorBase ) )
+		if( XRRQueryExtension(tqt_xdisplay(), &eventBase, &errorBase ) )
 			return true;
 		return false;
 	}
diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp
index 8f340bdee..12d9f8a3f 100644
--- a/kcontrol/randr/krandrpassivepopup.cpp
+++ b/kcontrol/randr/krandrpassivepopup.cpp
@@ -45,7 +45,7 @@ KRandrPassivePopup* KRandrPassivePopup::message( const TQString &caption, const
 
 void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
     {
-    static Atom wm_state = XInternAtom( qt_xdisplay() , "WM_STATE", False );
+    static Atom wm_state = XInternAtom( tqt_xdisplay() , "WM_STATE", False );
     Window win = widget_P->winId();
     bool x11_events = false;
     for(;;)
@@ -53,7 +53,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
 	Window root, parent;
 	Window* children;
 	unsigned int nchildren;
-	XQueryTree( qt_xdisplay(), win, &root, &parent, &children, &nchildren );
+	XQueryTree( tqt_xdisplay(), win, &root, &parent, &children, &nchildren );
 	if( children != NULL )
 	    XFree( children );
 	if( win == root ) // huh?
@@ -69,8 +69,8 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
 	else
 	    {
 	    XWindowAttributes attrs;
-	    XGetWindowAttributes( qt_xdisplay(), win, &attrs );
-	    XSelectInput( qt_xdisplay(), win, attrs.your_event_mask | StructureNotifyMask );
+	    XGetWindowAttributes( tqt_xdisplay(), win, &attrs );
+	    XSelectInput( tqt_xdisplay(), win, attrs.your_event_mask | StructureNotifyMask );
 	    watched_windows.append( win );
 	    x11_events = true;
 	    }
@@ -78,7 +78,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
 	int format;
 	unsigned long nitems, after;
 	unsigned char* data;
-	if( XGetWindowProperty( qt_xdisplay(), win, wm_state, 0, 0, False, AnyPropertyType,
+	if( XGetWindowProperty( tqt_xdisplay(), win, wm_state, 0, 0, False, AnyPropertyType,
 	    &type, &format, &nitems, &after, &data ) == Success )
 	    {
 	    if( data != NULL )
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 4764f0605..d24f260eb 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -582,7 +582,7 @@ void KScreenSaver::slotPreviewExited(KProcess *)
                           (mMonitorLabel->height()-186)/2+14, 151, 115);
     mMonitor->show();
     // So that hacks can XSelectInput ButtonPressMask
-    XSelectInput(qt_xdisplay(), mMonitor->winId(), widgetEventMask );
+    XSelectInput(tqt_xdisplay(), mMonitor->winId(), widgetEventMask );
 
     if (mSelected >= 0) {
         mPreviewProc->clearArguments();
@@ -781,7 +781,7 @@ void KScreenSaver::slotTest()
         mTestWin->raise();
         mTestWin->setFocus();
 	// So that hacks can XSelectInput ButtonPressMask
-	XSelectInput(qt_xdisplay(), mTestWin->winId(), widgetEventMask );
+	XSelectInput(tqt_xdisplay(), mTestWin->winId(), widgetEventMask );
 
 	grabMouse();
 	grabKeyboard();
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 16ff43b68..21a4ef424 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -97,12 +97,12 @@ extern "C"
         TQDataStream d(properties, IO_WriteOnly);
         d.setVersion( 3 );      // Qt2 apps need this.
         d << kapp->palette() << KGlobalSettings::generalFont();
-        Atom a = XInternAtom(qt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false);
+        Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false);
 
         // do it for all root windows - multihead support
-        int screen_count = ScreenCount(qt_xdisplay());
+        int screen_count = ScreenCount(tqt_xdisplay());
         for (int i = 0; i < screen_count; i++)
-            XChangeProperty(qt_xdisplay(),  RootWindow(qt_xdisplay(), i),
+            XChangeProperty(tqt_xdisplay(),  RootWindow(tqt_xdisplay(), i),
                             a, a, 8, PropModeReplace,
                             (unsigned char*) properties.data(), properties.size());
 #endif