Fix almost all deprecation warnings

Replace

 QString::fromUtf16({const ushort * -> const char16_t})
 QMap::{unite -> insert}
 Q{Hover,DragEnter,DragMove,Drop}Event::{posF() -> position()}
 Q{Hover,DragEnter,DragMove,Drop}Event::{pos() -> position().toPoint()}
 Q{DragEnter,Drop}Event::{mouseButtons -> buttons}
 Q{DragEnter,Drop}Event::{keyboardModifiers -> modifiers}
 QMouseEvent::{localPos -> position}
 QMouseEvent::{windowPos -> scenePosition}
 QMouseEvent::{screenPos -> globalPosition}

These should all be just renames without any change in behavior (save
for some floating point conversions). The one remaining issue concerns
the deprecation of binary JSON in qtbase, which is recommended to be
replaced with CBOR.

Change-Id: I8f3b533242fe9a58c08c2b09ff5d0bdbbfa6dd17
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 9 insertions, 9 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 25344a1c4..6ba106fcd 100644
--- a/src/core/render_widget_host_view_qt_delegate_client.cpp
+++ b/src/core/render_widget_host_view_qt_delegate_client.cpp
@@ -128,19 +128,19 @@ public:
     }
     float GetX(size_t pointer_index) const override
     {
-        return touchPoints.at(pointer_index).pos().x();
+        return touchPoints.at(pointer_index).position().x();
     }
     float GetY(size_t pointer_index) const override
     {
-        return touchPoints.at(pointer_index).pos().y();
+        return touchPoints.at(pointer_index).position().y();
     }
     float GetRawX(size_t pointer_index) const override
     {
-        return touchPoints.at(pointer_index).screenPos().x();
+        return touchPoints.at(pointer_index).globalPosition().x();
     }
     float GetRawY(size_t pointer_index) const override
     {
-        return touchPoints.at(pointer_index).screenPos().y();
+        return touchPoints.at(pointer_index).globalPosition().y();
     }
     float GetTouchMajor(size_t pointer_index) const override
     {
@@ -437,7 +437,7 @@ void RenderWidgetHostViewQtDelegateClient::handlePointerEvent(T *event)
         if (event->button() != m_clickHelper.lastPressButton
             || (event->timestamp() - m_clickHelper.lastPressTimestamp
                 > static_cast<ulong>(qGuiApp->styleHints()->mouseDoubleClickInterval()))
-            || (event->pos() - m_clickHelper.lastPressPosition).manhattanLength()
+            || (event->position() - m_clickHelper.lastPressPosition).manhattanLength()
                     > qGuiApp->styleHints()->startDragDistance()
             || m_clickHelper.clickCounter >= 3)
             m_clickHelper.clickCounter = 0;
@@ -445,19 +445,19 @@ void RenderWidgetHostViewQtDelegateClient::handlePointerEvent(T *event)
         m_clickHelper.lastPressTimestamp = event->timestamp();
         webEvent.click_count = ++m_clickHelper.clickCounter;
         m_clickHelper.lastPressButton = event->button();
-        m_clickHelper.lastPressPosition = QPointF(event->pos()).toPoint();
+        m_clickHelper.lastPressPosition = event->position().toPoint();
     }
 
     if (webEvent.GetType() == blink::WebInputEvent::kMouseUp)
         webEvent.click_count = m_clickHelper.clickCounter;
 
-    webEvent.movement_x = event->globalX() - m_previousMousePosition.x();
-    webEvent.movement_y = event->globalY() - m_previousMousePosition.y();
+    webEvent.movement_x = event->globalPosition().x() - m_previousMousePosition.x();
+    webEvent.movement_y = event->globalPosition().y() - m_previousMousePosition.y();
 
     if (m_rwhv->IsMouseLocked())
         QCursor::setPos(m_previousMousePosition);
     else
-        m_previousMousePosition = event->globalPos();
+        m_previousMousePosition = event->globalPosition().toPoint();
 
     if (m_imeInProgress && webEvent.GetType() == blink::WebInputEvent::kMouseDown) {
         m_imeInProgress = false;