[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/access
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-03-18 0:55:45
Message-ID: 1142643345.924500.30085.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 519850 by mueller:

fix string comparisons


 M  +3 -3      kaccess.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/access/kaccess.cpp #519849:519850
@@ -327,7 +327,7 @@
   overlay = 0;
 }
 
-int maskToBit (int mask) {
+static int maskToBit (int mask) {
    for (int i = 0; i < 8; i++)
       if (mask & (1 << i))
          return i;
@@ -339,12 +339,12 @@
       keys [i] = -1;
    state = 0;
 
-   for (int i = 0; modifierKeys[i].name != ""; i++) {
+   for (int i = 0; modifierKeys[i].name; i++) {
       int mask = modifierKeys[i].mask;
       if (mask == 0)
          if (modifierKeys[i].keysym != 0)
             mask = XkbKeysymToModifiers (QX11Info::display(), modifierKeys[i].keysym);
-         else if (modifierKeys[i].name == "Win")
+         else if (!strcmp(modifierKeys[i].name, "Win"))
             mask = KKeyNative::modXWin();
          else
             mask = XkbKeysymToModifiers (QX11Info::display(), XK_Mode_switch)
[prev in list] [next in list] [prev in thread] [next in thread]