From 443169bdcb47dfecf18da981119342b9f19eb84f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 7 Aug 2012 15:24:47 -0500
Subject: Update calls to deprecated XKeycodeToKeysym function

---
 kcontrol/keys/modifiers.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'kcontrol')

diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index d9b3075f1..db304f0c5 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -20,6 +20,7 @@
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/XKBlib.h>
 #include <X11/keysymdef.h>
 #include <ctype.h>
 #undef NONE
@@ -300,7 +301,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( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod], 0 );
+			uint symX = XkbKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod], 0, 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 +310,7 @@ void ModifiersModule::updateWidgets()
 
 		// Insert items into X modifier map list
 		for( int iKey = 0; iKey < xmk->max_keypermod; iKey++ ) {
-			uint symX = XKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod + iKey], 0 );
+			uint symX = XkbKeycodeToKeysym( tqt_xdisplay(), xmk->modifiermap[xmk->max_keypermod * iMod + iKey], 0, 0 );
 			m_plstXMods->itemAtIndex( iMod )->setText( 1 + iKey, XKeysymToString( symX ) );
 		}
 	}
-- 
cgit v1.2.1