Rename additional global functions and variables for tqt3

1 files changed, 16 insertions, 16 deletions

diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index 49a523346..0bc907efa 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -328,14 +328,14 @@ static uint g_modXNumLock, g_modXScrollLock, g_modXModeSwitch;
 
 bool initializeMods()
 {
-	XModifierKeymap* xmk = XGetModifierMapping( qt_xdisplay() );
+	XModifierKeymap* xmk = XGetModifierMapping( tqt_xdisplay() );
 
 	g_rgModInfo[3].modX = g_modXNumLock = g_modXScrollLock = g_modXModeSwitch = 0; 
 
         int min_keycode, max_keycode;
         int keysyms_per_keycode = 0;
-        XDisplayKeycodes( qt_xdisplay(), &min_keycode, &max_keycode );
-        XFree( XGetKeyboardMapping( qt_xdisplay(), min_keycode, 1, &keysyms_per_keycode ));
+        XDisplayKeycodes( tqt_xdisplay(), &min_keycode, &max_keycode );
+        XFree( XGetKeyboardMapping( tqt_xdisplay(), min_keycode, 1, &keysyms_per_keycode ));
 	// Qt assumes that Alt is always Mod1Mask, so start at Mod2Mask.
 	for( int i = Mod2MapIndex; i < 8; i++ ) {
 		uint mask = (1 << i);
@@ -346,7 +346,7 @@ bool initializeMods()
                 // found fixes the problem.
                 for( int j = 0; j < xmk->max_keypermod && keySymX == NoSymbol; ++j )
                     for( int k = 0; k < keysyms_per_keycode && keySymX == NoSymbol; ++k )
-                        keySymX = XKeycodeToKeysym( qt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * i + j], k );
+                        keySymX = XKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * i + j], k );
 		switch( keySymX ) {
 			case XK_Num_Lock:    g_modXNumLock = mask; break;     // Normally Mod2Mask
 			case XK_Super_L:
@@ -372,7 +372,7 @@ bool initializeMods()
 static void initializeVariations()
 {
 	for( int i = 0; g_rgSymVariation[i].sym != 0; i++ )
-		g_rgSymVariation[i].bActive = (XKeysymToKeycode( qt_xdisplay(), g_rgSymVariation[i].symVariation ) != 0);
+		g_rgSymVariation[i].bActive = (XKeysymToKeycode( tqt_xdisplay(), g_rgSymVariation[i].symVariation ) != 0);
 	g_bInitializedVariations = true;
 }
 #endif //Q_WS_X11
@@ -546,18 +546,18 @@ uint Sym::getModsRequired() const
 			return KKey::SHIFT;
 	}
 
-	uchar code = XKeysymToKeycode( qt_xdisplay(), m_sym );
+	uchar code = XKeysymToKeycode( tqt_xdisplay(), m_sym );
 	if( code ) {
 		// need to check index 0 before the others, so that a null-mod
 		//  can take precedence over the others, in case the modified
 		//  key produces the same symbol.
-		if( m_sym == XKeycodeToKeysym( qt_xdisplay(), code, 0 ) )
+		if( m_sym == XKeycodeToKeysym( tqt_xdisplay(), code, 0 ) )
 			;
-		else if( m_sym == XKeycodeToKeysym( qt_xdisplay(), code, 1 ) )
+		else if( m_sym == XKeycodeToKeysym( tqt_xdisplay(), code, 1 ) )
 			mod = KKey::SHIFT;
-		else if( m_sym == XKeycodeToKeysym( qt_xdisplay(), code, 2 ) )
+		else if( m_sym == XKeycodeToKeysym( tqt_xdisplay(), code, 2 ) )
 			mod = KKeyServer::MODE_SWITCH;
-		else if( m_sym == XKeycodeToKeysym( qt_xdisplay(), code, 3 ) )
+		else if( m_sym == XKeycodeToKeysym( tqt_xdisplay(), code, 3 ) )
 			mod = KKey::SHIFT | KKeyServer::MODE_SWITCH;
 	}
 #endif
@@ -762,7 +762,7 @@ bool codeXToSym( uchar codeX, uint modX, uint& sym )
 	XKeyPressedEvent event;
 
 	event.type = KeyPress;
-	event.display = qt_xdisplay();
+	event.display = tqt_xdisplay();
 	event.state = modX;
 	event.keycode = codeX;
 
@@ -858,7 +858,7 @@ uint stringUserToMod( const TQString& mod )
 
 	if( keySymX != 0 ) {
 		// Get X keyboard code
-		keyCodeX = XKeysymToKeycode( qt_xdisplay(), keySymX );
+		keyCodeX = XKeysymToKeycode( tqt_xdisplay(), keySymX );
 		// Add ModeSwitch modifier bit, if necessary
 		keySymXMods( keySymX, 0, &keyModX );
 
@@ -887,8 +887,8 @@ uint stringUserToMod( const TQString& mod )
 	//  keycode 111 & 92:  Print Sys_Req -> Sys_Req = Alt+Print
 	//  keycode 110 & 114: Pause Break   -> Break = Ctrl+Pause
 	if( (keyCodeX == 92 || keyCodeX == 111) &&
-	    XKeycodeToKeysym( qt_xdisplay(), 92, 0 ) == XK_Print &&
-	    XKeycodeToKeysym( qt_xdisplay(), 111, 0 ) == XK_Print )
+	    XKeycodeToKeysym( tqt_xdisplay(), 92, 0 ) == XK_Print &&
+	    XKeycodeToKeysym( tqt_xdisplay(), 111, 0 ) == XK_Print )
 	{
 		// If Alt is pressed, then we need keycode 92, keysym XK_Sys_Req
 		if( keyModX & keyModXAlt() ) {
@@ -902,8 +902,8 @@ uint stringUserToMod( const TQString& mod )
 		}
 	}
 	else if( (keyCodeX == 110 || keyCodeX == 114) &&
-	    XKeycodeToKeysym( qt_xdisplay(), 110, 0 ) == XK_Pause &&
-	    XKeycodeToKeysym( qt_xdisplay(), 114, 0 ) == XK_Pause )
+	    XKeycodeToKeysym( tqt_xdisplay(), 110, 0 ) == XK_Pause &&
+	    XKeycodeToKeysym( tqt_xdisplay(), 114, 0 ) == XK_Pause )
 	{
 		if( keyModX & keyModXCtrl() ) {
 			keyCodeX = 114;