diff --git a/wrap/qt/trackball.h b/wrap/qt/trackball.h index 66ab35e6..6b86a2b9 100644 --- a/wrap/qt/trackball.h +++ b/wrap/qt/trackball.h @@ -35,19 +35,13 @@ static vcg::Trackball::Button QT2VCG (Qt::MouseButton qtbt, Qt::KeyboardModifier { int vcgbt = vcg::Trackball::BUTTON_NONE; - if (qtbt & Qt::LeftButton) - vcgbt |= vcg::Trackball::BUTTON_LEFT; - if (qtbt & Qt::RightButton) - vcgbt |= vcg::Trackball::BUTTON_RIGHT; - if (qtbt & Qt::MidButton) - vcgbt |= vcg::Trackball::BUTTON_MIDDLE; + if (qtbt & Qt::LeftButton) vcgbt |= vcg::Trackball::BUTTON_LEFT; + if (qtbt & Qt::RightButton) vcgbt |= vcg::Trackball::BUTTON_RIGHT; + if (qtbt & Qt::MidButton) vcgbt |= vcg::Trackball::BUTTON_MIDDLE; - if (modifiers & Qt::ShiftModifier) - vcgbt |= vcg::Trackball::KEY_SHIFT; - if (modifiers & Qt::ControlModifier) - vcgbt |= vcg::Trackball::KEY_CTRL; - if (modifiers & Qt::AltModifier) - vcgbt |= vcg::Trackball::KEY_ALT; + if (modifiers & Qt::ShiftModifier) vcgbt |= vcg::Trackball::KEY_SHIFT; + if (modifiers & Qt::ControlModifier) vcgbt |= vcg::Trackball::KEY_CTRL; + if (modifiers & Qt::AltModifier) vcgbt |= vcg::Trackball::KEY_ALT; return vcg::Trackball::Button (vcgbt); } @@ -57,12 +51,9 @@ static vcg::Trackball::Button QTWheel2VCG (Qt::KeyboardModifiers modifiers) { int vcgbt = vcg::Trackball::WHEEL; - if (modifiers & Qt::ShiftModifier) - vcgbt |= vcg::Trackball::KEY_SHIFT; - if (modifiers & Qt::ControlModifier) - vcgbt |= vcg::Trackball::KEY_CTRL; - if (modifiers & Qt::AltModifier) - vcgbt |= vcg::Trackball::KEY_ALT; + if (modifiers & Qt::ShiftModifier) vcgbt |= vcg::Trackball::KEY_SHIFT; + if (modifiers & Qt::ControlModifier) vcgbt |= vcg::Trackball::KEY_CTRL; + if (modifiers & Qt::AltModifier) vcgbt |= vcg::Trackball::KEY_ALT; return vcg::Trackball::Button (vcgbt); }