Replace calls to deprecated QEvent accessor functions

Many of these were generated by clazy using the new qevent-accessors check.

Change-Id: Ie17af17f50fdc9f47d7859d267c14568cc350fd0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

7 files changed, 48 insertions, 48 deletions

diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 2b44bac2f3..b99dbb109b 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -1693,7 +1693,7 @@ bool QAbstractItemView::viewportEvent(QEvent *event)
     switch (event->type()) {
     case QEvent::HoverMove:
     case QEvent::HoverEnter:
-        d->setHoverIndex(indexAt(static_cast<QHoverEvent*>(event)->pos()));
+        d->setHoverIndex(indexAt(static_cast<QHoverEvent*>(event)->position().toPoint()));
         break;
     case QEvent::HoverLeave:
         d->setHoverIndex(QModelIndex());
@@ -1756,7 +1756,7 @@ void QAbstractItemView::mousePressEvent(QMouseEvent *event)
 {
     Q_D(QAbstractItemView);
     d->delayedAutoScroll.stop(); //any interaction with the view cancel the auto scrolling
-    QPoint pos = event->pos();
+    QPoint pos = event->position().toPoint();
     QPersistentModelIndex index = indexAt(pos);
 
     if (!d->selectionModel
@@ -1822,7 +1822,7 @@ void QAbstractItemView::mouseMoveEvent(QMouseEvent *event)
 {
     Q_D(QAbstractItemView);
     QPoint topLeft;
-    QPoint bottomRight = event->pos();
+    QPoint bottomRight = event->position().toPoint();
 
     if (state() == ExpandingState || state() == CollapsingState)
         return;
@@ -1901,7 +1901,7 @@ void QAbstractItemView::mouseReleaseEvent(QMouseEvent *event)
 {
     Q_D(QAbstractItemView);
 
-    QPoint pos = event->pos();
+    QPoint pos = event->position().toPoint();
     QPersistentModelIndex index = indexAt(pos);
 
     if (state() == EditingState) {
@@ -1949,12 +1949,12 @@ void QAbstractItemView::mouseDoubleClickEvent(QMouseEvent *event)
 {
     Q_D(QAbstractItemView);
 
-    QModelIndex index = indexAt(event->pos());
+    QModelIndex index = indexAt(event->position().toPoint());
     if (!index.isValid()
         || !d->isIndexEnabled(index)
         || (d->pressedIndex != index)) {
         QMouseEvent me(QEvent::MouseButtonPress,
-                       event->localPos(), event->windowPos(), event->screenPos(),
+                       event->position(), event->scenePosition(), event->globalPosition(),
                        event->button(), event->buttons(), event->modifiers(), event->source());
         mousePressEvent(&me);
         return;
@@ -2009,14 +2009,14 @@ void QAbstractItemView::dragMoveEvent(QDragMoveEvent *event)
     // ignore by default
     event->ignore();
 
-    QModelIndex index = indexAt(event->pos());
+    QModelIndex index = indexAt(event->position().toPoint());
     d->hover = index;
     if (!d->droppingOnItself(event, index)
         && d->canDrop(event)) {
 
         if (index.isValid() && d->showDropIndicator) {
             QRect rect = visualRect(index);
-            d->dropIndicatorPosition = d->position(event->pos(), rect, index);
+            d->dropIndicatorPosition = d->position(event->position().toPoint(), rect, index);
             switch (d->dropIndicatorPosition) {
             case AboveItem:
                 if (d->isIndexDropEnabled(index.parent())) {
@@ -2059,7 +2059,7 @@ void QAbstractItemView::dragMoveEvent(QDragMoveEvent *event)
         d->viewport->update();
     } // can drop
 
-    if (d->shouldAutoScroll(event->pos()))
+    if (d->shouldAutoScroll(event->position().toPoint()))
         startAutoScroll();
 }
 
@@ -2156,9 +2156,9 @@ bool QAbstractItemViewPrivate::dropOn(QDropEvent *event, int *dropRow, int *drop
 
     QModelIndex index;
     // rootIndex() (i.e. the viewport) might be a valid index
-    if (viewport->rect().contains(event->pos())) {
-        index = q->indexAt(event->pos());
-        if (!index.isValid() || !q->visualRect(index).contains(event->pos()))
+    if (viewport->rect().contains(event->position().toPoint())) {
+        index = q->indexAt(event->position().toPoint());
+        if (!index.isValid() || !q->visualRect(index).contains(event->position().toPoint()))
             index = root;
     }
 
@@ -2167,7 +2167,7 @@ bool QAbstractItemViewPrivate::dropOn(QDropEvent *event, int *dropRow, int *drop
         int row = -1;
         int col = -1;
         if (index != root) {
-            dropIndicatorPosition = position(event->pos(), q->visualRect(index), index);
+            dropIndicatorPosition = position(event->position().toPoint(), q->visualRect(index), index);
             switch (dropIndicatorPosition) {
             case QAbstractItemView::AboveItem:
                 row = index.row();
diff --git a/src/widgets/itemviews/qcolumnviewgrip.cpp b/src/widgets/itemviews/qcolumnviewgrip.cpp
index 00cd7df20a..424839d396 100644
--- a/src/widgets/itemviews/qcolumnviewgrip.cpp
+++ b/src/widgets/itemviews/qcolumnviewgrip.cpp
@@ -149,7 +149,7 @@ void QColumnViewGrip::mouseDoubleClickEvent(QMouseEvent *event)
 void QColumnViewGrip::mousePressEvent(QMouseEvent *event)
 {
     Q_D(QColumnViewGrip);
-    d->originalXLocation = event->globalX();
+    d->originalXLocation = event->globalPosition().toPoint().x();
     event->accept();
 }
 
@@ -160,7 +160,7 @@ void QColumnViewGrip::mousePressEvent(QMouseEvent *event)
 void QColumnViewGrip::mouseMoveEvent(QMouseEvent *event)
 {
     Q_D(QColumnViewGrip);
-    int offset = event->globalX() - d->originalXLocation;
+    int offset = event->globalPosition().toPoint().x() - d->originalXLocation;
     d->originalXLocation = moveGrip(offset) + d->originalXLocation;
     event->accept();
 }
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index fce0834628..e127f7bba4 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -2371,7 +2371,7 @@ bool QHeaderView::event(QEvent *e)
     switch (e->type()) {
     case QEvent::HoverEnter: {
         QHoverEvent *he = static_cast<QHoverEvent*>(e);
-        d->hover = logicalIndexAt(he->pos());
+        d->hover = logicalIndexAt(he->position().toPoint());
         if (d->hover != -1)
             updateSection(d->hover);
         break; }
@@ -2384,7 +2384,7 @@ bool QHeaderView::event(QEvent *e)
     case QEvent::HoverMove: {
         QHoverEvent *he = static_cast<QHoverEvent*>(e);
         int oldHover = d->hover;
-        d->hover = logicalIndexAt(he->pos());
+        d->hover = logicalIndexAt(he->position().toPoint());
         if (d->hover != oldHover) {
             if (oldHover != -1)
                 updateSection(oldHover);
@@ -2524,7 +2524,7 @@ void QHeaderView::mousePressEvent(QMouseEvent *e)
     Q_D(QHeaderView);
     if (d->state != QHeaderViewPrivate::NoState || e->button() != Qt::LeftButton)
         return;
-    int pos = d->orientation == Qt::Horizontal ? e->x() : e->y();
+    int pos = d->orientation == Qt::Horizontal ? e->position().toPoint().x() : e->position().toPoint().y();
     int handle = d->sectionHandleAt(pos);
     d->originalSize = -1; // clear the stored original size
     if (handle == -1) {
@@ -2566,7 +2566,7 @@ void QHeaderView::mousePressEvent(QMouseEvent *e)
 void QHeaderView::mouseMoveEvent(QMouseEvent *e)
 {
     Q_D(QHeaderView);
-    int pos = d->orientation == Qt::Horizontal ? e->x() : e->y();
+    int pos = d->orientation == Qt::Horizontal ? e->position().toPoint().x() : e->position().toPoint().y();
     if (pos < 0 && d->state != QHeaderViewPrivate::SelectSections)
         return;
     if (e->buttons() == Qt::NoButton) {
@@ -2594,7 +2594,7 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
             return;
         }
         case QHeaderViewPrivate::MoveSection: {
-            if (d->shouldAutoScroll(e->pos()))
+            if (d->shouldAutoScroll(e->position().toPoint()))
                 d->startAutoScroll();
             if (qAbs(pos - d->firstPos) >= QApplication::startDragDistance()
 #if QT_CONFIG(label)
@@ -2678,7 +2678,7 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
 void QHeaderView::mouseReleaseEvent(QMouseEvent *e)
 {
     Q_D(QHeaderView);
-    int pos = d->orientation == Qt::Horizontal ? e->x() : e->y();
+    int pos = d->orientation == Qt::Horizontal ? e->position().toPoint().x() : e->position().toPoint().y();
     switch (d->state) {
     case QHeaderViewPrivate::MoveSection:
         if (true
@@ -2731,7 +2731,7 @@ void QHeaderView::mouseReleaseEvent(QMouseEvent *e)
 void QHeaderView::mouseDoubleClickEvent(QMouseEvent *e)
 {
     Q_D(QHeaderView);
-    int pos = d->orientation == Qt::Horizontal ? e->x() : e->y();
+    int pos = d->orientation == Qt::Horizontal ? e->position().toPoint().x() : e->position().toPoint().y();
     int handle = d->sectionHandleAt(pos);
     if (handle > -1 && sectionResizeMode(handle) == Interactive) {
         emit sectionHandleDoubleClicked(handle);
@@ -2746,7 +2746,7 @@ void QHeaderView::mouseDoubleClickEvent(QMouseEvent *e)
         }
 #endif
     } else {
-        emit sectionDoubleClicked(logicalIndexAt(e->pos()));
+        emit sectionDoubleClicked(logicalIndexAt(e->position().toPoint()));
     }
 }
 
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index 407610336c..ddcc9a637e 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -1177,7 +1177,7 @@ bool QItemDelegate::editorEvent(QEvent *event,
         QRect emptyRect;
         doLayout(option, &checkRect, &emptyRect, &emptyRect, false);
         QMouseEvent *me = static_cast<QMouseEvent*>(event);
-        if (me->button() != Qt::LeftButton || !checkRect.contains(me->pos()))
+        if (me->button() != Qt::LeftButton || !checkRect.contains(me->position().toPoint()))
             return false;
 
         // eat the double click events inside the check rect
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index ed8fd88996..053b2dd959 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -785,7 +785,7 @@ void QListView::mouseMoveEvent(QMouseEvent *e)
         && d->showElasticBand
         && d->selectionMode != SingleSelection
         && d->selectionMode != NoSelection) {
-        QRect rect(d->pressedPosition, e->pos() + QPoint(horizontalOffset(), verticalOffset()));
+        QRect rect(d->pressedPosition, e->position().toPoint() + QPoint(horizontalOffset(), verticalOffset()));
         rect = rect.normalized();
         d->viewport->update(d->mapToViewport(rect.united(d->elasticBand)));
         d->elasticBand = rect;
@@ -2135,7 +2135,7 @@ void QListModeViewBase::dragMoveEvent(QDragMoveEvent *event)
     event->ignore();
 
     // can't use indexAt, doesn't account for spacing.
-    QPoint p = event->pos();
+    QPoint p = event->position().toPoint();
     QRect rect(p.x() + horizontalOffset(), p.y() + verticalOffset(), 1, 1);
     rect.adjust(-dd->spacing(), -dd->spacing(), dd->spacing(), dd->spacing());
     const QVector<QModelIndex> intersectVector = dd->intersectingSet(rect);
@@ -2147,7 +2147,7 @@ void QListModeViewBase::dragMoveEvent(QDragMoveEvent *event)
 
         if (index.isValid() && dd->showDropIndicator) {
             QRect rect = qq->visualRect(index);
-            dd->dropIndicatorPosition = position(event->pos(), rect, index);
+            dd->dropIndicatorPosition = position(event->position().toPoint(), rect, index);
             // if spacing, should try to draw between items, not just next to item.
             switch (dd->dropIndicatorPosition) {
             case QAbstractItemView::AboveItem:
@@ -2191,7 +2191,7 @@ void QListModeViewBase::dragMoveEvent(QDragMoveEvent *event)
         dd->viewport->update();
     } // can drop
 
-    if (dd->shouldAutoScroll(event->pos()))
+    if (dd->shouldAutoScroll(event->position().toPoint()))
         qq->startAutoScroll();
 }
 
@@ -2212,9 +2212,9 @@ bool QListModeViewBase::dropOn(QDropEvent *event, int *dropRow, int *dropCol, QM
         return false;
 
     QModelIndex index;
-    if (dd->viewport->rect().contains(event->pos())) {
+    if (dd->viewport->rect().contains(event->position().toPoint())) {
         // can't use indexAt, doesn't account for spacing.
-        QPoint p = event->pos();
+        QPoint p = event->position().toPoint();
         QRect rect(p.x() + horizontalOffset(), p.y() + verticalOffset(), 1, 1);
         rect.adjust(-dd->spacing(), -dd->spacing(), dd->spacing(), dd->spacing());
         const QVector<QModelIndex> intersectVector = dd->intersectingSet(rect);
@@ -2229,7 +2229,7 @@ bool QListModeViewBase::dropOn(QDropEvent *event, int *dropRow, int *dropCol, QM
         int row = -1;
         int col = -1;
         if (index != dd->root) {
-            dd->dropIndicatorPosition = position(event->pos(), qq->visualRect(index), index);
+            dd->dropIndicatorPosition = position(event->position().toPoint(), qq->visualRect(index), index);
             switch (dd->dropIndicatorPosition) {
             case QAbstractItemView::AboveItem:
                 row = index.row();
@@ -2896,7 +2896,7 @@ bool QIconModeViewBase::filterDropEvent(QDropEvent *e)
 
     const QSize contents = contentsSize;
     QPoint offset(horizontalOffset(), verticalOffset());
-    QPoint end = e->pos() + offset;
+    QPoint end = e->position().toPoint() + offset;
     if (qq->acceptDrops()) {
         const Qt::ItemFlags dropableFlags = Qt::ItemIsDropEnabled|Qt::ItemIsEnabled;
         const QVector<QModelIndex> &dropIndices = intersectingSet(QRect(end, QSize(1, 1)));
@@ -2957,17 +2957,17 @@ bool QIconModeViewBase::filterDragMoveEvent(QDragMoveEvent *e)
     QRect itemsRect = this->itemsRect(draggedItems);
     viewport()->update(itemsRect.translated(draggedItemsDelta()));
     // update position
-    draggedItemsPos = e->pos();
+    draggedItemsPos = e->position().toPoint();
     // get new items rect
     viewport()->update(itemsRect.translated(draggedItemsDelta()));
     // set the item under the cursor to current
     QModelIndex index;
     if (movement() == QListView::Snap) {
-        QRect rect(snapToGrid(e->pos() + offset()), gridSize());
+        QRect rect(snapToGrid(e->position().toPoint() + offset()), gridSize());
         const QVector<QModelIndex> intersectVector = intersectingSet(rect);
         index = intersectVector.count() > 0 ? intersectVector.last() : QModelIndex();
     } else {
-        index = qq->indexAt(e->pos());
+        index = qq->indexAt(e->position().toPoint());
     }
     // check if we allow drops here
     if (draggedItems.contains(index))
@@ -2978,7 +2978,7 @@ bool QIconModeViewBase::filterDragMoveEvent(QDragMoveEvent *e)
         e->accept(); // allow dropping in empty areas
 
     // the event was treated. do autoscrolling
-    if (dd->shouldAutoScroll(e->pos()))
+    if (dd->shouldAutoScroll(e->position().toPoint()))
         dd->startAutoScroll();
     return true;
 }
diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
index c685cc7f05..58f949656b 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.cpp
+++ b/src/widgets/itemviews/qstyleditemdelegate.cpp
@@ -612,7 +612,7 @@ bool QStyledItemDelegate::editorEvent(QEvent *event,
         initStyleOption(&viewOpt, index);
         QRect checkRect = style->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, widget);
         QMouseEvent *me = static_cast<QMouseEvent*>(event);
-        if (me->button() != Qt::LeftButton || !checkRect.contains(me->pos()))
+        if (me->button() != Qt::LeftButton || !checkRect.contains(me->position().toPoint()))
             return false;
 
         if ((event->type() == QEvent::MouseButtonPress)
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index e3d957d83c..6606b3f2f9 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -1297,8 +1297,8 @@ bool QTreeView::viewportEvent(QEvent *event)
     case QEvent::HoverMove: {
         QHoverEvent *he = static_cast<QHoverEvent*>(event);
         int oldBranch = d->hoverBranch;
-        d->hoverBranch = d->itemDecorationAt(he->pos());
-        QModelIndex newIndex = indexAt(he->pos());
+        d->hoverBranch = d->itemDecorationAt(he->position().toPoint());
+        QModelIndex newIndex = indexAt(he->position().toPoint());
         if (d->hover != newIndex || d->hoverBranch != oldBranch) {
             // Update the whole hovered over row. No need to update the old hovered
             // row, that is taken care in superclass hover handling.
@@ -1907,8 +1907,8 @@ void QTreeView::mousePressEvent(QMouseEvent *event)
     Q_D(QTreeView);
     bool handled = false;
     if (style()->styleHint(QStyle::SH_ListViewExpand_SelectMouseType, nullptr, this) == QEvent::MouseButtonPress)
-        handled = d->expandOrCollapseItemAtPos(event->pos());
-    if (!handled && d->itemDecorationAt(event->pos()) == -1)
+        handled = d->expandOrCollapseItemAtPos(event->position().toPoint());
+    if (!handled && d->itemDecorationAt(event->position().toPoint()) == -1)
         QAbstractItemView::mousePressEvent(event);
     else
         d->pressedIndex = QModelIndex();
@@ -1920,13 +1920,13 @@ void QTreeView::mousePressEvent(QMouseEvent *event)
 void QTreeView::mouseReleaseEvent(QMouseEvent *event)
 {
     Q_D(QTreeView);
-    if (d->itemDecorationAt(event->pos()) == -1) {
+    if (d->itemDecorationAt(event->position().toPoint()) == -1) {
         QAbstractItemView::mouseReleaseEvent(event);
     } else {
         if (state() == QAbstractItemView::DragSelectingState || state() == QAbstractItemView::DraggingState)
             setState(QAbstractItemView::NoState);
         if (style()->styleHint(QStyle::SH_ListViewExpand_SelectMouseType, nullptr, this) == QEvent::MouseButtonRelease)
-            d->expandOrCollapseItemAtPos(event->pos());
+            d->expandOrCollapseItemAtPos(event->position().toPoint());
     }
 }
 
@@ -1936,17 +1936,17 @@ void QTreeView::mouseReleaseEvent(QMouseEvent *event)
 void QTreeView::mouseDoubleClickEvent(QMouseEvent *event)
 {
     Q_D(QTreeView);
-    if (state() != NoState || !d->viewport->rect().contains(event->pos()))
+    if (state() != NoState || !d->viewport->rect().contains(event->position().toPoint()))
         return;
 
-    int i = d->itemDecorationAt(event->pos());
+    int i = d->itemDecorationAt(event->position().toPoint());
     if (i == -1) {
-        i = d->itemAtCoordinate(event->y());
+        i = d->itemAtCoordinate(event->position().toPoint().y());
         if (i == -1)
             return; // user clicked outside the items
 
         const QPersistentModelIndex firstColumnIndex = d->viewItems.at(i).index;
-        const QPersistentModelIndex persistent = indexAt(event->pos());
+        const QPersistentModelIndex persistent = indexAt(event->position().toPoint());
 
         if (d->pressedIndex != persistent) {
             mousePressEvent(event);
@@ -1995,7 +1995,7 @@ void QTreeView::mouseDoubleClickEvent(QMouseEvent *event)
 void QTreeView::mouseMoveEvent(QMouseEvent *event)
 {
     Q_D(QTreeView);
-    if (d->itemDecorationAt(event->pos()) == -1) // ### what about expanding/collapsing state ?
+    if (d->itemDecorationAt(event->position().toPoint()) == -1) // ### what about expanding/collapsing state ?
         QAbstractItemView::mouseMoveEvent(event);
 }