diff options
author | Balazs Egedi <egedib@inf.u-szeged.hu> | 2021-04-23 20:34:18 +0200 |
---|---|---|
committer | Balazs Egedi <egedib@inf.u-szeged.hu> | 2021-05-02 14:00:58 +0000 |
commit | f1245189d27b1826d8708bd042e2e29e8702bee2 (patch) | |
tree | f3a8fc11973be7f4ee2b6222eb91c0e54d999905 /src/core/render_widget_host_view_qt_delegate_client.cpp | |
parent | b9b52cdff21baca25b1690bd497d949d01b0b493 (diff) |
Fix compile warnings
Remove unused code and fix comparison between enum types.
Change-Id: I78244462bea1e968a6bdff2db5b7ebad60bd25b4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/render_widget_host_view_qt_delegate_client.cpp')
-rw-r--r-- | src/core/render_widget_host_view_qt_delegate_client.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/render_widget_host_view_qt_delegate_client.cpp b/src/core/render_widget_host_view_qt_delegate_client.cpp index 305f4c1e9..eb0a0ff12 100644 --- a/src/core/render_widget_host_view_qt_delegate_client.cpp +++ b/src/core/render_widget_host_view_qt_delegate_client.cpp @@ -688,7 +688,7 @@ void RenderWidgetHostViewQtDelegateClient::handleTouchEvent(QTouchEvent *event) // touch event content like number of points for different states int lastPressIndex = -1; - while ((lastPressIndex + 1) < touchPoints.size() && touchPoints[lastPressIndex + 1].second.state() == Qt::TouchPointPressed) + while ((lastPressIndex + 1) < touchPoints.size() && touchPoints[lastPressIndex + 1].second.state() == QEventPoint::Pressed) ++lastPressIndex; switch (event->type()) { @@ -700,7 +700,7 @@ void RenderWidgetHostViewQtDelegateClient::handleTouchEvent(QTouchEvent *event) case QEvent::TouchUpdate: for (; lastPressIndex >= 0; --lastPressIndex) { - Q_ASSERT(touchPoints[lastPressIndex].second.state() == Qt::TouchPointPressed); + Q_ASSERT(touchPoints[lastPressIndex].second.state() == QEventPoint::Pressed); MotionEventQt me(touchPoints.mid(lastPressIndex), eventTimestamp, ui::MotionEvent::Action::POINTER_DOWN, event->modifiers(), 0); m_rwhv->processMotionEvent(me); } @@ -711,7 +711,7 @@ void RenderWidgetHostViewQtDelegateClient::handleTouchEvent(QTouchEvent *event) Q_FALLTHROUGH(); case QEvent::TouchEnd: - while (!touchPoints.isEmpty() && touchPoints.back().second.state() == Qt::TouchPointReleased) { + while (!touchPoints.isEmpty() && touchPoints.back().second.state() == QEventPoint::Released) { auto action = touchPoints.size() > 1 ? ui::MotionEvent::Action::POINTER_UP : ui::MotionEvent::Action::UP; int index = action == ui::MotionEvent::Action::POINTER_UP ? touchPoints.size() - 1 : -1; m_rwhv->processMotionEvent(MotionEventQt(touchPoints, eventTimestamp, action, event->modifiers(), index)); |