1 files changed, 11 insertions, 11 deletions

diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 10c593ed7..5dca89695 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -31,7 +31,7 @@
 #include "kaccess.moc"
 
 struct ModifierKey {
-   const unsigned int mask;
+   const unsigned int tqmask;
    const KeySym keysym;
    const char *name;
    const char *lockedText;
@@ -303,9 +303,9 @@ void KAccessApp::readSettings()
   overlay = 0;
 }
 
-static int maskToBit (int mask) {
+static int tqmaskToBit (int tqmask) {
    for (int i = 0; i < 8; i++)
-      if (mask & (1 << i))
+      if (tqmask & (1 << i))
          return i;
    return -1;
 }
@@ -316,19 +316,19 @@ void KAccessApp::initMasks() {
    state = 0;
 
    for (int i = 0; strcmp (modifierKeys[i].name, "") != 0; i++) {
-      int mask = modifierKeys[i].mask;
-      if (mask == 0)
+      int tqmask = modifierKeys[i].tqmask;
+      if (tqmask == 0)
          if (modifierKeys[i].keysym != 0)
-            mask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
+            tqmask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
          else if (!strcmp(modifierKeys[i].name, "Win"))
-            mask = KKeyNative::modX(KKey::WIN);
+            tqmask = KKeyNative::modX(KKey::WIN);
          else
-            mask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
+            tqmask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
                  | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Shift)
                  | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Latch)
                  | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Lock);
 
-      int bit = maskToBit (mask);
+      int bit = tqmaskToBit (tqmask);
       if (bit != -1 && keys[bit] == -1)
          keys[bit] = i;
    }
@@ -496,7 +496,7 @@ TQString mouseKeysShortcut (Display *display) {
            {
               if (type->map[i].active && (type->map[i].level == level))
               {
-                 modifiers = type->map[i].mods.mask;
+                 modifiers = type->map[i].mods.tqmask;
                  found = true;
               }
            }
@@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() {
       TQVBoxLayout * vlay = new TQVBoxLayout(lay);
 
       featuresLabel = new TQLabel( "", contents );
-      featuresLabel->setAlignment( WordBreak|AlignVCenter );
+      featuresLabel->tqsetAlignment( WordBreak|AlignVCenter );
       vlay->addWidget( featuresLabel );
       vlay->addStretch();