summaryrefslogtreecommitdiffstats
path: root/kxkb/kcmmisc.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kxkb/kcmmisc.cpp
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kxkb/kcmmisc.cpp')
-rw-r--r--kxkb/kcmmisc.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index f66ea587c..901b6bbe3 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -51,7 +51,7 @@
#include <X11/Xlib.h>
KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
- : KCModule (parent, "kcmlayout")
+ : KCModule (parent, "kcmtqlayout")
{
TQString wtstr;
TQBoxLayout* lay = new TQVBoxLayout(this, 0, KDialog::spacingHint());
@@ -286,7 +286,7 @@ int xkb_init()
&xkb_lmaj, &xkb_lmin );
}
-unsigned int xkb_mask_modifier( XkbDescPtr xkb, const char *name )
+unsigned int xkb_tqmask_modifier( XkbDescPtr xkb, const char *name )
{
int i;
if( !xkb || !xkb->names )
@@ -298,47 +298,47 @@ unsigned int xkb_mask_modifier( XkbDescPtr xkb, const char *name )
char* modStr = XGetAtomName( xkb->dpy, xkb->names->vmods[i] );
if( modStr != NULL && strcmp(name, modStr) == 0 )
{
- unsigned int mask;
- XkbVirtualModsToReal( xkb, 1 << i, &mask );
- return mask;
+ unsigned int tqmask;
+ XkbVirtualModsToReal( xkb, 1 << i, &tqmask );
+ return tqmask;
}
}
return 0;
}
-unsigned int xkb_numlock_mask()
+unsigned int xkb_numlock_tqmask()
{
XkbDescPtr xkb;
if(( xkb = XkbGetKeyboard( qt_xdisplay(), XkbAllComponentsMask, XkbUseCoreKbd )) != NULL )
{
- unsigned int mask = xkb_mask_modifier( xkb, "NumLock" );
+ unsigned int tqmask = xkb_tqmask_modifier( xkb, "NumLock" );
XkbFreeKeyboard( xkb, 0, True );
- return mask;
+ return tqmask;
}
return 0;
}
int xkb_set_on()
{
- unsigned int mask;
+ unsigned int tqmask;
if( !xkb_init())
return 0;
- mask = xkb_numlock_mask();
- if( mask == 0 )
+ tqmask = xkb_numlock_tqmask();
+ if( tqmask == 0 )
return 0;
- XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, mask, mask);
+ XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, tqmask, tqmask);
return 1;
}
int xkb_set_off()
{
- unsigned int mask;
+ unsigned int tqmask;
if( !xkb_init())
return 0;
- mask = xkb_numlock_mask();
- if( mask == 0 )
+ tqmask = xkb_numlock_tqmask();
+ if( tqmask == 0 )
return 0;
- XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, mask, 0);
+ XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, tqmask, 0);
return 1;
}
#endif
@@ -347,10 +347,10 @@ int xkb_set_off()
int xtest_get_numlock_state()
{
int i;
- int numlock_mask = 0;
+ int numlock_tqmask = 0;
Window dummy1, dummy2;
int dummy3, dummy4, dummy5, dummy6;
- unsigned int mask;
+ unsigned int tqmask;
KeyCode numlock_keycode = XKeysymToKeycode( qt_xdisplay(), XK_Num_Lock );
if( numlock_keycode == NoSymbol )
return 0;
@@ -360,12 +360,12 @@ int xtest_get_numlock_state()
++i )
{
if( map->modifiermap[ map->max_keypermod * i ] == numlock_keycode )
- numlock_mask = 1 << i;
+ numlock_tqmask = 1 << i;
}
XQueryPointer( qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2,
- &dummy3, &dummy4, &dummy5, &dummy6, &mask );
+ &dummy3, &dummy4, &dummy5, &dummy6, &tqmask );
XFreeModifiermap( map );
- return mask & numlock_mask;
+ return tqmask & numlock_tqmask;
}
void xtest_change_numlock()