diff --git a/src/dialogxml/widgets/control.cpp b/src/dialogxml/widgets/control.cpp index 677a16fc..4f222cc9 100644 --- a/src/dialogxml/widgets/control.cpp +++ b/src/dialogxml/widgets/control.cpp @@ -110,80 +110,6 @@ const char* xUnsupportedProp::what() const throw(){ return msg; } -eKeyMod operator + (eKeyMod lhs, eKeyMod rhs){ - if(lhs == rhs) return lhs; - else if(lhs == mod_none) return rhs; - else if(lhs == mod_alt){ - if(rhs == mod_shift || rhs == mod_altshift) return mod_altshift; - else if(rhs == mod_ctrl || rhs == mod_altctrl) return mod_altctrl; - else if(rhs == mod_shiftctrl || rhs == mod_all) return mod_all; - else return mod_alt; - }else if(lhs == mod_shift){ - if(rhs == mod_alt || rhs == mod_altshift) return mod_altshift; - else if(rhs == mod_ctrl || rhs == mod_shiftctrl) return mod_shiftctrl; - else if(rhs == mod_altctrl || rhs == mod_all) return mod_all; - else return mod_shift; - }else if(lhs == mod_ctrl){ - if(rhs == mod_alt || rhs == mod_altctrl) return mod_altctrl; - else if(rhs == mod_shift || rhs == mod_shiftctrl) return mod_shiftctrl; - else if(rhs == mod_altshift || rhs == mod_all) return mod_all; - else return mod_ctrl; - }else return rhs + lhs; -} - -eKeyMod operator - (eKeyMod lhs, eKeyMod rhs){ - if(lhs == rhs || lhs == mod_none || rhs == mod_all) return mod_none; - else if(rhs == mod_none) return lhs; - else if(lhs == mod_all){ - if(rhs == mod_alt) return mod_shiftctrl; - else if(rhs == mod_shift) return mod_altctrl; - else if(rhs == mod_ctrl) return mod_altshift; - else if(rhs == mod_altshift) return mod_ctrl; - else if(rhs == mod_altctrl) return mod_shift; - else if(rhs == mod_shiftctrl) return mod_alt; - else return mod_all; - }else if(lhs == mod_shiftctrl){ - if(rhs == mod_shift || rhs == mod_altshift) return mod_ctrl; - else if(rhs == mod_ctrl || rhs == mod_altctrl) return mod_shift; - else return mod_shiftctrl; - }else if(lhs == mod_altctrl){ - if(rhs == mod_alt || rhs == mod_altshift) return mod_ctrl; - else if(rhs == mod_ctrl || rhs == mod_shiftctrl) return mod_alt; - else return mod_altctrl; - }else if(lhs == mod_altshift){ - if(rhs == mod_alt || rhs == mod_altctrl) return mod_shift; - else if(rhs == mod_shift || rhs == mod_shiftctrl) return mod_alt; - else return mod_altshift; - }else if(lhs == mod_alt && (rhs == mod_altshift || rhs == mod_altctrl)) - return mod_none; - else if(lhs == mod_shift && (rhs == mod_altshift || rhs == mod_shiftctrl)) - return mod_none; - else if(lhs == mod_ctrl && (rhs == mod_altctrl || rhs == mod_shiftctrl)) - return mod_none; - else return lhs; -} - -eKeyMod& operator += (eKeyMod&lhs, eKeyMod rhs){ - lhs = lhs + rhs; - return lhs; -} - -eKeyMod& operator -= (eKeyMod&lhs, eKeyMod rhs){ - lhs = lhs - rhs; - return lhs; -} - -bool operator== (cKey a, cKey b){ - if(a.spec != b.spec) return false; - if(a.mod != b.mod) return false; - return a.spec ? a.k == b.k : (a.c == 0 ? false : a.c == b.c); -} - -bool mod_contains(eKeyMod mods, eKeyMod mod) { - if((mods & mod) != 0) return true; - return false; -} - void cControl::show(){ visible = true; if(labelCtrl) labelCtrl->show();