diff options
Diffstat (limited to 'examples/widgets')
23 files changed, 92 insertions, 92 deletions
diff --git a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp index 00671dcf7e..1b3774db4f 100644 --- a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp +++ b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp @@ -120,7 +120,7 @@ void DragWidget::dropEvent(QDropEvent *event) QLabel *newIcon = new QLabel(this); newIcon->setPixmap(pixmap); - newIcon->move(event->pos() - offset); + newIcon->move(event->position().toPoint() - offset); newIcon->show(); newIcon->setAttribute(Qt::WA_DeleteOnClose); @@ -138,7 +138,7 @@ void DragWidget::dropEvent(QDropEvent *event) //! [1] void DragWidget::mousePressEvent(QMouseEvent *event) { - QLabel *child = static_cast<QLabel*>(childAt(event->pos())); + QLabel *child = static_cast<QLabel*>(childAt(event->position().toPoint())); if (!child) return; @@ -146,7 +146,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event) QByteArray itemData; QDataStream dataStream(&itemData, QIODevice::WriteOnly); - dataStream << pixmap << QPoint(event->pos() - child->pos()); + dataStream << pixmap << QPoint(event->position().toPoint() - child->pos()); //! [1] //! [2] @@ -158,7 +158,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event) QDrag *drag = new QDrag(this); drag->setMimeData(mimeData); drag->setPixmap(pixmap); - drag->setHotSpot(event->pos() - child->pos()); + drag->setHotSpot(event->position().toPoint() - child->pos()); //! [3] QPixmap tempPixmap = pixmap; diff --git a/examples/widgets/draganddrop/draggabletext/dragwidget.cpp b/examples/widgets/draganddrop/draggabletext/dragwidget.cpp index 4a430ebf56..1f1889c7cf 100644 --- a/examples/widgets/draganddrop/draggabletext/dragwidget.cpp +++ b/examples/widgets/draganddrop/draggabletext/dragwidget.cpp @@ -114,7 +114,7 @@ void DragWidget::dropEvent(QDropEvent *event) const QMimeData *mime = event->mimeData(); QStringList pieces = mime->text().split(QRegularExpression(QStringLiteral("\\s+")), Qt::SkipEmptyParts); - QPoint position = event->pos(); + QPoint position = event->position().toPoint(); QPoint hotSpot; QByteArrayList hotSpotPos = mime->data(hotSpotMimeDataKey()).split(' '); @@ -149,11 +149,11 @@ void DragWidget::dropEvent(QDropEvent *event) void DragWidget::mousePressEvent(QMouseEvent *event) { - QLabel *child = qobject_cast<QLabel*>(childAt(event->pos())); + QLabel *child = qobject_cast<QLabel*>(childAt(event->position().toPoint())); if (!child) return; - QPoint hotSpot = event->pos() - child->pos(); + QPoint hotSpot = event->position().toPoint() - child->pos(); QMimeData *mimeData = new QMimeData; mimeData->setText(child->text()); diff --git a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp index a02b1cb42a..14e8a1a879 100644 --- a/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp +++ b/examples/widgets/draganddrop/fridgemagnets/dragwidget.cpp @@ -151,7 +151,7 @@ void DragWidget::dropEvent(QDropEvent *event) //! [10] //! [11] DragLabel *newLabel = new DragLabel(text, this); - newLabel->move(event->pos() - offset); + newLabel->move(event->position().toPoint() - offset); newLabel->show(); newLabel->setAttribute(Qt::WA_DeleteOnClose); @@ -165,7 +165,7 @@ void DragWidget::dropEvent(QDropEvent *event) } else if (event->mimeData()->hasText()) { QStringList pieces = event->mimeData()->text().split( QRegularExpression(QStringLiteral("\\s+")), Qt::SkipEmptyParts); - QPoint position = event->pos(); + QPoint position = event->position().toPoint(); for (const QString &piece : pieces) { DragLabel *newLabel = new DragLabel(piece, this); @@ -188,11 +188,11 @@ void DragWidget::mousePressEvent(QMouseEvent *event) { //! [13] //! [14] - DragLabel *child = static_cast<DragLabel*>(childAt(event->pos())); + DragLabel *child = static_cast<DragLabel*>(childAt(event->position().toPoint())); if (!child) return; - QPoint hotSpot = event->pos() - child->pos(); + QPoint hotSpot = event->position().toPoint() - child->pos(); QByteArray itemData; QDataStream dataStream(&itemData, QIODevice::WriteOnly); diff --git a/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp b/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp index 72f2662bce..06dda9c29f 100644 --- a/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp +++ b/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp @@ -90,12 +90,12 @@ void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event) void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event) { - QRect updateRect = highlightedRect.united(targetSquare(event->pos())); + QRect updateRect = highlightedRect.united(targetSquare(event->position().toPoint())); if (event->mimeData()->hasFormat(PiecesList::puzzleMimeType()) - && findPiece(targetSquare(event->pos())) == -1) { + && findPiece(targetSquare(event->position().toPoint())) == -1) { - highlightedRect = targetSquare(event->pos()); + highlightedRect = targetSquare(event->position().toPoint()); event->setDropAction(Qt::MoveAction); event->accept(); } else { @@ -109,12 +109,12 @@ void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event) void PuzzleWidget::dropEvent(QDropEvent *event) { if (event->mimeData()->hasFormat(PiecesList::puzzleMimeType()) - && findPiece(targetSquare(event->pos())) == -1) { + && findPiece(targetSquare(event->position().toPoint())) == -1) { QByteArray pieceData = event->mimeData()->data(PiecesList::puzzleMimeType()); QDataStream dataStream(&pieceData, QIODevice::ReadOnly); Piece piece; - piece.rect = targetSquare(event->pos()); + piece.rect = targetSquare(event->position().toPoint()); dataStream >> piece.pixmap >> piece.location; pieces.append(piece); @@ -147,7 +147,7 @@ int PuzzleWidget::findPiece(const QRect &pieceRect) const void PuzzleWidget::mousePressEvent(QMouseEvent *event) { - QRect square = targetSquare(event->pos()); + QRect square = targetSquare(event->position().toPoint()); const int found = findPiece(square); if (found == -1) @@ -170,12 +170,12 @@ void PuzzleWidget::mousePressEvent(QMouseEvent *event) QDrag *drag = new QDrag(this); drag->setMimeData(mimeData); - drag->setHotSpot(event->pos() - square.topLeft()); + drag->setHotSpot(event->position().toPoint() - square.topLeft()); drag->setPixmap(piece.pixmap); if (drag->exec(Qt::MoveAction) != Qt::MoveAction) { pieces.insert(found, piece); - update(targetSquare(event->pos())); + update(targetSquare(event->position().toPoint())); if (piece.location == square.topLeft() / pieceSize()) inPlace++; diff --git a/examples/widgets/effects/blurpicker/blurpicker.cpp b/examples/widgets/effects/blurpicker/blurpicker.cpp index a00af2144a..2b5995d870 100644 --- a/examples/widgets/effects/blurpicker/blurpicker.cpp +++ b/examples/widgets/effects/blurpicker/blurpicker.cpp @@ -152,7 +152,7 @@ void BlurPicker::resizeEvent(QResizeEvent * /* event */) void BlurPicker::mousePressEvent(QMouseEvent *event) { int delta = 0; - if(event->x() > (width() / 2)) + if (event->position().x() > (width() / 2)) { delta = 1; } diff --git a/examples/widgets/itemviews/chart/pieview.cpp b/examples/widgets/itemviews/chart/pieview.cpp index 457ed8b4ec..c640c78f3e 100644 --- a/examples/widgets/itemviews/chart/pieview.cpp +++ b/examples/widgets/itemviews/chart/pieview.cpp @@ -251,7 +251,7 @@ int PieView::horizontalOffset() const void PieView::mousePressEvent(QMouseEvent *event) { QAbstractItemView::mousePressEvent(event); - origin = event->pos(); + origin = event->position().toPoint(); if (!rubberBand) rubberBand = new QRubberBand(QRubberBand::Rectangle, viewport()); rubberBand->setGeometry(QRect(origin, QSize())); @@ -261,7 +261,7 @@ void PieView::mousePressEvent(QMouseEvent *event) void PieView::mouseMoveEvent(QMouseEvent *event) { if (rubberBand) - rubberBand->setGeometry(QRect(origin, event->pos()).normalized()); + rubberBand->setGeometry(QRect(origin, event->position().toPoint()).normalized()); QAbstractItemView::mouseMoveEvent(event); } diff --git a/examples/widgets/itemviews/puzzle/puzzlewidget.cpp b/examples/widgets/itemviews/puzzle/puzzlewidget.cpp index 974a972306..2c60d28946 100644 --- a/examples/widgets/itemviews/puzzle/puzzlewidget.cpp +++ b/examples/widgets/itemviews/puzzle/puzzlewidget.cpp @@ -86,12 +86,12 @@ void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event) void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event) { - QRect updateRect = highlightedRect.united(targetSquare(event->pos())); + QRect updateRect = highlightedRect.united(targetSquare(event->position().toPoint())); if (event->mimeData()->hasFormat("image/x-puzzle-piece") - && findPiece(targetSquare(event->pos())) == -1) { + && findPiece(targetSquare(event->position().toPoint())) == -1) { - highlightedRect = targetSquare(event->pos()); + highlightedRect = targetSquare(event->position().toPoint()); event->setDropAction(Qt::MoveAction); event->accept(); } else { @@ -105,12 +105,12 @@ void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event) void PuzzleWidget::dropEvent(QDropEvent *event) { if (event->mimeData()->hasFormat("image/x-puzzle-piece") - && findPiece(targetSquare(event->pos())) == -1) { + && findPiece(targetSquare(event->position().toPoint())) == -1) { QByteArray pieceData = event->mimeData()->data("image/x-puzzle-piece"); QDataStream dataStream(&pieceData, QIODevice::ReadOnly); Piece piece; - piece.rect = targetSquare(event->pos()); + piece.rect = targetSquare(event->position().toPoint()); dataStream >> piece.pixmap >> piece.location; pieces.append(piece); @@ -143,7 +143,7 @@ int PuzzleWidget::findPiece(const QRect &pieceRect) const void PuzzleWidget::mousePressEvent(QMouseEvent *event) { - QRect square = targetSquare(event->pos()); + QRect square = targetSquare(event->position().toPoint()); int found = findPiece(square); if (found == -1) @@ -166,12 +166,12 @@ void PuzzleWidget::mousePressEvent(QMouseEvent *event) QDrag *drag = new QDrag(this); drag->setMimeData(mimeData); - drag->setHotSpot(event->pos() - square.topLeft()); + drag->setHotSpot(event->position().toPoint() - square.topLeft()); drag->setPixmap(piece.pixmap); if (drag->exec(Qt::MoveAction) == Qt::IgnoreAction) { pieces.insert(found, piece); - update(targetSquare(event->pos())); + update(targetSquare(event->position().toPoint())); if (piece.location == QPoint(square.x() / pieceSize(), square.y() / pieceSize())) inPlace++; diff --git a/examples/widgets/itemviews/stardelegate/stareditor.cpp b/examples/widgets/itemviews/stardelegate/stareditor.cpp index 43706eeae0..72d687c05c 100644 --- a/examples/widgets/itemviews/stardelegate/stareditor.cpp +++ b/examples/widgets/itemviews/stardelegate/stareditor.cpp @@ -79,7 +79,7 @@ void StarEditor::paintEvent(QPaintEvent *) //! [2] void StarEditor::mouseMoveEvent(QMouseEvent *event) { - const int star = starAtPosition(event->x()); + const int star = starAtPosition(event->position().toPoint().x()); if (star != myStarRating.starCount() && star != -1) { myStarRating.setStarCount(star); diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp index a7e73debb6..233a9f14ba 100644 --- a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp +++ b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp @@ -628,7 +628,7 @@ void BlueTitleBar::paintEvent(QPaintEvent*) void BlueTitleBar::mouseReleaseEvent(QMouseEvent *event) { - QPoint pos = event->pos(); + QPoint pos = event->position().toPoint(); QRect rect = this->rect(); diff --git a/examples/widgets/painting/deform/pathdeform.cpp b/examples/widgets/painting/deform/pathdeform.cpp index 961d5e5e99..9ddc6ea12b 100644 --- a/examples/widgets/painting/deform/pathdeform.cpp +++ b/examples/widgets/painting/deform/pathdeform.cpp @@ -490,10 +490,10 @@ void PathDeformRenderer::mousePressEvent(QMouseEvent *e) m_repaintTimer.stop(); m_offset = QPointF(); - if (QLineF(m_pos, e->pos()).length() <= m_radius) - m_offset = m_pos - e->pos(); + if (QLineF(m_pos, e->position().toPoint()).length() <= m_radius) + m_offset = m_pos - e->position().toPoint(); - m_mousePress = e->pos(); + m_mousePress = e->position().toPoint(); // If we're not running in small screen mode, always assume we're dragging m_mouseDrag = !m_smallScreen; @@ -514,18 +514,18 @@ void PathDeformRenderer::mouseReleaseEvent(QMouseEvent *e) void PathDeformRenderer::mouseMoveEvent(QMouseEvent *e) { - if (!m_mouseDrag && (QLineF(m_mousePress, e->pos()).length() > 25.0) ) + if (!m_mouseDrag && (QLineF(m_mousePress, e->position().toPoint()).length() > 25.0) ) m_mouseDrag = true; if (m_mouseDrag) { QRect rectBefore = circle_bounds(m_pos, m_radius, m_fontSize); if (e->type() == QEvent::MouseMove) { - QLineF line(m_pos, e->pos() + m_offset); + QLineF line(m_pos, e->position().toPoint() + m_offset); line.setLength(line.length() * .1); QPointF dir(line.dx(), line.dy()); m_direction = (m_direction + dir) / 2; } - m_pos = e->pos() + m_offset; + m_pos = e->position().toPoint() + m_offset; #if QT_CONFIG(opengl) if (usesOpenGL()) { update(); diff --git a/examples/widgets/painting/pathstroke/pathstroke.cpp b/examples/widgets/painting/pathstroke/pathstroke.cpp index 7dab6f95a2..439bcb2cd0 100644 --- a/examples/widgets/painting/pathstroke/pathstroke.cpp +++ b/examples/widgets/painting/pathstroke/pathstroke.cpp @@ -559,7 +559,7 @@ void PathStrokeRenderer::mousePressEvent(QMouseEvent *e) m_activePoint = -1; qreal distance = -1; for (int i = 0; i < m_points.size(); ++i) { - qreal d = QLineF(e->pos(), m_points.at(i)).length(); + qreal d = QLineF(e->position().toPoint(), m_points.at(i)).length(); if ((distance < 0 && d < 8 * m_pointSize) || d < distance) { distance = d; m_activePoint = i; @@ -574,7 +574,7 @@ void PathStrokeRenderer::mousePressEvent(QMouseEvent *e) // If we're not running in small screen mode, always assume we're dragging m_mouseDrag = !m_smallScreen; - m_mousePress = e->pos(); + m_mousePress = e->position().toPoint(); } void PathStrokeRenderer::mouseMoveEvent(QMouseEvent *e) @@ -582,11 +582,11 @@ void PathStrokeRenderer::mouseMoveEvent(QMouseEvent *e) if (!m_fingerPointMapping.isEmpty()) return; // If we've moved more then 25 pixels, assume user is dragging - if (!m_mouseDrag && QPoint(m_mousePress - e->pos()).manhattanLength() > 25) + if (!m_mouseDrag && QPoint(m_mousePress - e->position().toPoint()).manhattanLength() > 25) m_mouseDrag = true; if (m_mouseDrag && m_activePoint >= 0 && m_activePoint < m_points.size()) { - m_points[m_activePoint] = e->pos(); + m_points[m_activePoint] = e->position().toPoint(); update(); } } @@ -638,7 +638,7 @@ bool PathStrokeRenderer::event(QEvent *e) if (activePoints.contains(i)) continue; - qreal d = QLineF(touchPoint.pos(), m_points.at(i)).length(); + qreal d = QLineF(touchPoint.position(), m_points.at(i)).length(); if ((distance < 0 && d < 12 * m_pointSize) || d < distance) { distance = d; activePoint = i; @@ -646,7 +646,7 @@ bool PathStrokeRenderer::event(QEvent *e) } if (activePoint != -1) { m_fingerPointMapping.insert(touchPoint.id(), activePoint); - m_points[activePoint] = touchPoint.pos(); + m_points[activePoint] = touchPoint.position(); } break; } @@ -654,7 +654,7 @@ bool PathStrokeRenderer::event(QEvent *e) { // move the point and release QHash<int,int>::iterator it = m_fingerPointMapping.find(id); - m_points[it.value()] = touchPoint.pos(); + m_points[it.value()] = touchPoint.position(); m_fingerPointMapping.erase(it); break; } @@ -663,7 +663,7 @@ bool PathStrokeRenderer::event(QEvent *e) // move the point const int pointIdx = m_fingerPointMapping.value(id, -1); if (pointIdx >= 0) - m_points[pointIdx] = touchPoint.pos(); + m_points[pointIdx] = touchPoint.position(); break; } default: diff --git a/examples/widgets/painting/shared/hoverpoints.cpp b/examples/widgets/painting/shared/hoverpoints.cpp index f834f315f9..9fe947cedc 100644 --- a/examples/widgets/painting/shared/hoverpoints.cpp +++ b/examples/widgets/painting/shared/hoverpoints.cpp @@ -102,7 +102,7 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event) return true; QMouseEvent *me = (QMouseEvent *) event; - QPointF clickPos = me->pos(); + QPointF clickPos = me->position().toPoint(); int index = -1; for (int i=0; i<m_points.size(); ++i) { QPainterPath path; @@ -170,7 +170,7 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event) if (!m_fingerPointMapping.isEmpty()) return true; if (m_currentIndex >= 0) - movePoint(m_currentIndex, ((QMouseEvent *)event)->pos()); + movePoint(m_currentIndex, ((QMouseEvent *)event)->position().toPoint()); break; case QEvent::TouchBegin: case QEvent::TouchUpdate: @@ -197,7 +197,7 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event) if (activePoints.contains(i)) continue; - qreal d = QLineF(touchPoint.pos(), m_points.at(i)).length(); + qreal d = QLineF(touchPoint.position(), m_points.at(i)).length(); if ((distance < 0 && d < 12 * pointSize) || d < distance) { distance = d; activePoint = i; @@ -207,7 +207,7 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event) } if (activePoint != -1) { m_fingerPointMapping.insert(touchPoint.id(), activePoint); - movePoint(activePoint, touchPoint.pos()); + movePoint(activePoint, touchPoint.position()); } } break; @@ -215,7 +215,7 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event) { // move the point and release QHash<int,int>::iterator it = m_fingerPointMapping.find(id); - movePoint(it.value(), touchPoint.pos()); + movePoint(it.value(), touchPoint.position()); m_fingerPointMapping.erase(it); } break; @@ -224,7 +224,7 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event) // move the point const int pointIdx = m_fingerPointMapping.value(id, -1); if (pointIdx >= 0) // do we track this point? - movePoint(pointIdx, touchPoint.pos()); + movePoint(pointIdx, touchPoint.position()); } break; default: diff --git a/examples/widgets/tools/plugandpaint/app/paintarea.cpp b/examples/widgets/tools/plugandpaint/app/paintarea.cpp index 92b8ea4777..e3292e3b91 100644 --- a/examples/widgets/tools/plugandpaint/app/paintarea.cpp +++ b/examples/widgets/tools/plugandpaint/app/paintarea.cpp @@ -137,7 +137,7 @@ void PaintArea::mousePressEvent(QMouseEvent *event) gradient.setColorAt(1.0, QColor(color.red(), color.green(), color.blue(), 191)); painter.setBrush(gradient); - painter.translate(event->pos() - boundingRect.center()); + painter.translate(event->position().toPoint() - boundingRect.center()); painter.drawPath(pendingPath); pendingPath = QPainterPath(); @@ -150,11 +150,11 @@ void PaintArea::mousePressEvent(QMouseEvent *event) QPainter painter(&theImage); setupPainter(painter); const QRect rect = brushInterface->mousePress(brush, painter, - event->pos()); + event->position().toPoint()); update(rect); } - lastPos = event->pos(); + lastPos = event->position().toPoint(); } } } @@ -167,11 +167,11 @@ void PaintArea::mouseMoveEvent(QMouseEvent *event) QPainter painter(&theImage); setupPainter(painter); const QRect rect = brushInterface->mouseMove(brush, painter, lastPos, - event->pos()); + event->position().toPoint()); update(rect); } - lastPos = event->pos(); + lastPos = event->position().toPoint(); } } //! [1] @@ -183,7 +183,7 @@ void PaintArea::mouseReleaseEvent(QMouseEvent *event) QPainter painter(&theImage); setupPainter(painter); QRect rect = brushInterface->mouseRelease(brush, painter, - event->pos()); + event->position().toPoint()); update(rect); } diff --git a/examples/widgets/tools/undo/document.cpp b/examples/widgets/tools/undo/document.cpp index 2deed83a99..339a63abae 100644 --- a/examples/widgets/tools/undo/document.cpp +++ b/examples/widgets/tools/undo/document.cpp @@ -283,17 +283,17 @@ int Document::indexAt(const QPoint &pos) const void Document::mousePressEvent(QMouseEvent *event) { event->accept(); - int index = indexAt(event->pos());; + int index = indexAt(event->position().toPoint());; if (index != -1) { setCurrentShape(index); const Shape &shape = m_shapeList.at(index); - m_resizeHandlePressed = shape.resizeHandle().contains(event->pos()); + m_resizeHandlePressed = shape.resizeHandle().contains(event->position().toPoint()); if (m_resizeHandlePressed) - m_mousePressOffset = shape.rect().bottomRight() - event->pos(); + m_mousePressOffset = shape.rect().bottomRight() - event->position().toPoint(); else - m_mousePressOffset = event->pos() - shape.rect().topLeft(); + m_mousePressOffset = event->position().toPoint() - shape.rect().topLeft(); } m_mousePressIndex = index; } @@ -315,10 +315,10 @@ void Document::mouseMoveEvent(QMouseEvent *event) QRect rect; if (m_resizeHandlePressed) { - rect = QRect(shape.rect().topLeft(), event->pos() + m_mousePressOffset); + rect = QRect(shape.rect().topLeft(), event->position().toPoint() + m_mousePressOffset); } else { rect = shape.rect(); - rect.moveTopLeft(event->pos() - m_mousePressOffset); + rect.moveTopLeft(event->position().toPoint() - m_mousePressOffset); } QSize size = rect.size().expandedTo(Shape::minSize); diff --git a/examples/widgets/touch/fingerpaint/scribblearea.cpp b/examples/widgets/touch/fingerpaint/scribblearea.cpp index 4af0ec8e7e..ed06545b43 100644 --- a/examples/widgets/touch/fingerpaint/scribblearea.cpp +++ b/examples/widgets/touch/fingerpaint/scribblearea.cpp @@ -216,13 +216,13 @@ bool ScribbleArea::event(QEvent *event) QPainter painter(&image); painter.setPen(Qt::NoPen); painter.setBrush(myPenColors.at(touchPoint.id() % myPenColors.count())); - painter.drawEllipse(touchPoint.pos(), diams.width() / 2, diams.height() / 2); + painter.drawEllipse(touchPoint.position(), diams.width() / 2, diams.height() / 2); painter.end(); modified = true; const int rad = 2; QRectF rect(QPointF(), diams); - rect.moveCenter(touchPoint.pos()); + rect.moveCenter(touchPoint.position()); update(rect.toRect().adjusted(-rad,-rad, +rad, +rad)); } break; diff --git a/examples/widgets/touch/knobs/knob.cpp b/examples/widgets/touch/knobs/knob.cpp index 12aaa1e948..659ba82f45 100644 --- a/examples/widgets/touch/knobs/knob.cpp +++ b/examples/widgets/touch/knobs/knob.cpp @@ -82,7 +82,7 @@ bool Knob::sceneEvent(QEvent *event) const QTouchEvent::TouchPoint &touchPoint2 = touchEvent->touchPoints().last(); QLineF line1(touchPoint1.lastScenePos(), touchPoint2.lastScenePos()); - QLineF line2(touchPoint1.scenePos(), touchPoint2.scenePos()); + QLineF line2(touchPoint1.scenePosition(), touchPoint2.scenePosition()); setTransform(QTransform().rotate(line2.angleTo(line1)), true); } diff --git a/examples/widgets/touch/pinchzoom/graphicsview.cpp b/examples/widgets/touch/pinchzoom/graphicsview.cpp index 6412f350a7..e1ce42f93f 100644 --- a/examples/widgets/touch/pinchzoom/graphicsview.cpp +++ b/examples/widgets/touch/pinchzoom/graphicsview.cpp @@ -74,8 +74,8 @@ bool GraphicsView::viewportEvent(QEvent *event) const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first(); const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last(); qreal currentScaleFactor = - QLineF(touchPoint0.pos(), touchPoint1.pos()).length() - / QLineF(touchPoint0.startPos(), touchPoint1.startPos()).length(); + QLineF(touchPoint0.position(), touchPoint1.position()).length() + / QLineF(touchPoint0.pressPosition(), touchPoint1.pressPosition()).length(); if (touchEvent->touchPointStates() & Qt::TouchPointReleased) { // if one of the fingers is released, remember the current scale // factor so that adding another finger later will continue zooming diff --git a/examples/widgets/widgets/charactermap/characterwidget.cpp b/examples/widgets/widgets/charactermap/characterwidget.cpp index 41406b7fb4..422177ffa8 100644 --- a/examples/widgets/widgets/charactermap/characterwidget.cpp +++ b/examples/widgets/widgets/charactermap/characterwidget.cpp @@ -120,14 +120,14 @@ QSize CharacterWidget::sizeHint() const //! [4] void CharacterWidget::mouseMoveEvent(QMouseEvent *event) { - QPoint widgetPosition = mapFromGlobal(event->globalPos()); + QPoint widgetPosition = mapFromGlobal(event->globalPosition().toPoint()); uint key = (widgetPosition.y() / squareSize) * columns + widgetPosition.x() / squareSize; QString text = QString::fromLatin1("<p>Character: <span style=\"font-size: 24pt; font-family: %1\">").arg(displayFont.family()) + QChar(key) + QString::fromLatin1("</span><p>Value: 0x") + QString::number(key, 16); - QToolTip::showText(event->globalPos(), text, this); + QToolTip::showText(event->globalPosition().toPoint(), text, this); } //! [4] @@ -135,7 +135,7 @@ void CharacterWidget::mouseMoveEvent(QMouseEvent *event) void CharacterWidget::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { - lastKey = (event->y() / squareSize) * columns + event->x() / squareSize; + lastKey = (event->position().toPoint().y() / squareSize) * columns + event->position().toPoint().x() / squareSize; if (QChar(lastKey).category() != QChar::Other_NotAssigned) emit characterSelected(QString(QChar(lastKey))); update(); diff --git a/examples/widgets/widgets/scribble/scribblearea.cpp b/examples/widgets/widgets/scribble/scribblearea.cpp index d3937f90d8..2ac293d55a 100644 --- a/examples/widgets/widgets/scribble/scribblearea.cpp +++ b/examples/widgets/widgets/scribble/scribblearea.cpp @@ -132,7 +132,7 @@ void ScribbleArea::mousePressEvent(QMouseEvent *event) //! [11] //! [12] { if (event->button() == Qt::LeftButton) { - lastPoint = event->pos(); + lastPoint = event->position().toPoint(); scribbling = true; } } @@ -140,13 +140,13 @@ void ScribbleArea::mousePressEvent(QMouseEvent *event) void ScribbleArea::mouseMoveEvent(QMouseEvent *event) { if ((event->buttons() & Qt::LeftButton) && scribbling) - drawLineTo(event->pos()); + drawLineTo(event->position().toPoint()); } void ScribbleArea::mouseReleaseEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton && scribbling) { - drawLineTo(event->pos()); + drawLineTo(event->position().toPoint()); scribbling = false; } } diff --git a/examples/widgets/widgets/shapedclock/shapedclock.cpp b/examples/widgets/widgets/shapedclock/shapedclock.cpp index 673d1a218f..343ad7c43c 100644 --- a/examples/widgets/widgets/shapedclock/shapedclock.cpp +++ b/examples/widgets/widgets/shapedclock/shapedclock.cpp @@ -82,7 +82,7 @@ ShapedClock::ShapedClock(QWidget *parent) void ShapedClock::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { - dragPosition = event->globalPos() - frameGeometry().topLeft(); + dragPosition = event->globalPosition().toPoint() - frameGeometry().topLeft(); event->accept(); } } @@ -92,7 +92,7 @@ void ShapedClock::mousePressEvent(QMouseEvent *event) void ShapedClock::mouseMoveEvent(QMouseEvent *event) { if (event->buttons() & Qt::LeftButton) { - move(event->globalPos() - dragPosition); + move(event->globalPosition().toPoint() - dragPosition); event->accept(); } } diff --git a/examples/widgets/widgets/tablet/tabletcanvas.cpp b/examples/widgets/widgets/tablet/tabletcanvas.cpp index 90a5017500..f3f2b0cac6 100644 --- a/examples/widgets/widgets/tablet/tabletcanvas.cpp +++ b/examples/widgets/widgets/tablet/tabletcanvas.cpp @@ -99,7 +99,7 @@ void TabletCanvas::tabletEvent(QTabletEvent *event) case QEvent::TabletPress: if (!m_deviceDown) { m_deviceDown = true; - lastPoint.pos = event->posF(); + lastPoint.pos = event->position(); lastPoint.pressure = event->pressure(); lastPoint.rotation = event->rotation(); } @@ -113,7 +113,7 @@ void TabletCanvas::tabletEvent(QTabletEvent *event) updateBrush(event); QPainter painter(&m_pixmap); paintPixmap(painter, event); - lastPoint.pos = event->posF(); + lastPoint.pos = event->position(); lastPoint.pressure = event->pressure(); lastPoint.rotation = event->rotation(); } @@ -173,8 +173,8 @@ void TabletCanvas::paintPixmap(QPainter &painter, QTabletEvent *event) grad.setColorAt(0.5, Qt::transparent); painter.setBrush(grad); qreal radius = grad.radius(); - painter.drawEllipse(event->posF(), radius, radius); - update(QRect(event->pos() - QPoint(radius, radius), QSize(radius * 2, radius * 2))); + painter.drawEllipse(event->position(), radius, radius); + update(QRect(event->position().toPoint() - QPoint(radius, radius), QSize(radius * 2, radius * 2))); } break; case QTabletEvent::RotationStylus: @@ -191,8 +191,8 @@ void TabletCanvas::paintPixmap(QPainter &painter, QTabletEvent *event) halfWidth = m_pen.widthF(); brushAdjust = QPointF(qSin(qDegreesToRadians(-event->rotation())) * halfWidth, qCos(qDegreesToRadians(-event->rotation())) * halfWidth); - poly << event->posF() - brushAdjust; - poly << event->posF() + brushAdjust; + poly << event->position() - brushAdjust; + poly << event->position() + brushAdjust; painter.drawConvexPolygon(poly); update(poly.boundingRect().toRect()); } @@ -223,8 +223,8 @@ void TabletCanvas::paintPixmap(QPainter &painter, QTabletEvent *event) Q_FALLTHROUGH(); case QTabletEvent::Stylus: painter.setPen(m_pen); - painter.drawLine(lastPoint.pos, event->posF()); - update(QRect(lastPoint.pos.toPoint(), event->pos()).normalized() + painter.drawLine(lastPoint.pos, event->position()); + update(QRect(lastPoint.pos.toPoint(), event->position().toPoint()).normalized() .adjusted(-maxPenRadius, -maxPenRadius, maxPenRadius, maxPenRadius)); break; } diff --git a/examples/widgets/widgets/tooltips/sortingbox.cpp b/examples/widgets/widgets/tooltips/sortingbox.cpp index d06fbe1756..d993b098b2 100644 --- a/examples/widgets/widgets/tooltips/sortingbox.cpp +++ b/examples/widgets/widgets/tooltips/sortingbox.cpp @@ -159,10 +159,10 @@ void SortingBox::paintEvent(QPaintEvent * /* event */) void SortingBox::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { - int index = itemAt(event->pos()); + int index = itemAt(event->position().toPoint()); if (index != -1) { itemInMotion = &shapeItems[index]; - previousPosition = event->pos(); + previousPosition = event->position().toPoint(); shapeItems.move(index, shapeItems.size() - 1); update(); } @@ -174,7 +174,7 @@ void SortingBox::mousePressEvent(QMouseEvent *event) void SortingBox::mouseMoveEvent(QMouseEvent *event) { if ((event->buttons() & Qt::LeftButton) && itemInMotion) - moveItemTo(event->pos()); + moveItemTo(event->position().toPoint()); } //! [12] @@ -182,7 +182,7 @@ void SortingBox::mouseMoveEvent(QMouseEvent *event) void SortingBox::mouseReleaseEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton && itemInMotion) { - moveItemTo(event->pos()); + moveItemTo(event->position().toPoint()); itemInMotion = nullptr; } } diff --git a/examples/widgets/windowcontainer/windowcontainer.cpp b/examples/widgets/windowcontainer/windowcontainer.cpp index f7c146e2a9..a104949d1e 100644 --- a/examples/widgets/windowcontainer/windowcontainer.cpp +++ b/examples/widgets/windowcontainer/windowcontainer.cpp @@ -100,7 +100,7 @@ public: if (!m_mouseDown) { m_mouseDown = true; m_polygon.clear(); - m_polygon.append(e->pos()); + m_polygon.append(e->position().toPoint()); renderLater(); } } @@ -108,7 +108,7 @@ public: void mouseMoveEvent(QMouseEvent *e) override { if (m_mouseDown) { - m_polygon.append(e->pos()); + m_polygon.append(e->position().toPoint()); renderLater(); } } @@ -117,7 +117,7 @@ public: { if (m_mouseDown) { m_mouseDown = false; - m_polygon.append(e->pos()); + m_polygon.append(e->position().toPoint()); renderLater(); } } |