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>

15 files changed, 54 insertions, 49 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;
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h
index 9c193e69e..703b62188 100644
--- a/src/core/type_conversion.h
+++ b/src/core/type_conversion.h
@@ -84,9 +84,9 @@ namespace QtWebEngineCore {
 inline QString toQt(const base::string16 &string)
 {
 #if defined(OS_WIN)
-    return QString::fromStdWString(string.data());
+    return QString::fromStdWString(string);
 #else
-    return QString::fromUtf16(string.data());
+    return QString::fromUtf16(reinterpret_cast<const char16_t *>(string.data()), string.size());
 #endif
 }
 
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 389f53002..21bdea657 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -1636,19 +1636,19 @@ void WebContentsAdapter::enterDrag(QDragEnterEvent *e, const QPointF &screenPos)
 
     content::RenderViewHost *rvh = m_webContents->GetRenderViewHost();
     rvh->GetWidget()->FilterDropData(m_currentDropData.get());
-    rvh->GetWidget()->DragTargetDragEnter(*m_currentDropData, toGfx(e->posF()), toGfx(screenPos),
+    rvh->GetWidget()->DragTargetDragEnter(*m_currentDropData, toGfx(e->position()), toGfx(screenPos),
                                           toWeb(e->possibleActions()),
-                                          toWeb(e->mouseButtons()) | toWeb(e->keyboardModifiers()));
+                                          toWeb(e->buttons()) | toWeb(e->modifiers()));
 }
 
 Qt::DropAction WebContentsAdapter::updateDragPosition(QDragMoveEvent *e, const QPointF &screenPos)
 {
     CHECK_INITIALIZED(Qt::DropAction());
     content::RenderViewHost *rvh = m_webContents->GetRenderViewHost();
-    m_lastDragClientPos = e->posF();
+    m_lastDragClientPos = e->position();
     m_lastDragScreenPos = screenPos;
     rvh->GetWidget()->DragTargetDragOver(toGfx(m_lastDragClientPos), toGfx(m_lastDragScreenPos), toWeb(e->possibleActions()),
-                                         toWeb(e->mouseButtons()) | toWeb(e->keyboardModifiers()));
+                                         toWeb(e->buttons()) | toWeb(e->modifiers()));
     waitForUpdateDragActionCalled();
     return toQt(blink::WebDragOperation(m_currentDropAction));
 }
@@ -1691,10 +1691,10 @@ void WebContentsAdapter::endDragging(QDropEvent *e, const QPointF &screenPos)
     CHECK_INITIALIZED();
     content::RenderViewHost *rvh = m_webContents->GetRenderViewHost();
     rvh->GetWidget()->FilterDropData(m_currentDropData.get());
-    m_lastDragClientPos = e->posF();
+    m_lastDragClientPos = e->position();
     m_lastDragScreenPos = screenPos;
     rvh->GetWidget()->DragTargetDrop(*m_currentDropData, toGfx(m_lastDragClientPos), toGfx(m_lastDragScreenPos),
-                                     toWeb(e->mouseButtons()) | toWeb(e->keyboardModifiers()));
+                                     toWeb(e->buttons()) | toWeb(e->modifiers()));
 
     m_currentDropData.reset();
 }
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 4e4893096..da0c70af5 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -851,8 +851,8 @@ gpu::SyncPointManager *WebEngineContext::syncPointManager()
         return spm;
     QMutexLocker lock(&s_spmMutex);
     if (!s_syncPointManager)
-        s_syncPointManager.store(new gpu::SyncPointManager());
-    return s_syncPointManager.load();
+        s_syncPointManager.storeRelaxed(new gpu::SyncPointManager());
+    return s_syncPointManager.loadRelaxed();
 }
 
 base::CommandLine* WebEngineContext::commandLine() {
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index 1f005233d..cbf1fecf3 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -1433,8 +1433,8 @@ static WebPointerProperties::PointerType pointerTypeForTabletEvent(const QTablet
 WebMouseEvent WebEventFactory::toWebMouseEvent(QMouseEvent *ev)
 {
     WebMouseEvent webKitEvent(webEventTypeForEvent(ev),
-                              WebFloatPoint(ev->x(), ev->y()),
-                              WebFloatPoint(ev->globalX(), ev->globalY()),
+                              WebFloatPoint(ev->position().x(), ev->position().y()),
+                              WebFloatPoint(ev->globalPosition().x(), ev->globalPosition().y()),
                               mouseButtonForEvent<QMouseEvent>(ev),
                               0,
                               modifiersForEvent(ev),
@@ -1452,9 +1452,9 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev)
     webKitEvent.SetModifiers(modifiersForEvent(ev));
     webKitEvent.SetType(webEventTypeForEvent(ev));
 
-    webKitEvent.SetPositionInWidget(ev->pos().x(), ev->pos().y());
-    webKitEvent.movement_x = ev->pos().x() - ev->oldPos().x();
-    webKitEvent.movement_y = ev->pos().y() - ev->oldPos().y();
+    webKitEvent.SetPositionInWidget(ev->position().x(), ev->position().y());
+    webKitEvent.movement_x = ev->position().x() - ev->oldPos().x();
+    webKitEvent.movement_y = ev->position().y() - ev->oldPos().y();
     webKitEvent.pointer_type = WebPointerProperties::PointerType::kMouse;
 
     return webKitEvent;
@@ -1464,8 +1464,8 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev)
 WebMouseEvent WebEventFactory::toWebMouseEvent(QTabletEvent *ev)
 {
     WebMouseEvent webKitEvent(webEventTypeForEvent(ev),
-                              WebFloatPoint(ev->x(), ev->y()),
-                              WebFloatPoint(ev->globalX(), ev->globalY()),
+                              WebFloatPoint(ev->position().x(), ev->position().y()),
+                              WebFloatPoint(ev->globalPosition().x(), ev->globalPosition().y()),
                               mouseButtonForEvent<QTabletEvent>(ev),
                               0,
                               modifiersForEvent(ev),
@@ -1498,11 +1498,11 @@ WebGestureEvent WebEventFactory::toWebGestureEvent(QNativeGestureEvent *ev)
     webKitEvent.SetTimeStamp(base::TimeTicks::Now());
     webKitEvent.SetModifiers(modifiersForEvent(ev));
 
-    webKitEvent.SetPositionInWidget(WebFloatPoint(ev->localPos().x(),
-                                                  ev->localPos().y()));
+    webKitEvent.SetPositionInWidget(WebFloatPoint(ev->position().x(),
+                                                  ev->position().y()));
 
-    webKitEvent.SetPositionInScreen(WebFloatPoint(ev->screenPos().x(),
-                                                  ev->screenPos().y()));
+    webKitEvent.SetPositionInScreen(WebFloatPoint(ev->globalPosition().x(),
+                                                  ev->globalPosition().y()));
 
     webKitEvent.SetSourceDevice(blink::WebGestureDevice::kTouchpad);
 
diff --git a/src/pdf/qpdfbookmarkmodel.cpp b/src/pdf/qpdfbookmarkmodel.cpp
index eb4cb8773..b0e8bbecd 100644
--- a/src/pdf/qpdfbookmarkmodel.cpp
+++ b/src/pdf/qpdfbookmarkmodel.cpp
@@ -189,7 +189,7 @@ public:
 
             const int titleLength = int(FPDFBookmark_GetTitle(bookmark, nullptr, 0));
 
-            QList<ushort> titleBuffer(titleLength);
+            QList<char16_t> titleBuffer(titleLength);
             FPDFBookmark_GetTitle(bookmark, titleBuffer.data(), quint32(titleBuffer.length()));
 
             const FPDF_DEST dest = FPDFBookmark_GetDest(document, bookmark);
diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp
index 9b83e9b8e..5a8e0a1af 100644
--- a/src/pdf/qpdfdocument.cpp
+++ b/src/pdf/qpdfdocument.cpp
@@ -405,7 +405,7 @@ QString QPdfDocumentPrivate::getText(FPDF_TEXTPAGE textPage, int startIndex, int
     // TODO is that enough space in case one unicode character is more than one in utf-16?
     int len = FPDFText_GetText(textPage, startIndex, count, buf.data());
     Q_ASSERT(len - 1 <= count); // len is number of characters written, including the terminator
-    return QString::fromUtf16(buf.constData(), len - 1);
+    return QString::fromUtf16(reinterpret_cast<const char16_t *>(buf.constData()), len - 1);
 }
 
 QPointF QPdfDocumentPrivate::getCharPosition(FPDF_TEXTPAGE textPage, double pageHeight, int charIndex)
@@ -606,7 +606,7 @@ QVariant QPdfDocument::metaData(MetaDataField field) const
     FPDF_GetMetaText(d->doc, fieldName.constData(), buf.data(), buf.length());
     lock.unlock();
 
-    QString text = QString::fromUtf16(buf.data());
+    QString text = QString::fromUtf16(reinterpret_cast<const char16_t *>(buf.data()));
 
     switch (field) {
     case Title: // fall through
diff --git a/src/pdf/qpdflinkmodel.cpp b/src/pdf/qpdflinkmodel.cpp
index 2738aa533..5c2596bb9 100644
--- a/src/pdf/qpdflinkmodel.cpp
+++ b/src/pdf/qpdflinkmodel.cpp
@@ -242,7 +242,8 @@ void QPdfLinkModelPrivate::update()
                     QList<unsigned short> buf(len);
                     int got = FPDFLink_GetURL(webLinks, i, buf.data(), len);
                     Q_ASSERT(got == len);
-                    linkData.url = QString::fromUtf16(buf.data(), got - 1);
+                    linkData.url = QString::fromUtf16(
+                            reinterpret_cast<const char16_t *>(buf.data()), got - 1);
                 }
                 FPDFLink_GetTextRange(webLinks, i, &linkData.textStart, &linkData.textCharCount);
                 len = FPDFLink_CountRects(webLinks, i);
diff --git a/src/pdf/qpdfsearchmodel.cpp b/src/pdf/qpdfsearchmodel.cpp
index eeb0a18ce..9eb304263 100644
--- a/src/pdf/qpdfsearchmodel.cpp
+++ b/src/pdf/qpdfsearchmodel.cpp
@@ -261,7 +261,8 @@ bool QPdfSearchModelPrivate::doSearch(int page)
                 QList<ushort> buf(count + 1);
                 int len = FPDFText_GetText(textPage, startIndex, count, buf.data());
                 Q_ASSERT(len - 1 <= count); // len is number of characters written, including the terminator
-                QString context = QString::fromUtf16(buf.constData(), len - 1);
+                QString context = QString::fromUtf16(
+                        reinterpret_cast<const char16_t *>(buf.constData()), len - 1);
                 context = context.replace(QLatin1Char('\n'), QStringLiteral("\u23CE"));
                 context = context.remove(QLatin1Char('\r'));
                 // try to find the search string near the middle of the context if possible
diff --git a/src/tools/qwebengine_convert_dict/main.cpp b/src/tools/qwebengine_convert_dict/main.cpp
index 37b6e0171..14d175c00 100644
--- a/src/tools/qwebengine_convert_dict/main.cpp
+++ b/src/tools/qwebengine_convert_dict/main.cpp
@@ -51,9 +51,9 @@ inline base::FilePath toFilePath(const QString &str)
 inline QString toQt(const base::string16 &string)
 {
 #if defined(OS_WIN)
-    return QString::fromStdWString(string.data());
+    return QString::fromStdWString(string);
 #else
-    return QString::fromUtf16(string.data());
+    return QString::fromUtf16(reinterpret_cast<const char16_t *>(string.data()), string.size());
 #endif
 }
 
diff --git a/src/webengine/api/qquickwebenginetouchhandleprovider.cpp b/src/webengine/api/qquickwebenginetouchhandleprovider.cpp
index 80f4727b6..56162b223 100644
--- a/src/webengine/api/qquickwebenginetouchhandleprovider.cpp
+++ b/src/webengine/api/qquickwebenginetouchhandleprovider.cpp
@@ -67,7 +67,7 @@ void QQuickWebEngineTouchHandleProvider::init(const QMap<int, QImage> &images)
         return;
     }
 
-    m_touchHandleMap.unite(images);
+    m_touchHandleMap.insert(images);
 }
 
 QImage QQuickWebEngineTouchHandleProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 0861d0ca9..e86f78e4d 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -1736,16 +1736,16 @@ void QQuickWebEngineView::itemChange(ItemChange change, const ItemChangeData &va
 }
 
 #if QT_CONFIG(draganddrop)
-static QPoint mapToScreen(const QQuickItem *item, const QPoint &clientPos)
+static QPointF mapToScreen(const QQuickItem *item, const QPointF &clientPos)
 {
-    return item->window()->position() + item->mapToScene(clientPos).toPoint();
+    return item->window()->position() + item->mapToScene(clientPos);
 }
 
 void QQuickWebEngineView::dragEnterEvent(QDragEnterEvent *e)
 {
     Q_D(QQuickWebEngineView);
     e->accept();
-    d->adapter->enterDrag(e, mapToScreen(this, e->pos()));
+    d->adapter->enterDrag(e, mapToScreen(this, e->position()));
 }
 
 void QQuickWebEngineView::dragLeaveEvent(QDragLeaveEvent *e)
@@ -1758,7 +1758,7 @@ void QQuickWebEngineView::dragLeaveEvent(QDragLeaveEvent *e)
 void QQuickWebEngineView::dragMoveEvent(QDragMoveEvent *e)
 {
     Q_D(QQuickWebEngineView);
-    Qt::DropAction dropAction = d->adapter->updateDragPosition(e, mapToScreen(this, e->pos()));
+    Qt::DropAction dropAction = d->adapter->updateDragPosition(e, mapToScreen(this, e->position()));
     if (Qt::IgnoreAction == dropAction) {
         e->ignore();
     } else {
@@ -1771,7 +1771,7 @@ void QQuickWebEngineView::dropEvent(QDropEvent *e)
 {
     Q_D(QQuickWebEngineView);
     e->accept();
-    d->adapter->endDragging(e, mapToScreen(this, e->pos()));
+    d->adapter->endDragging(e, mapToScreen(this, e->position()));
 }
 #endif // QT_CONFIG(draganddrop)
 
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index ab5306590..6fcf7f3ac 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -272,7 +272,8 @@ void RenderWidgetHostViewQtDelegateQuick::hoverMoveEvent(QHoverEvent *event)
 {
     QQuickItem *parent = parentItem();
     if ((!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool()
-         && !parent->hasActiveFocus()) || event->posF() == event->oldPosF()) {
+         && !parent->hasActiveFocus())
+        || event->position() == event->oldPosF()) {
         event->ignore();
         return;
     }
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index f30fc3c4d..203682c79 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -451,7 +451,7 @@ void QWebEngineView::dragEnterEvent(QDragEnterEvent *e)
     e->accept();
     if (d->m_dragEntered)
         d->page->d_ptr->adapter->leaveDrag();
-    d->page->d_ptr->adapter->enterDrag(e, mapToGlobal(e->pos()));
+    d->page->d_ptr->adapter->enterDrag(e, mapToGlobal(e->position().toPoint()));
     d->m_dragEntered = true;
 }
 
@@ -477,7 +477,8 @@ void QWebEngineView::dragMoveEvent(QDragMoveEvent *e)
     if (!d->m_dragEntered)
         return;
     QtWebEngineCore::WebContentsAdapter *adapter = d->page->d_ptr->adapter.data();
-    Qt::DropAction dropAction = adapter->updateDragPosition(e, mapToGlobal(e->pos()));
+    Qt::DropAction dropAction =
+            adapter->updateDragPosition(e, mapToGlobal(e->position().toPoint()));
     if (Qt::IgnoreAction == dropAction) {
         e->ignore();
     } else {
@@ -495,7 +496,7 @@ void QWebEngineView::dropEvent(QDropEvent *e)
     if (!d->m_dragEntered)
         return;
     e->accept();
-    d->page->d_ptr->adapter->endDragging(e, mapToGlobal(e->pos()));
+    d->page->d_ptr->adapter->endDragging(e, mapToGlobal(e->position().toPoint()));
     d->m_dragEntered = false;
 }
 #endif // QT_CONFIG(draganddrop)
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index af30c54b8..0fd425580 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -441,8 +441,9 @@ bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
         // QtQuick is different by sending both the Press and DblClick events for the second press
         // where we can simply ignore the DblClick event.
         QMouseEvent *dblClick = static_cast<QMouseEvent *>(event);
-        QMouseEvent press(QEvent::MouseButtonPress, dblClick->localPos(), dblClick->windowPos(), dblClick->screenPos(),
-            dblClick->button(), dblClick->buttons(), dblClick->modifiers(), dblClick->source());
+        QMouseEvent press(QEvent::MouseButtonPress, dblClick->position(), dblClick->scenePosition(),
+                          dblClick->globalPosition(), dblClick->button(), dblClick->buttons(),
+                          dblClick->modifiers(), dblClick->source());
         press.setTimestamp(dblClick->timestamp());
         handled = m_client->forwardEvent(&press);
     } else