[PATCH 03/11] xkb: remove XConvertCase.

Peter Hutterer peter.hutterer at who-t.net
Thu Jan 14 21:32:11 PST 2010


Since it's typedef'd to XkbConvertCase anyway and the headers are now split
from the client headers, simply get rid of it altogether.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 include/xkbsrv.h |    1 -
 xkb/XKBMisc.c    |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index b1df0d3..af8df2f 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -310,7 +310,6 @@ extern	_X_EXPORT int	DeviceButtonPress,DeviceButtonRelease;
 #define	_XkbIsPressEvent(t)	(((t)==KeyPress)||((t)==DeviceKeyPress))
 #define	_XkbIsReleaseEvent(t)	(((t)==KeyRelease)||((t)==DeviceKeyRelease))
 
-#define	XConvertCase(s,l,u)	XkbConvertCase(s,l,u)
 #undef	IsKeypadKey
 #define	IsKeypadKey(s)		XkbKSIsKeypad(s)
 
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 71fa044..55def7c 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -162,7 +162,7 @@ BOOL		replicated = FALSE;
 	syms= &xkb_syms_rtrn[XKB_OFFSET(i,0)];
 	if ((nSyms[i]>1)&&(syms[1]==NoSymbol)&&(syms[0]!=NoSymbol)) {
 	    KeySym upper,lower;
-	    XConvertCase(syms[0],&lower,&upper);
+	    XkbConvertCase(syms[0],&lower,&upper);
 	    if (upper!=lower) {
 		xkb_syms_rtrn[XKB_OFFSET(i,0)]= lower;
 		xkb_syms_rtrn[XKB_OFFSET(i,1)]= upper;
@@ -179,7 +179,7 @@ BOOL		replicated = FALSE;
 		types_inout[i]= XkbKeypadIndex;
 	    else {
 		KeySym upper,lower;
-		XConvertCase(syms[0],&lower,&upper);
+		XkbConvertCase(syms[0],&lower,&upper);
 		if ((syms[0]==lower)&&(syms[1]==upper))
 		    types_inout[i]= XkbAlphabeticIndex;
 	    }
-- 
1.6.6



More information about the xorg-devel mailing list