From 3fcfc348ede84d5592f87c835a0cc21d6989092f Mon Sep 17 00:00:00 2001
From: Albert Weichselbraun <albert@weichselbraun.net>
Date: Mon, 18 Nov 2013 06:17:56 +0100
Subject: [PATCH] Cleanup: use break rather than nested if/else constructs.

---
 src/autotype/x11/AutoTypeX11.cpp | 52 +++++++++++++++++---------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp
index a84f394cd..e74eb2f02 100644
--- a/src/autotype/x11/AutoTypeX11.cpp
+++ b/src/autotype/x11/AutoTypeX11.cpp
@@ -632,37 +632,39 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym, unsigned int shift)
             XkbTranslateKeyCode(kbd, keycode, 0, &mods_rtrn, &ks);
             if (ks == keysym) {
                 shift &= ~m_altgrMask;
+                shift &= ~ShiftMask;
                 found = TRUE;
-            } else {
+                break;
+            } 
 
-                XkbTranslateKeyCode(kbd, keycode, ShiftMask, &mods_rtrn, &ks);
-                if (ks == keysym) {
-                     shift &= ~m_altgrMask;
-                     shift |= ShiftMask;
-                     found = TRUE;
-                } else {
+            XkbTranslateKeyCode(kbd, keycode, ShiftMask, &mods_rtrn, &ks);
+            if (ks == keysym) {
+                 shift &= ~m_altgrMask;
+                 shift |= ShiftMask;
+                 found = TRUE;
+                 break;
+            } 
 
-                    XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks);
-                    if (ks == keysym) {
-                         shift &= ~ShiftMask;
-                         shift |= m_altgrMask;
-                         found = TRUE;
-                    } else {
-             
-                        XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks);
-                        if (ks == keysym) {
-                             shift |= ShiftMask | m_altgrMask;
-                             found = TRUE;
-                        } 
-                    }
-                }
-            }
+            XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks);
+            if (ks == keysym) {
+                 shift &= ~ShiftMask;
+                 shift |= m_altgrMask;
+                 found = TRUE;
+                 break;
+            } 
+         
+            XkbTranslateKeyCode(kbd, keycode, Mod5Mask, &mods_rtrn, &ks);
+            if (ks == keysym) {
+                 shift |= ShiftMask | m_altgrMask;
+                 found = TRUE;
+                 break;
+            } 
             if (found) break;
 
             if (0xF000 <= keysym) {
-                    /* for special keys such as function keys,
-                    first try to add it in the non-shifted position of the keymap */
-                    if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE);
+                 /* for special keys such as function keys,
+                 first try to add it in the non-shifted position of the keymap */
+                 if (AddKeysym(keysym, TRUE) == NoSymbol) AddKeysym(keysym, FALSE);
             } else {
                     AddKeysym(keysym, FALSE);
             }