X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fxkbcomp%2Fparseutils.h;h=623347aad9950f6d1bfe484175d5174c0b400a94;hb=7257d4c89e52aa727df25564109cecc4d33b9543;hp=d96a20bc52c088c8f8c743410e44c9042f95cbf2;hpb=b38525421f5b6f28b7f441ff8b2c3a97b047aae2;p=platform%2Fupstream%2Flibxkbcommon.git diff --git a/src/xkbcomp/parseutils.h b/src/xkbcomp/parseutils.h index d96a20b..623347a 100644 --- a/src/xkbcomp/parseutils.h +++ b/src/xkbcomp/parseutils.h @@ -76,7 +76,7 @@ extern KeyAliasDef *KeyAliasCreate(char * /* alias */ , char * /* real */ ); -extern VModDef *VModCreate(Atom /* name */ , +extern VModDef *VModCreate(CARD32 /* name */ , ExprDef * /* value */ ); @@ -84,7 +84,7 @@ extern VarDef *VarCreate(ExprDef * /* name */ , ExprDef * /* value */ ); -extern VarDef *BoolVarCreate(Atom /* nameToken */ , +extern VarDef *BoolVarCreate(CARD32 /* nameToken */ , unsigned /* set */ ); @@ -92,7 +92,7 @@ extern InterpDef *InterpCreate(char * /* sym */ , ExprDef * /* match */ ); -extern KeyTypeDef *KeyTypeCreate(Atom /* name */ , +extern KeyTypeDef *KeyTypeCreate(CARD32 /* name */ , VarDef * /* body */ ); @@ -104,11 +104,11 @@ extern GroupCompatDef *GroupCompatCreate(int /* group */ , ExprDef * /* def */ ); -extern ModMapDef *ModMapCreate(Atom /* modifier */ , +extern ModMapDef *ModMapCreate(CARD32 /* modifier */ , ExprDef * /* keys */ ); -extern IndicatorMapDef *IndicatorMapCreate(Atom /* name */ , +extern IndicatorMapDef *IndicatorMapCreate(CARD32 /* name */ , VarDef * /* body */ ); @@ -117,18 +117,18 @@ extern IndicatorNameDef *IndicatorNameCreate(int /* ndx */ , Bool /* virtual */ ); -extern ExprDef *ActionCreate(Atom /* name */ , +extern ExprDef *ActionCreate(CARD32 /* name */ , ExprDef * /* args */ ); extern ExprDef *CreateKeysymList(char * /* sym */ ); -extern ShapeDef *ShapeDeclCreate(Atom /* name */ , +extern ShapeDef *ShapeDeclCreate(CARD32 /* name */ , OutlineDef * /* outlines */ ); -extern OutlineDef *OutlineCreate(Atom /* field */ , +extern OutlineDef *OutlineCreate(CARD32 /* field */ , ExprDef * /* points */ ); @@ -143,7 +143,7 @@ extern KeyDef *KeyDeclMerge(KeyDef * /* into */ , extern RowDef *RowDeclCreate(KeyDef * /* keys */ ); -extern SectionDef *SectionDeclCreate(Atom /* name */ , +extern SectionDef *SectionDeclCreate(CARD32 /* name */ , RowDef * /* rows */ ); @@ -151,12 +151,12 @@ extern OverlayKeyDef *OverlayKeyCreate(char * /* under */ , char * /* over */ ); -extern OverlayDef *OverlayDeclCreate(Atom /* name */ , +extern OverlayDef *OverlayDeclCreate(CARD32 /* name */ , OverlayKeyDef * /* rows */ ); extern DoodadDef *DoodadCreate(unsigned /* type */ , - Atom /* name */ , + CARD32 /* name */ , VarDef * /* body */ );