Coding style corrections

This commit is contained in:
Cristian Luis Duarte 2018-03-13 15:56:13 -03:00
parent b8c0f4d686
commit a3811c2844
2 changed files with 10 additions and 17 deletions

View file

@ -282,36 +282,29 @@ void TouchscreenVirtualPadDevice::touchUpdateEvent(const QTouchEvent* event) {
// valid if it's an ongoing touch // valid if it's an ongoing touch
moveTouchFound = true; moveTouchFound = true;
moveTouchUpdate(thisPoint); moveTouchUpdate(thisPoint);
thisPointConsumed = true; continue;
} }
if (thisPointConsumed) continue;
if (!viewTouchFound && _viewHasValidTouch && _viewCurrentTouchId == thisPointId) { if (!viewTouchFound && _viewHasValidTouch && _viewCurrentTouchId == thisPointId) {
// valid if it's an ongoing touch // valid if it's an ongoing touch
viewTouchFound = true; viewTouchFound = true;
viewTouchUpdate(thisPoint); viewTouchUpdate(thisPoint);
thisPointConsumed = true; continue;
} }
if (thisPointConsumed) continue;
if (!moveTouchFound && idxMoveStartingPointCandidate == -1 && moveTouchBeginIsValid(thisPoint) && if (!moveTouchFound && idxMoveStartingPointCandidate == -1 && moveTouchBeginIsValid(thisPoint) &&
(!_unusedTouches.count(thisPointId) || _unusedTouches[thisPointId] == MOVE )) { (!_unusedTouches.count(thisPointId) || _unusedTouches[thisPointId] == MOVE )) {
idxMoveStartingPointCandidate = i; idxMoveStartingPointCandidate = i;
thisPointConsumed = true; continue;
} }
if (thisPointConsumed) continue;
if (!viewTouchFound && idxViewStartingPointCandidate == -1 && viewTouchBeginIsValid(thisPoint) && if (!viewTouchFound && idxViewStartingPointCandidate == -1 && viewTouchBeginIsValid(thisPoint) &&
(!_unusedTouches.count(thisPointId) || _unusedTouches[thisPointId] == VIEW )) { (!_unusedTouches.count(thisPointId) || _unusedTouches[thisPointId] == VIEW )) {
idxViewStartingPointCandidate = i; idxViewStartingPointCandidate = i;
thisPointConsumed = true; thisPointConsumed = true;
continue;
} }
if (thisPointConsumed) continue;
if (moveTouchBeginIsValid(thisPoint)) { if (moveTouchBeginIsValid(thisPoint)) {
unusedTouchesInEvent[thisPointId] = MOVE; unusedTouchesInEvent[thisPointId] = MOVE;
} else if (viewTouchBeginIsValid(thisPoint)) { } else if (viewTouchBeginIsValid(thisPoint)) {