diff options
Diffstat (limited to 'src/widgets/widgets')
30 files changed, 151 insertions, 151 deletions
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 9c08ed65ab..5ced1397b8 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -976,7 +976,7 @@ void QAbstractButton::mousePressEvent(QMouseEvent *e) e->ignore(); return; } - if (hitButton(e->pos())) { + if (hitButton(e->position().toPoint())) { setDown(true); d->pressed = true; repaint(); @@ -1006,7 +1006,7 @@ void QAbstractButton::mouseReleaseEvent(QMouseEvent *e) return; } - if (hitButton(e->pos())) { + if (hitButton(e->position().toPoint())) { d->repeatTimer.stop(); d->click(); e->accept(); @@ -1025,7 +1025,7 @@ void QAbstractButton::mouseMoveEvent(QMouseEvent *e) return; } - if (hitButton(e->pos()) != d->down) { + if (hitButton(e->position().toPoint()) != d->down) { setDown(!d->down); repaint(); if (d->down) @@ -1033,7 +1033,7 @@ void QAbstractButton::mouseMoveEvent(QMouseEvent *e) else d->emitReleased(); e->accept(); - } else if (!hitButton(e->pos())) { + } else if (!hitButton(e->position().toPoint())) { e->ignore(); } } diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index 8f9e06eeb8..2a51bafa01 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -795,7 +795,7 @@ bool QAbstractSpinBox::event(QEvent *event) case QEvent::HoverEnter: case QEvent::HoverLeave: case QEvent::HoverMove: - d->updateHoverControl(static_cast<const QHoverEvent *>(event)->pos()); + d->updateHoverControl(static_cast<const QHoverEvent *>(event)->position().toPoint()); break; case QEvent::ShortcutOverride: if (d->edit->event(event)) @@ -1359,7 +1359,7 @@ void QAbstractSpinBox::mouseMoveEvent(QMouseEvent *event) { Q_D(QAbstractSpinBox); - d->updateHoverControl(event->pos()); + d->updateHoverControl(event->position().toPoint()); // If we have a timer ID, update the state if (d->spinClickTimerId != -1 && d->buttonSymbols != NoButtons) { @@ -1386,7 +1386,7 @@ void QAbstractSpinBox::mousePressEvent(QMouseEvent *event) return; } - d->updateHoverControl(event->pos()); + d->updateHoverControl(event->position().toPoint()); event->accept(); const StepEnabled se = (d->buttonSymbols == NoButtons) ? StepEnabled(StepNone) : stepEnabled(); diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index aa822fb1b6..9cb107fb8f 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -1485,7 +1485,7 @@ QDate QCalendarView::handleMouseEvent(QMouseEvent *event) if (!calendarModel) return QDate(); - QPoint pos = event->pos(); + QPoint pos = event->position().toPoint(); QModelIndex index = indexAt(pos); QDate date = calendarModel->dateForCell(index.row(), index.column()); if (date.isValid() && date >= calendarModel->m_minimumDate @@ -3145,7 +3145,7 @@ bool QCalendarWidget::eventFilter(QObject *watched, QEvent *event) if (!widget || widget->window() != tlw) return QWidget::eventFilter(watched, event); - QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->pos()); + QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->position().toPoint()); QRect geom = QRect(d->yearEdit->mapTo(tlw, QPoint(0, 0)), d->yearEdit->size()); if (!geom.contains(mousePos)) { event->accept(); diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp index b06ae82249..2e9a404157 100644 --- a/src/widgets/widgets/qcheckbox.cpp +++ b/src/widgets/widgets/qcheckbox.cpp @@ -325,7 +325,7 @@ void QCheckBox::mouseMoveEvent(QMouseEvent *e) if (testAttribute(Qt::WA_Hover)) { bool hit = false; if (underMouse()) - hit = hitButton(e->pos()); + hit = hitButton(e->position().toPoint()); if (hit != d->hovering) { update(rect()); diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 05724e3d92..3125e001d9 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -780,10 +780,10 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e) if (isVisible()) { QMouseEvent *m = static_cast<QMouseEvent *>(e); QWidget *widget = static_cast<QWidget *>(o); - QPoint vector = widget->mapToGlobal(m->pos()) - initialClickPosition; + QPoint vector = widget->mapToGlobal(m->position().toPoint()) - initialClickPosition; if (vector.manhattanLength() > 9 && blockMouseReleaseTimer.isActive()) blockMouseReleaseTimer.stop(); - QModelIndex indexUnderMouse = view->indexAt(m->pos()); + QModelIndex indexUnderMouse = view->indexAt(m->position().toPoint()); if (indexUnderMouse.isValid() && !QComboBoxDelegate::isSeparator(indexUnderMouse)) { view->setCurrentIndex(indexUnderMouse); @@ -797,7 +797,7 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e) bool ignoreEvent = maybeIgnoreMouseButtonRelease && popupTimer.elapsed() < QApplication::doubleClickInterval(); QMouseEvent *m = static_cast<QMouseEvent *>(e); - if (isVisible() && view->rect().contains(m->pos()) && view->currentIndex().isValid() + if (isVisible() && view->rect().contains(m->position().toPoint()) && view->currentIndex().isValid() && !blockMouseReleaseTimer.isActive() && !ignoreEvent && (view->currentIndex().flags() & Qt::ItemIsEnabled) && (view->currentIndex().flags() & Qt::ItemIsSelectable)) { @@ -838,7 +838,7 @@ void QComboBoxPrivateContainer::mousePressEvent(QMouseEvent *e) opt.subControls = QStyle::SC_All; opt.activeSubControls = QStyle::SC_ComboBoxArrow; QStyle::SubControl sc = combo->style()->hitTestComplexControl(QStyle::CC_ComboBox, &opt, - combo->mapFromGlobal(e->globalPos()), + combo->mapFromGlobal(e->globalPosition().toPoint()), combo); if ((combo->isEditable() && sc == QStyle::SC_ComboBoxArrow) || (!combo->isEditable() && sc != QStyle::SC_None)) @@ -3072,7 +3072,7 @@ bool QComboBox::event(QEvent *event) case QEvent::HoverLeave: case QEvent::HoverMove: if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event)) - d->updateHoverControl(he->pos()); + d->updateHoverControl(he->position().toPoint()); break; case QEvent::ShortcutOverride: if (d->lineEdit) @@ -3111,7 +3111,7 @@ void QComboBoxPrivate::showPopupFromMouseEvent(QMouseEvent *e) Q_Q(QComboBox); QStyleOptionComboBox opt; q->initStyleOption(&opt); - QStyle::SubControl sc = q->style()->hitTestComplexControl(QStyle::CC_ComboBox, &opt, e->pos(), q); + QStyle::SubControl sc = q->style()->hitTestComplexControl(QStyle::CC_ComboBox, &opt, e->position().toPoint(), q); if (e->button() == Qt::LeftButton && !(sc == QStyle::SC_None && e->type() == QEvent::MouseButtonRelease) @@ -3127,7 +3127,7 @@ void QComboBoxPrivate::showPopupFromMouseEvent(QMouseEvent *e) #endif // We've restricted the next couple of lines, because by not calling // viewContainer(), we avoid creating the QComboBoxPrivateContainer. - viewContainer()->initialClickPosition = q->mapToGlobal(e->pos()); + viewContainer()->initialClickPosition = q->mapToGlobal(e->position().toPoint()); } q->showPopup(); // The code below ensures that regular mousepress and pick item still works diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index 44936af9fc..c1771a8958 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -178,8 +178,8 @@ protected: void mouseMoveEvent(QMouseEvent *e) override { // Enable fast scrolling if the cursor is directly above or below the popup. - const int mouseX = e->pos().x(); - const int mouseY = e->pos().y(); + const int mouseX = e->position().toPoint().x(); + const int mouseY = e->position().toPoint().y(); const bool horizontallyInside = pos().x() < mouseX && mouseX < rect().right() + 1; const bool verticallyOutside = (sliderAction == QAbstractSlider::SliderSingleStepAdd) ? rect().bottom() + 1 < mouseY : mouseY < pos().y(); diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 5d64aad040..a438555183 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -1528,7 +1528,7 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event) QAbstractSpinBox::mousePressEvent(event); return; } - d->updateHoverControl(event->pos()); + d->updateHoverControl(event->position().toPoint()); if (d->hoverControl == QStyle::SC_ComboBoxArrow) { event->accept(); if (d->readOnly) { @@ -2712,7 +2712,7 @@ void QCalendarPopup::mousePressEvent(QMouseEvent *event) QRect arrowRect = dateTime->style()->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, dateTime); arrowRect.moveTo(dateTime->mapToGlobal(arrowRect .topLeft())); - if (arrowRect.contains(event->globalPos()) || rect().contains(event->pos())) + if (arrowRect.contains(event->globalPosition().toPoint()) || rect().contains(event->position().toPoint())) setAttribute(Qt::WA_NoMouseReplay); } QWidget::mousePressEvent(event); diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index 7dd469faae..934be4fb6e 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -280,7 +280,7 @@ void QDial::mousePressEvent(QMouseEvent *e) return; } e->accept(); - setSliderPosition(d->valueFromPoint(e->pos())); + setSliderPosition(d->valueFromPoint(e->position().toPoint())); // ### This isn't quite right, // we should be doing a hit test and only setting this if it's // the actual dial thingie (similar to what QSlider does), but we have no @@ -302,7 +302,7 @@ void QDial::mouseReleaseEvent(QMouseEvent * e) return; } e->accept(); - setValue(d->valueFromPoint(e->pos())); + setValue(d->valueFromPoint(e->position().toPoint())); setSliderDown(false); } @@ -320,7 +320,7 @@ void QDial::mouseMoveEvent(QMouseEvent * e) } e->accept(); d->doNotEmit = true; - setSliderPosition(d->valueFromPoint(e->pos())); + setSliderPosition(d->valueFromPoint(e->position().toPoint())); d->doNotEmit = false; } diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 102f370488..8ffb0a3b9e 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -918,7 +918,7 @@ bool QDockWidgetPrivate::mousePressEvent(QMouseEvent *event) QDockWidgetGroupWindow *floatingTab = qobject_cast<QDockWidgetGroupWindow*>(parent); if (event->button() != Qt::LeftButton || - !titleArea.contains(event->pos()) || + !titleArea.contains(event->position().toPoint()) || // check if the tool window is movable... do nothing if it // is not (but allow moving if the window is floating) (!hasFeature(this, QDockWidget::DockWidgetMovable) && !q->isFloating()) || @@ -927,7 +927,7 @@ bool QDockWidgetPrivate::mousePressEvent(QMouseEvent *event) return false; } - initDrag(event->pos(), false); + initDrag(event->position().toPoint(), false); if (state) state->ctrlDrag = (hasFeature(this, QDockWidget::DockWidgetFloatable) && event->modifiers() & Qt::ControlModifier) || @@ -947,7 +947,7 @@ bool QDockWidgetPrivate::mouseDoubleClickEvent(QMouseEvent *event) if (!dwLayout->nativeWindowDeco()) { QRect titleArea = dwLayout->titleArea(); - if (event->button() == Qt::LeftButton && titleArea.contains(event->pos()) && + if (event->button() == Qt::LeftButton && titleArea.contains(event->position().toPoint()) && hasFeature(this, QDockWidget::DockWidgetFloatable)) { _q_toggleTopLevel(); return true; @@ -971,7 +971,7 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event) if (!dwlayout->nativeWindowDeco()) { if (!state->dragging && mwlayout->pluggingWidget == nullptr - && (event->pos() - state->pressPos).manhattanLength() + && (event->position().toPoint() - state->pressPos).manhattanLength() > QApplication::startDragDistance()) { startDrag(); q->grabMouse(); @@ -982,7 +982,7 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event) if (state->dragging && !state->nca) { QMargins windowMargins = q->window()->windowHandle()->frameMargins(); QPoint windowMarginOffset = QPoint(windowMargins.left(), windowMargins.top()); - QPoint pos = event->globalPos() - state->pressPos - windowMarginOffset; + QPoint pos = event->globalPosition().toPoint() - state->pressPos - windowMarginOffset; QDockWidgetGroupWindow *floatingTab = qobject_cast<QDockWidgetGroupWindow*>(parent); if (floatingTab && !q->isFloating()) @@ -991,7 +991,7 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event) q->move(pos); if (state && !state->ctrlDrag) - mwlayout->hover(state->widgetItem, event->globalPos()); + mwlayout->hover(state->widgetItem, event->globalPosition().toPoint()); ret = true; } @@ -1031,7 +1031,7 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event) switch (event->type()) { case QEvent::NonClientAreaMouseButtonPress: - if (!titleRect.contains(event->globalPos())) + if (!titleRect.contains(event->globalPosition().toPoint())) break; if (state != nullptr) break; @@ -1039,7 +1039,7 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event) break; if (isAnimating()) break; - initDrag(event->pos(), true); + initDrag(event->position().toPoint(), true); if (state == nullptr) break; state->ctrlDrag = (event->modifiers() & Qt::ControlModifier) || diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 02a0bed325..8945139115 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -339,7 +339,7 @@ bool QGroupBox::event(QEvent *e) case QEvent::HoverEnter: case QEvent::HoverMove: { QStyle::SubControl control = style()->hitTestComplexControl(QStyle::CC_GroupBox, &box, - static_cast<QHoverEvent *>(e)->pos(), + static_cast<QHoverEvent *>(e)->position().toPoint(), this); bool oldHover = d->hover; d->hover = d->checkable && (control == QStyle::SC_GroupBoxLabel || control == QStyle::SC_GroupBoxCheckBox); @@ -702,7 +702,7 @@ void QGroupBox::mousePressEvent(QMouseEvent *event) QStyleOptionGroupBox box; initStyleOption(&box); d->pressedControl = style()->hitTestComplexControl(QStyle::CC_GroupBox, &box, - event->pos(), this); + event->position().toPoint(), this); if (d->checkable && (d->pressedControl & (QStyle::SC_GroupBoxCheckBox | QStyle::SC_GroupBoxLabel))) { d->overCheckBox = true; update(style()->subControlRect(QStyle::CC_GroupBox, &box, QStyle::SC_GroupBoxCheckBox, this)); @@ -718,7 +718,7 @@ void QGroupBox::mouseMoveEvent(QMouseEvent *event) QStyleOptionGroupBox box; initStyleOption(&box); QStyle::SubControl pressed = style()->hitTestComplexControl(QStyle::CC_GroupBox, &box, - event->pos(), this); + event->position().toPoint(), this); bool oldOverCheckBox = d->overCheckBox; d->overCheckBox = (pressed == QStyle::SC_GroupBoxCheckBox || pressed == QStyle::SC_GroupBoxLabel); if (d->checkable && (d->pressedControl == QStyle::SC_GroupBoxCheckBox || d->pressedControl == QStyle::SC_GroupBoxLabel) @@ -744,7 +744,7 @@ void QGroupBox::mouseReleaseEvent(QMouseEvent *event) QStyleOptionGroupBox box; initStyleOption(&box); QStyle::SubControl released = style()->hitTestComplexControl(QStyle::CC_GroupBox, &box, - event->pos(), this); + event->position().toPoint(), this); bool toggle = d->checkable && (released == QStyle::SC_GroupBoxLabel || released == QStyle::SC_GroupBoxCheckBox); d->pressedControl = QStyle::SC_None; diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index f252139a67..cd9a8c4eec 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -1513,7 +1513,7 @@ void QLineEdit::mousePressEvent(QMouseEvent* e) { Q_D(QLineEdit); - d->mousePressPos = e->pos(); + d->mousePressPos = e->position().toPoint(); if (d->sendMouseEventToInputContext(e)) return; @@ -1527,7 +1527,7 @@ void QLineEdit::mousePressEvent(QMouseEvent* e) d->control->completer()->complete(); } #endif - if (d->tripleClickTimer.isActive() && (e->pos() - d->tripleClick).manhattanLength() < + if (d->tripleClickTimer.isActive() && (e->position().toPoint() - d->tripleClick).manhattanLength() < QApplication::startDragDistance()) { selectAll(); return; @@ -1536,10 +1536,10 @@ void QLineEdit::mousePressEvent(QMouseEvent* e) #ifdef Q_OS_ANDROID mark = mark && (d->imHints & Qt::ImhNoPredictiveText); #endif // Q_OS_ANDROID - int cursor = d->xToPos(e->pos().x()); + int cursor = d->xToPos(e->position().toPoint().x()); #if QT_CONFIG(draganddrop) if (!mark && d->dragEnabled && d->control->echoMode() == Normal && - e->button() == Qt::LeftButton && d->inSelection(e->pos().x())) { + e->button() == Qt::LeftButton && d->inSelection(e->position().toPoint().x())) { if (!d->dndTimer.isActive()) d->dndTimer.start(QApplication::startDragTime(), this); } else @@ -1558,7 +1558,7 @@ void QLineEdit::mouseMoveEvent(QMouseEvent * e) if (e->buttons() & Qt::LeftButton) { #if QT_CONFIG(draganddrop) if (d->dndTimer.isActive()) { - if ((d->mousePressPos - e->pos()).manhattanLength() > QApplication::startDragDistance()) + if ((d->mousePressPos - e->position().toPoint()).manhattanLength() > QApplication::startDragDistance()) d->drag(); } else #endif @@ -1569,26 +1569,26 @@ void QLineEdit::mouseMoveEvent(QMouseEvent * e) const bool select = (d->imHints & Qt::ImhNoPredictiveText); #endif #ifndef QT_NO_IM - if (d->mouseYThreshold > 0 && e->pos().y() > d->mousePressPos.y() + d->mouseYThreshold) { + if (d->mouseYThreshold > 0 && e->position().toPoint().y() > d->mousePressPos.y() + d->mouseYThreshold) { if (layoutDirection() == Qt::RightToLeft) d->control->home(select); else d->control->end(select); - } else if (d->mouseYThreshold > 0 && e->pos().y() + d->mouseYThreshold < d->mousePressPos.y()) { + } else if (d->mouseYThreshold > 0 && e->position().toPoint().y() + d->mouseYThreshold < d->mousePressPos.y()) { if (layoutDirection() == Qt::RightToLeft) d->control->end(select); else d->control->home(select); } else if (d->control->composeMode() && select) { int startPos = d->xToPos(d->mousePressPos.x()); - int currentPos = d->xToPos(e->pos().x()); + int currentPos = d->xToPos(e->position().toPoint().x()); if (startPos != currentPos) d->control->setSelection(startPos, currentPos - startPos); } else #endif { - d->control->moveCursor(d->xToPos(e->pos().x()), select); + d->control->moveCursor(d->xToPos(e->position().toPoint().x()), select); } } } @@ -1623,7 +1623,7 @@ void QLineEdit::mouseReleaseEvent(QMouseEvent* e) } #endif - if (!isReadOnly() && rect().contains(e->pos())) + if (!isReadOnly() && rect().contains(e->position().toPoint())) d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus); d->clickCausedFocus = 0; } @@ -1635,7 +1635,7 @@ void QLineEdit::mouseDoubleClickEvent(QMouseEvent* e) Q_D(QLineEdit); if (e->button() == Qt::LeftButton) { - int position = d->xToPos(e->pos().x()); + int position = d->xToPos(e->position().toPoint().x()); // exit composition mode #ifndef QT_NO_IM @@ -1669,7 +1669,7 @@ void QLineEdit::mouseDoubleClickEvent(QMouseEvent* e) d->control->selectWordAtPos(position); d->tripleClickTimer.start(QApplication::doubleClickInterval(), this); - d->tripleClick = e->pos(); + d->tripleClick = e->position().toPoint(); } else { d->sendMouseEventToInputContext(e); } @@ -2075,7 +2075,7 @@ void QLineEdit::dragMoveEvent(QDragMoveEvent *e) Q_D(QLineEdit); if (!d->control->isReadOnly() && e->mimeData()->hasFormat(QLatin1String("text/plain"))) { e->acceptProposedAction(); - d->control->moveCursor(d->xToPos(e->pos().x()), false); + d->control->moveCursor(d->xToPos(e->position().toPoint().x()), false); d->cursorVisible = true; update(); } @@ -2106,7 +2106,7 @@ void QLineEdit::dropEvent(QDropEvent* e) if (!str.isNull() && !d->control->isReadOnly()) { if (e->source() == this && e->dropAction() == Qt::CopyAction) deselect(); - int cursorPos = d->xToPos(e->pos().x()); + int cursorPos = d->xToPos(e->position().toPoint().x()); int selStart = cursorPos; int oldSelStart = d->control->selectionStart(); int oldSelEnd = d->control->selectionEnd(); diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 4d444a3516..bd700e09f3 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -302,7 +302,7 @@ bool QLineEditPrivate::sendMouseEventToInputContext( QMouseEvent *e ) { #if !defined QT_NO_IM if ( control->composeMode() ) { - int tmp_cursor = xToPos(e->pos().x()); + int tmp_cursor = xToPos(e->position().toPoint().x()); int mousePos = tmp_cursor - control->cursor(); if ( mousePos < 0 || mousePos > control->preeditAreaText().length() ) mousePos = -1; diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 158521e13f..e23c491eea 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -1713,7 +1713,7 @@ void QMainWindowTabBar::mouseMoveEvent(QMouseEvent *e) int offset = QApplication::startDragDistance() + 1; offset *= 3; QRect r = rect().adjusted(-offset, -offset, offset, offset); - if (d->dragInProgress && !r.contains(e->pos()) && d->validIndex(d->pressedIndex)) { + if (d->dragInProgress && !r.contains(e->position().toPoint()) && d->validIndex(d->pressedIndex)) { QMainWindowLayout* mlayout = qt_mainwindow_layout(mainWindow); QDockAreaLayoutInfo *info = mlayout->dockInfo(this); Q_ASSERT(info); @@ -1743,7 +1743,7 @@ void QMainWindowTabBar::mouseMoveEvent(QMouseEvent *e) if (draggingDock) { QDockWidgetPrivate *dockPriv = static_cast<QDockWidgetPrivate *>(QObjectPrivate::get(draggingDock)); if (dockPriv->state && dockPriv->state->dragging) { - QPoint pos = e->globalPos() - dockPriv->state->pressPos; + QPoint pos = e->globalPosition().toPoint() - dockPriv->state->pressPos; draggingDock->move(pos); // move will call QMainWindowLayout::hover } diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index ab95258e78..16d1145b7e 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -210,7 +210,7 @@ bool QMainWindowLayoutSeparatorHelper<Layout>::windowEvent(QEvent *event) #if QT_CONFIG(cursor) case QEvent::HoverMove: { - adjustCursor(static_cast<QHoverEvent *>(event)->pos()); + adjustCursor(static_cast<QHoverEvent *>(event)->position().toPoint()); break; } @@ -228,7 +228,7 @@ bool QMainWindowLayoutSeparatorHelper<Layout>::windowEvent(QEvent *event) case QEvent::MouseButtonPress: { QMouseEvent *e = static_cast<QMouseEvent *>(event); - if (e->button() == Qt::LeftButton && startSeparatorMove(e->pos())) { + if (e->button() == Qt::LeftButton && startSeparatorMove(e->position().toPoint())) { // The click was on a separator, eat this event e->accept(); return true; @@ -240,10 +240,10 @@ bool QMainWindowLayoutSeparatorHelper<Layout>::windowEvent(QEvent *event) QMouseEvent *e = static_cast<QMouseEvent *>(event); #if QT_CONFIG(cursor) - adjustCursor(e->pos()); + adjustCursor(e->position().toPoint()); #endif if (e->buttons() & Qt::LeftButton) { - if (separatorMove(e->pos())) { + if (separatorMove(e->position().toPoint())) { // We're moving a separator, eat this event e->accept(); return true; @@ -255,7 +255,7 @@ bool QMainWindowLayoutSeparatorHelper<Layout>::windowEvent(QEvent *event) case QEvent::MouseButtonRelease: { QMouseEvent *e = static_cast<QMouseEvent *>(event); - if (endSeparatorMove(e->pos())) { + if (endSeparatorMove(e->position().toPoint())) { // We've released a separator, eat this event e->accept(); return true; diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index e6fd021e4a..dc65317de8 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -589,7 +589,7 @@ void QMdiAreaTabBar::mousePressEvent(QMouseEvent *event) return; } - QMdiSubWindow *subWindow = subWindowFromIndex(tabAt(event->pos())); + QMdiSubWindow *subWindow = subWindowFromIndex(tabAt(event->position().toPoint())); if (!subWindow) { event->ignore(); return; diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index ddc11cd470..82f72065e0 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -613,7 +613,7 @@ void ControllerWidget::mousePressEvent(QMouseEvent *event) event->ignore(); return; } - activeControl = getSubControl(event->pos()); + activeControl = getSubControl(event->position().toPoint()); update(); } @@ -627,7 +627,7 @@ void ControllerWidget::mouseReleaseEvent(QMouseEvent *event) return; } - QStyle::SubControl under_mouse = getSubControl(event->pos()); + QStyle::SubControl under_mouse = getSubControl(event->position().toPoint()); if (under_mouse == activeControl) { switch (activeControl) { case QStyle::SC_MdiCloseButton: @@ -653,7 +653,7 @@ void ControllerWidget::mouseReleaseEvent(QMouseEvent *event) */ void ControllerWidget::mouseMoveEvent(QMouseEvent *event) { - QStyle::SubControl under_mouse = getSubControl(event->pos()); + QStyle::SubControl under_mouse = getSubControl(event->position().toPoint()); //test if hover state changes if (hoverControl != under_mouse) { hoverControl = under_mouse; @@ -2659,12 +2659,12 @@ bool QMdiSubWindow::eventFilter(QObject *object, QEvent *event) if (d->systemMenu && d->systemMenu == object) { if (event->type() == QEvent::MouseButtonDblClick) { const QMouseEvent *mouseEvent = static_cast<const QMouseEvent *>(event); - const QAction *action = d->systemMenu->actionAt(mouseEvent->pos()); + const QAction *action = d->systemMenu->actionAt(mouseEvent->position().toPoint()); if (!action || action->isEnabled()) close(); } else if (event->type() == QEvent::MouseMove) { QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event); - d->hoveredSubControl = d->getSubControl(mapFromGlobal(mouseEvent->globalPos())); + d->hoveredSubControl = d->getSubControl(mapFromGlobal(mouseEvent->globalPosition().toPoint())); } else if (event->type() == QEvent::Hide) { d->activeSubControl = QStyle::SC_None; update(QRegion(0, 0, width(), d->titleBarHeight())); @@ -2678,7 +2678,7 @@ bool QMdiSubWindow::eventFilter(QObject *object, QEvent *event) if (event->type() != QEvent::MouseButtonPress || !testOption(QMdiSubWindow::RubberBandResize)) return QWidget::eventFilter(object, event); const QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event); - d->mousePressPosition = parentWidget()->mapFromGlobal(mouseEvent->globalPos()); + d->mousePressPosition = parentWidget()->mapFromGlobal(mouseEvent->globalPosition().toPoint()); d->oldGeometry = geometry(); d->currentOperation = isLeftToRight() ? QMdiSubWindowPrivate::BottomRightResize : QMdiSubWindowPrivate::BottomLeftResize; @@ -3173,7 +3173,7 @@ void QMdiSubWindow::mousePressEvent(QMouseEvent *mouseEvent) if (d->currentOperation != QMdiSubWindowPrivate::None) { d->updateCursor(); - d->mousePressPosition = mapToParent(mouseEvent->pos()); + d->mousePressPosition = mapToParent(mouseEvent->position().toPoint()); if (d->resizeEnabled || d->moveEnabled) d->oldGeometry = geometry(); #if QT_CONFIG(rubberband) @@ -3264,10 +3264,10 @@ void QMdiSubWindow::mouseReleaseEvent(QMouseEvent *mouseEvent) d->oldGeometry = geometry(); } - d->currentOperation = d->getOperation(mouseEvent->pos()); + d->currentOperation = d->getOperation(mouseEvent->position().toPoint()); d->updateCursor(); - d->hoveredSubControl = d->getSubControl(mouseEvent->pos()); + d->hoveredSubControl = d->getSubControl(mouseEvent->position().toPoint()); if (d->activeSubControl != QStyle::SC_None && d->activeSubControl == d->hoveredSubControl) { d->processClickedSubControl(); @@ -3292,7 +3292,7 @@ void QMdiSubWindow::mouseMoveEvent(QMouseEvent *mouseEvent) // Find previous and current hover region. const QStyleOptionTitleBar options = d->titleBarOptions(); QStyle::SubControl oldHover = d->hoveredSubControl; - d->hoveredSubControl = d->getSubControl(mouseEvent->pos()); + d->hoveredSubControl = d->getSubControl(mouseEvent->position().toPoint()); QRegion hoverRegion; if (isHoverControl(oldHover) && oldHover != d->hoveredSubControl) hoverRegion += style()->subControlRect(QStyle::CC_TitleBar, &options, oldHover, this); @@ -3312,13 +3312,13 @@ void QMdiSubWindow::mouseMoveEvent(QMouseEvent *mouseEvent) if ((d->isResizeOperation() && d->resizeEnabled) || (d->isMoveOperation() && d->moveEnabled)) { // As setNewGeometry moves the window, it invalidates the pos() value of any mouse move events that are // currently queued in the event loop. Map to parent using globalPos() instead. - d->setNewGeometry(parentWidget()->mapFromGlobal(mouseEvent->globalPos())); + d->setNewGeometry(parentWidget()->mapFromGlobal(mouseEvent->globalPosition().toPoint())); } return; } // Do not resize/move if not allowed. - d->currentOperation = d->getOperation(mouseEvent->pos()); + d->currentOperation = d->getOperation(mouseEvent->position().toPoint()); if ((d->isResizeOperation() && !d->resizeEnabled) || (d->isMoveOperation() && !d->moveEnabled)) d->currentOperation = QMdiSubWindowPrivate::None; d->updateCursor(); diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 7b72379d40..fdfa9b327f 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1303,7 +1303,7 @@ void QMenuPrivate::scrollMenu(QMenuScroller::ScrollDirection direction, bool pag bool QMenuPrivate::mouseEventTaken(QMouseEvent *e) { Q_Q(QMenu); - QPoint pos = q->mapFromGlobal(e->globalPos()); + QPoint pos = q->mapFromGlobal(e->globalPosition().toPoint()); QStyle *style = q->style(); QStyleOption opt(0); @@ -1342,7 +1342,7 @@ bool QMenuPrivate::mouseEventTaken(QMouseEvent *e) if (scroll && scroll->scrollFlags & QMenuPrivate::QMenuScroller::ScrollUp) tearRect.translate(0, scrollerHeight()); q->update(tearRect); - if (tearRect.contains(pos) && hasMouseMoved(e->globalPos())) { + if (tearRect.contains(pos) && hasMouseMoved(e->globalPosition().toPoint())) { setCurrentAction(nullptr); tearoffHighlighted = 1; if (e->type() == QEvent::MouseButtonRelease) { @@ -1357,13 +1357,13 @@ bool QMenuPrivate::mouseEventTaken(QMouseEvent *e) tearoffHighlighted = 0; } - if (q->frameGeometry().contains(e->globalPos())) + if (q->frameGeometry().contains(e->globalPosition().toPoint())) return false; //otherwise if the event is in our rect we want it.. for(QWidget *caused = causedPopup.widget; caused;) { bool passOnEvent = false; QWidget *next_widget = nullptr; - QPoint cpos = caused->mapFromGlobal(e->globalPos()); + QPoint cpos = caused->mapFromGlobal(e->globalPosition().toPoint()); #if QT_CONFIG(menubar) if (QMenuBar *mb = qobject_cast<QMenuBar*>(caused)) { passOnEvent = mb->rect().contains(cpos); @@ -1375,7 +1375,7 @@ bool QMenuPrivate::mouseEventTaken(QMouseEvent *e) } if (passOnEvent) { if (e->type() != QEvent::MouseButtonRelease || mouseDown == caused) { - QMouseEvent new_e(e->type(), cpos, caused->mapTo(caused->topLevelWidget(), cpos), e->screenPos(), + QMouseEvent new_e(e->type(), cpos, caused->mapTo(caused->topLevelWidget(), cpos), e->globalPosition(), e->button(), e->buttons(), e->modifiers(), e->source()); QCoreApplication::sendEvent(caused, &new_e); return true; @@ -2934,9 +2934,9 @@ void QMenu::mousePressEvent(QMouseEvent *e) // and mouse clicks on second screen, e->pos() is QPoint(0,0) and the menu doesn't hide. This trick makes // possible to hide the menu when mouse clicks on another screen (e->screenPos() returns correct value). // Only when mouse clicks in QPoint(0,0) on second screen, the menu doesn't hide. - if ((e->pos().isNull() && !e->screenPos().isNull()) || !rect().contains(e->pos())) { + if ((e->position().toPoint().isNull() && !e->globalPosition().isNull()) || !rect().contains(e->position().toPoint())) { if (d->noReplayFor - && QRect(d->noReplayFor->mapToGlobal(QPoint()), d->noReplayFor->size()).contains(e->globalPos())) + && QRect(d->noReplayFor->mapToGlobal(QPoint()), d->noReplayFor->size()).contains(e->globalPosition().toPoint())) setAttribute(Qt::WA_NoMouseReplay); if (d->eventLoop) // synchronous operation d->syncAction = nullptr; @@ -2945,7 +2945,7 @@ void QMenu::mousePressEvent(QMouseEvent *e) } QMenuPrivate::mouseDown = this; - QAction *action = d->actionAt(e->pos()); + QAction *action = d->actionAt(e->position().toPoint()); d->setCurrentAction(action, 20); update(); } @@ -2965,7 +2965,7 @@ void QMenu::mouseReleaseEvent(QMouseEvent *e) QMenuPrivate::mouseDown = nullptr; d->setSyncAction(); - QAction *action = d->actionAt(e->pos()); + QAction *action = d->actionAt(e->position().toPoint()); if (action && action == d->currentAction) { if (!action->menu()){ @@ -2975,7 +2975,7 @@ void QMenu::mouseReleaseEvent(QMouseEvent *e) #endif d->activateAction(action, QAction::Trigger); } - } else if ((!action || action->isEnabled()) && d->hasMouseMoved(e->globalPos())) { + } else if ((!action || action->isEnabled()) && d->hasMouseMoved(e->globalPosition().toPoint())) { d->hideUpToMenuBar(); } } @@ -3485,9 +3485,9 @@ void QMenu::mouseMoveEvent(QMouseEvent *e) if (d->motions == 0) return; - d->hasHadMouse = d->hasHadMouse || rect().contains(e->pos()); + d->hasHadMouse = d->hasHadMouse || rect().contains(e->position().toPoint()); - QAction *action = d->actionAt(e->pos()); + QAction *action = d->actionAt(e->position().toPoint()); if ((!action || action->isSeparator()) && !d->sloppyState.enabled()) { if (d->hasHadMouse || (!d->currentAction || !d->currentAction->menu() || !d->currentAction->menu()->isVisible())) { @@ -3502,7 +3502,7 @@ void QMenu::mouseMoveEvent(QMouseEvent *e) if (d->activeMenu) d->activeMenu->d_func()->setCurrentAction(nullptr); - QMenuSloppyState::MouseEventResult sloppyEventResult = d->sloppyState.processMouseEvent(e->localPos(), action, d->currentAction); + QMenuSloppyState::MouseEventResult sloppyEventResult = d->sloppyState.processMouseEvent(e->position(), action, d->currentAction); if (sloppyEventResult == QMenuSloppyState::EventShouldBePropagated) { d->setCurrentAction(action, d->mousePopupDelay); } else if (sloppyEventResult == QMenuSloppyState::EventDiscardsSloppyState) { diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index b45a6b5b01..b7c071bfcd 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -1053,12 +1053,12 @@ void QMenuBar::mousePressEvent(QMouseEvent *e) d->mouseDown = true; - QAction *action = d->actionAt(e->pos()); + QAction *action = d->actionAt(e->position().toPoint()); if (!action || !d->isVisible(action) || !action->isEnabled()) { d->setCurrentAction(nullptr); #if QT_CONFIG(whatsthis) if (QWhatsThis::inWhatsThisMode()) - QWhatsThis::showText(e->globalPos(), d->whatsThis, this); + QWhatsThis::showText(e->globalPosition().toPoint(), d->whatsThis, this); #endif return; } @@ -1084,7 +1084,7 @@ void QMenuBar::mouseReleaseEvent(QMouseEvent *e) return; d->mouseDown = false; - QAction *action = d->actionAt(e->pos()); + QAction *action = d->actionAt(e->position().toPoint()); // do noting if the action is hidden if (!d->isVisible(action)) @@ -1222,7 +1222,7 @@ void QMenuBar::mouseMoveEvent(QMouseEvent *e) } bool popupState = d->popupState || d->mouseDown; - QAction *action = d->actionAt(e->pos()); + QAction *action = d->actionAt(e->position().toPoint()); if ((action && d->isVisible(action)) || !popupState) d->setCurrentAction(action, popupState); } diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index c33b99432a..58203ba921 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -2091,7 +2091,7 @@ void QPlainTextEdit::mouseMoveEvent(QMouseEvent *e) { Q_D(QPlainTextEdit); d->inDrag = false; // paranoia - const QPoint pos = e->pos(); + const QPoint pos = e->position().toPoint(); d->sendControlEvent(e); if (!(e->buttons() & Qt::LeftButton)) return; @@ -2115,7 +2115,7 @@ void QPlainTextEdit::mouseReleaseEvent(QMouseEvent *e) d->ensureCursorVisible(); } - if (!isReadOnly() && rect().contains(e->pos())) + if (!isReadOnly() && rect().contains(e->position().toPoint())) d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus); d->clickCausedFocus = 0; } @@ -2186,7 +2186,7 @@ void QPlainTextEdit::dragLeaveEvent(QDragLeaveEvent *e) void QPlainTextEdit::dragMoveEvent(QDragMoveEvent *e) { Q_D(QPlainTextEdit); - d->autoScrollDragPos = e->pos(); + d->autoScrollDragPos = e->position().toPoint(); if (!d->autoScrollTimer.isActive()) d->autoScrollTimer.start(100, this); d->sendControlEvent(e); diff --git a/src/widgets/widgets/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp index 103f3ac441..8e880a3f35 100644 --- a/src/widgets/widgets/qradiobutton.cpp +++ b/src/widgets/widgets/qradiobutton.cpp @@ -226,7 +226,7 @@ void QRadioButton::mouseMoveEvent(QMouseEvent *e) if (testAttribute(Qt::WA_Hover)) { bool hit = false; if (underMouse()) - hit = hitButton(e->pos()); + hit = hitButton(e->position().toPoint()); if (hit != d->hovering) { update(); diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index 188ee7c25c..59575b9f2b 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -468,7 +468,7 @@ bool QScrollBar::event(QEvent *event) case QEvent::HoverLeave: case QEvent::HoverMove: if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event)) - d_func()->updateHoverControl(he->pos()); + d_func()->updateHoverControl(he->position().toPoint()); break; case QEvent::StyleChange: d_func()->setTransient(style()->styleHint(QStyle::SH_ScrollBar_Transient, nullptr, this)); @@ -559,12 +559,12 @@ void QScrollBar::mousePressEvent(QMouseEvent *e) || !(e->button() == Qt::LeftButton || (midButtonAbsPos && e->button() == Qt::MidButton))) return; - d->pressedControl = style()->hitTestComplexControl(QStyle::CC_ScrollBar, &opt, e->pos(), this); + d->pressedControl = style()->hitTestComplexControl(QStyle::CC_ScrollBar, &opt, e->position().toPoint(), this); d->pointerOutsidePressedControl = false; QRect sr = style()->subControlRect(QStyle::CC_ScrollBar, &opt, QStyle::SC_ScrollBarSlider, this); - QPoint click = e->pos(); + QPoint click = e->position().toPoint(); QPoint pressValue = click - sr.center() + sr.topLeft(); d->pressValue = d->orientation == Qt::Horizontal ? d->pixelPosToRangeValue(pressValue.x()) : d->pixelPosToRangeValue(pressValue.y()); @@ -579,8 +579,8 @@ void QScrollBar::mousePressEvent(QMouseEvent *e) || (style()->styleHint(QStyle::SH_ScrollBar_LeftClickAbsolutePosition, &opt, this) && e->button() == Qt::LeftButton))) { int sliderLength = HORIZONTAL ? sr.width() : sr.height(); - setSliderPosition(d->pixelPosToRangeValue((HORIZONTAL ? e->pos().x() - : e->pos().y()) - sliderLength / 2)); + setSliderPosition(d->pixelPosToRangeValue((HORIZONTAL ? e->position().toPoint().x() + : e->position().toPoint().y()) - sliderLength / 2)); d->pressedControl = QStyle::SC_ScrollBarSlider; d->clickOffset = sliderLength / 2; } @@ -636,13 +636,13 @@ void QScrollBar::mouseMoveEvent(QMouseEvent *e) return; if (d->pressedControl == QStyle::SC_ScrollBarSlider) { - QPoint click = e->pos(); + QPoint click = e->position().toPoint(); int newPosition = d->pixelPosToRangeValue((HORIZONTAL ? click.x() : click.y()) -d->clickOffset); int m = style()->pixelMetric(QStyle::PM_MaximumDragDistance, &opt, this); if (m >= 0) { QRect r = rect(); r.adjust(-m, -m, m, m); - if (! r.contains(e->pos())) + if (! r.contains(e->position().toPoint())) newPosition = d->snapBackPosition; } setSliderPosition(newPosition); @@ -650,7 +650,7 @@ void QScrollBar::mouseMoveEvent(QMouseEvent *e) if (style()->styleHint(QStyle::SH_ScrollBar_RollBetweenButtons, &opt, this) && d->pressedControl & (QStyle::SC_ScrollBarAddLine | QStyle::SC_ScrollBarSubLine)) { - QStyle::SubControl newSc = style()->hitTestComplexControl(QStyle::CC_ScrollBar, &opt, e->pos(), this); + QStyle::SubControl newSc = style()->hitTestComplexControl(QStyle::CC_ScrollBar, &opt, e->position().toPoint(), this); if (newSc == d->pressedControl && !d->pointerOutsidePressedControl) return; // nothing to do if (newSc & (QStyle::SC_ScrollBarAddLine | QStyle::SC_ScrollBarSubLine)) { @@ -667,7 +667,7 @@ void QScrollBar::mouseMoveEvent(QMouseEvent *e) // stop scrolling when the mouse pointer leaves a control // similar to push buttons QRect pr = style()->subControlRect(QStyle::CC_ScrollBar, &opt, d->pressedControl, this); - if (pr.contains(e->pos()) == d->pointerOutsidePressedControl) { + if (pr.contains(e->position().toPoint()) == d->pointerOutsidePressedControl) { if ((d->pointerOutsidePressedControl = !d->pointerOutsidePressedControl)) { d->pointerOutsidePressedControl = true; setRepeatAction(SliderNoAction); diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp index 68fd3ddce1..396503566c 100644 --- a/src/widgets/widgets/qsizegrip.cpp +++ b/src/widgets/widgets/qsizegrip.cpp @@ -279,7 +279,7 @@ void QSizeGrip::mousePressEvent(QMouseEvent * e) Q_D(QSizeGrip); QWidget *tlw = qt_sizegrip_topLevelWidget(this); - d->p = e->globalPos(); + d->p = e->globalPosition().toPoint(); d->gotMousePress = true; d->r = tlw->geometry(); @@ -373,7 +373,7 @@ void QSizeGrip::mouseMoveEvent(QMouseEvent * e) if (!d->gotMousePress || tlw->testAttribute(Qt::WA_WState_ConfigPending)) return; - QPoint np(e->globalPos()); + QPoint np(e->globalPosition().toPoint()); // Don't extend beyond the available geometry; bound to dyMax and dxMax. QSize ns; diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp index 7008da32b5..c344d496a7 100644 --- a/src/widgets/widgets/qslider.cpp +++ b/src/widgets/widgets/qslider.cpp @@ -338,7 +338,7 @@ bool QSlider::event(QEvent *event) case QEvent::HoverLeave: case QEvent::HoverMove: if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event)) - d->updateHoverControl(he->pos()); + d->updateHoverControl(he->position().toPoint()); break; case QEvent::StyleChange: case QEvent::MacSizeChange: @@ -372,7 +372,7 @@ void QSlider::mousePressEvent(QMouseEvent *ev) const QPoint center = sliderRect.center() - sliderRect.topLeft(); // to take half of the slider off for the setSliderPosition call we use the center - topLeft - setSliderPosition(d->pixelPosToRangeValue(d->pick(ev->pos() - center))); + setSliderPosition(d->pixelPosToRangeValue(d->pick(ev->position().toPoint() - center))); triggerAction(SliderMove); setRepeatAction(SliderNoAction); d->pressedControl = QStyle::SC_SliderHandle; @@ -381,11 +381,11 @@ void QSlider::mousePressEvent(QMouseEvent *ev) QStyleOptionSlider opt; initStyleOption(&opt); d->pressedControl = style()->hitTestComplexControl(QStyle::CC_Slider, - &opt, ev->pos(), this); + &opt, ev->position().toPoint(), this); SliderAction action = SliderNoAction; if (d->pressedControl == QStyle::SC_SliderGroove) { const QRect sliderRect = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this); - int pressValue = d->pixelPosToRangeValue(d->pick(ev->pos() - sliderRect.center() + sliderRect.topLeft())); + int pressValue = d->pixelPosToRangeValue(d->pick(ev->position().toPoint() - sliderRect.center() + sliderRect.topLeft())); d->pressValue = pressValue; if (pressValue > d->value) action = SliderPageStepAdd; @@ -406,7 +406,7 @@ void QSlider::mousePressEvent(QMouseEvent *ev) initStyleOption(&opt); setRepeatAction(SliderNoAction); QRect sr = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this); - d->clickOffset = d->pick(ev->pos() - sr.topLeft()); + d->clickOffset = d->pick(ev->position().toPoint() - sr.topLeft()); update(sr); setSliderDown(true); } @@ -423,7 +423,7 @@ void QSlider::mouseMoveEvent(QMouseEvent *ev) return; } ev->accept(); - int newPosition = d->pixelPosToRangeValue(d->pick(ev->pos()) - d->clickOffset); + int newPosition = d->pixelPosToRangeValue(d->pick(ev->position().toPoint()) - d->clickOffset); QStyleOptionSlider opt; initStyleOption(&opt); setSliderPosition(newPosition); diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index b8540176e7..8f98bcdedd 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -292,7 +292,7 @@ void QSplitterHandle::mouseMoveEvent(QMouseEvent *e) Q_D(QSplitterHandle); if (!(e->buttons() & Qt::LeftButton)) return; - int pos = d->pick(parentWidget()->mapFromGlobal(e->globalPos())) + int pos = d->pick(parentWidget()->mapFromGlobal(e->globalPosition().toPoint())) - d->mouseOffset; if (opaqueResize()) { moveSplitter(pos); @@ -308,7 +308,7 @@ void QSplitterHandle::mousePressEvent(QMouseEvent *e) { Q_D(QSplitterHandle); if (e->button() == Qt::LeftButton) { - d->mouseOffset = d->pick(e->pos()); + d->mouseOffset = d->pick(e->position().toPoint()); d->pressed = true; update(); } @@ -321,7 +321,7 @@ void QSplitterHandle::mouseReleaseEvent(QMouseEvent *e) { Q_D(QSplitterHandle); if (!opaqueResize() && e->button() == Qt::LeftButton) { - int pos = d->pick(parentWidget()->mapFromGlobal(e->globalPos())) + int pos = d->pick(parentWidget()->mapFromGlobal(e->globalPosition().toPoint())) - d->mouseOffset; d->s->setRubberBand(-1); moveSplitter(pos); diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 0f0fa52a05..f70cf77fb3 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -1685,12 +1685,12 @@ bool QTabBar::event(QEvent *event) case QEvent::HoverMove: case QEvent::HoverEnter: { QHoverEvent *he = static_cast<QHoverEvent *>(event); - if (!d->hoverRect.contains(he->pos())) { + if (!d->hoverRect.contains(he->position().toPoint())) { QRect oldHoverRect = d->hoverRect; bool cursorOverTabs = false; for (int i = 0; i < d->tabList.count(); ++i) { QRect area = tabRect(i); - if (area.contains(he->pos())) { + if (area.contains(he->position().toPoint())) { d->hoverIndex = i; d->hoverRect = area; cursorOverTabs = true; @@ -1766,7 +1766,7 @@ bool QTabBar::event(QEvent *event) break; case QEvent::DragMove: if (d->changeCurrentOnDrag) { - const int tabIndex = tabAt(static_cast<QDragMoveEvent *>(event)->pos()); + const int tabIndex = tabAt(static_cast<QDragMoveEvent *>(event)->position().toPoint()); if (isTabEnabled(tabIndex) && d->switchTabCurrentIndex != tabIndex) { d->switchTabCurrentIndex = tabIndex; if (d->switchTabTimerId) @@ -2100,7 +2100,7 @@ void QTabBar::mousePressEvent(QMouseEvent *event) { Q_D(QTabBar); - const QPoint pos = event->pos(); + const QPoint pos = event->position().toPoint(); const bool isEventInCornerButtons = (!d->leftB->isHidden() && d->leftB->geometry().contains(pos)) || (!d->rightB->isHidden() && d->rightB->geometry().contains(pos)); if (!isEventInCornerButtons) { @@ -2116,7 +2116,7 @@ void QTabBar::mousePressEvent(QMouseEvent *event) if (d->pressedIndex != -1 && d->movable) d->moveTabFinished(d->pressedIndex); - d->pressedIndex = d->indexAtPos(event->pos()); + d->pressedIndex = d->indexAtPos(event->position().toPoint()); if (d->validIndex(d->pressedIndex)) { QStyleOptionTabBarBase optTabBase; @@ -2127,7 +2127,7 @@ void QTabBar::mousePressEvent(QMouseEvent *event) else repaint(tabRect(d->pressedIndex)); if (d->movable) { - d->dragStartPosition = event->pos(); + d->dragStartPosition = event->position().toPoint(); } } } @@ -2145,7 +2145,7 @@ void QTabBar::mouseMoveEvent(QMouseEvent *event) // Start drag if (!d->dragInProgress && d->pressedIndex != -1) { - if ((event->pos() - d->dragStartPosition).manhattanLength() > QApplication::startDragDistance()) { + if ((event->position().toPoint() - d->dragStartPosition).manhattanLength() > QApplication::startDragDistance()) { d->dragInProgress = true; d->setupMovableTab(); } @@ -2157,9 +2157,9 @@ void QTabBar::mouseMoveEvent(QMouseEvent *event) bool vertical = verticalTabs(d->shape); int dragDistance; if (vertical) { - dragDistance = (event->pos().y() - d->dragStartPosition.y()); + dragDistance = (event->position().toPoint().y() - d->dragStartPosition.y()); } else { - dragDistance = (event->pos().x() - d->dragStartPosition.x()); + dragDistance = (event->position().toPoint().x() - d->dragStartPosition.x()); } d->tabList[d->pressedIndex].dragOffset = dragDistance; @@ -2304,7 +2304,7 @@ void QTabBar::mouseReleaseEvent(QMouseEvent *event) d->dragStartPosition = QPoint(); } - int i = d->indexAtPos(event->pos()) == d->pressedIndex ? d->pressedIndex : -1; + int i = d->indexAtPos(event->position().toPoint()) == d->pressedIndex ? d->pressedIndex : -1; d->pressedIndex = -1; QStyleOptionTabBarBase optTabBase; optTabBase.initFrom(this); @@ -2322,7 +2322,7 @@ void QTabBar::mouseReleaseEvent(QMouseEvent *event) void QTabBar::mouseDoubleClickEvent(QMouseEvent *event) { Q_D(QTabBar); - const QPoint pos = event->pos(); + const QPoint pos = event->position().toPoint(); const bool isEventInCornerButtons = (!d->leftB->isHidden() && d->leftB->geometry().contains(pos)) || (!d->rightB->isHidden() && d->rightB->geometry().contains(pos)); if (!isEventInCornerButtons) diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 9a02721e61..f98c99c72b 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -1677,7 +1677,7 @@ void QTextEdit::mouseMoveEvent(QMouseEvent *e) { Q_D(QTextEdit); d->inDrag = false; // paranoia - const QPoint pos = e->pos(); + const QPoint pos = e->position().toPoint(); d->sendControlEvent(e); if (!(e->buttons() & Qt::LeftButton)) return; @@ -1700,7 +1700,7 @@ void QTextEdit::mouseReleaseEvent(QMouseEvent *e) d->autoScrollTimer.stop(); ensureCursorVisible(); } - if (!isReadOnly() && rect().contains(e->pos())) + if (!isReadOnly() && rect().contains(e->position().toPoint())) d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus); d->clickCausedFocus = 0; } @@ -1771,7 +1771,7 @@ void QTextEdit::dragLeaveEvent(QDragLeaveEvent *e) void QTextEdit::dragMoveEvent(QDragMoveEvent *e) { Q_D(QTextEdit); - d->autoScrollDragPos = e->pos(); + d->autoScrollDragPos = e->position().toPoint(); if (!d->autoScrollTimer.isActive()) d->autoScrollTimer.start(100, this); d->sendControlEvent(e); diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 9c63f98a73..c76c7f6c70 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -247,7 +247,7 @@ bool QToolBarPrivate::mousePressEvent(QMouseEvent *event) Q_Q(QToolBar); QStyleOptionToolBar opt; q->initStyleOption(&opt); - if (q->style()->subElementRect(QStyle::SE_ToolBarHandle, &opt, q).contains(event->pos()) == false) { + if (q->style()->subElementRect(QStyle::SE_ToolBarHandle, &opt, q).contains(event->position().toPoint()) == false) { #ifdef Q_OS_MACOS // When using the unified toolbar on OS X, the user can click and // drag between toolbar contents to move the window. Make this work by @@ -272,7 +272,7 @@ bool QToolBarPrivate::mousePressEvent(QMouseEvent *event) if (!layout->movable()) return true; - initDrag(event->pos()); + initDrag(event->position().toPoint()); return true; } @@ -317,11 +317,11 @@ bool QToolBarPrivate::mouseMoveEvent(QMouseEvent *event) Q_ASSERT(layout != nullptr); if (layout->pluggingWidget == nullptr - && (event->pos() - state->pressPos).manhattanLength() > QApplication::startDragDistance()) { + && (event->position().toPoint() - state->pressPos).manhattanLength() > QApplication::startDragDistance()) { const bool wasDragging = state->dragging; const bool moving = !q->isWindow() && (orientation == Qt::Vertical ? - event->x() >= 0 && event->x() < q->width() : - event->y() >= 0 && event->y() < q->height()); + event->position().toPoint().x() >= 0 && event->position().toPoint().x() < q->width() : + event->position().toPoint().y() >= 0 && event->position().toPoint().y() < q->height()); startDrag(moving); if (!moving && !wasDragging) @@ -329,7 +329,7 @@ bool QToolBarPrivate::mouseMoveEvent(QMouseEvent *event) } if (state->dragging) { - QPoint pos = event->globalPos(); + QPoint pos = event->globalPosition().toPoint(); // if we are right-to-left, we move so as to keep the right edge the same distance // from the mouse if (q->isLeftToRight()) @@ -338,14 +338,14 @@ bool QToolBarPrivate::mouseMoveEvent(QMouseEvent *event) pos += QPoint(state->pressPos.x() - q->width(), -state->pressPos.y()); q->move(pos); - layout->hover(state->widgetItem, event->globalPos()); + layout->hover(state->widgetItem, event->globalPosition().toPoint()); } else if (state->moving) { const QPoint rtl(q->width() - state->pressPos.x(), state->pressPos.y()); //for RTL const QPoint globalPressPos = q->mapToGlobal(q->isRightToLeft() ? rtl : state->pressPos); int pos = 0; - QPoint delta = event->globalPos() - globalPressPos; + QPoint delta = event->globalPosition().toPoint() - globalPressPos; if (orientation == Qt::Vertical) { pos = q->y() + delta.y(); } else { @@ -1150,7 +1150,7 @@ bool QToolBar::event(QEvent *event) QHoverEvent *e = static_cast<QHoverEvent*>(event); QStyleOptionToolBar opt; initStyleOption(&opt); - if (style()->subElementRect(QStyle::SE_ToolBarHandle, &opt, this).contains(e->pos())) + if (style()->subElementRect(QStyle::SE_ToolBarHandle, &opt, this).contains(e->position().toPoint())) setCursor(Qt::SizeAllCursor); else unsetCursor(); diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index e8cb502650..d350e1731e 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -603,7 +603,7 @@ void QToolButton::mousePressEvent(QMouseEvent *e) if (e->button() == Qt::LeftButton && (d->popupMode == MenuButtonPopup)) { QRect popupr = style()->subControlRect(QStyle::CC_ToolButton, &opt, QStyle::SC_ToolButtonMenu, this); - if (popupr.isValid() && popupr.contains(e->pos())) { + if (popupr.isValid() && popupr.contains(e->position().toPoint())) { d->buttonPressed = QToolButtonPrivate::MenuButtonPressed; showMenu(); return; @@ -1004,7 +1004,7 @@ bool QToolButton::event(QEvent *event) case QEvent::HoverLeave: case QEvent::HoverMove: if (const QHoverEvent *he = static_cast<const QHoverEvent *>(event)) - d_func()->updateHoverControl(he->pos()); + d_func()->updateHoverControl(he->position().toPoint()); break; default: break; diff --git a/src/widgets/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp index e012ca624d..1c850741bb 100644 --- a/src/widgets/widgets/qwidgetresizehandler.cpp +++ b/src/widgets/widgets/qwidgetresizehandler.cpp @@ -111,7 +111,7 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee) if (w->isMaximized()) break; const QRect widgetRect = widget->rect().marginsAdded(QMargins(range, range, range, range)); - const QPoint cursorPoint = widget->mapFromGlobal(e->globalPos()); + const QPoint cursorPoint = widget->mapFromGlobal(e->globalPosition().toPoint()); if (!widgetRect.contains(cursorPoint)) return false; if (e->button() == Qt::LeftButton) { @@ -119,7 +119,7 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee) emit activate(); mouseMoveEvent(e); buttonDown = true; - moveOffset = widget->mapFromGlobal(e->globalPos()); + moveOffset = widget->mapFromGlobal(e->globalPosition().toPoint()); invertedMoveOffset = widget->rect().bottomRight() - moveOffset; if (mode != Center) return true; @@ -165,7 +165,7 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee) void QWidgetResizeHandler::mouseMoveEvent(QMouseEvent *e) { - QPoint pos = widget->mapFromGlobal(e->globalPos()); + QPoint pos = widget->mapFromGlobal(e->globalPosition().toPoint()); if (!active && !buttonDown) { if (pos.y() <= range && pos.x() <= range) mode = TopLeft; @@ -204,7 +204,7 @@ void QWidgetResizeHandler::mouseMoveEvent(QMouseEvent *e) QPoint globalPos = (!widget->isWindow() && widget->parentWidget()) ? - widget->parentWidget()->mapFromGlobal(e->globalPos()) : e->globalPos(); + widget->parentWidget()->mapFromGlobal(e->globalPosition().toPoint()) : e->globalPosition().toPoint(); if (!widget->isWindow() && !widget->parentWidget()->rect().contains(globalPos)) { if (globalPos.x() < 0) globalPos.rx() = 0; diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index cb9dffc8c0..ff82b1d37c 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -1040,23 +1040,23 @@ void QWidgetTextControl::processEvent(QEvent *e, const QTransform &transform, QW break; case QEvent::MouseButtonPress: { QMouseEvent *ev = static_cast<QMouseEvent *>(e); - d->mousePressEvent(ev, ev->button(), transform.map(ev->pos()), ev->modifiers(), - ev->buttons(), ev->globalPos()); + d->mousePressEvent(ev, ev->button(), transform.map(ev->position().toPoint()), ev->modifiers(), + ev->buttons(), ev->globalPosition().toPoint()); break; } case QEvent::MouseMove: { QMouseEvent *ev = static_cast<QMouseEvent *>(e); - d->mouseMoveEvent(ev, ev->button(), transform.map(ev->pos()), ev->modifiers(), - ev->buttons(), ev->globalPos()); + d->mouseMoveEvent(ev, ev->button(), transform.map(ev->position().toPoint()), ev->modifiers(), + ev->buttons(), ev->globalPosition().toPoint()); break; } case QEvent::MouseButtonRelease: { QMouseEvent *ev = static_cast<QMouseEvent *>(e); - d->mouseReleaseEvent(ev, ev->button(), transform.map(ev->pos()), ev->modifiers(), - ev->buttons(), ev->globalPos()); + d->mouseReleaseEvent(ev, ev->button(), transform.map(ev->position().toPoint()), ev->modifiers(), + ev->buttons(), ev->globalPosition().toPoint()); break; } case QEvent::MouseButtonDblClick: { QMouseEvent *ev = static_cast<QMouseEvent *>(e); - d->mouseDoubleClickEvent(ev, ev->button(), transform.map(ev->pos()), ev->modifiers(), - ev->buttons(), ev->globalPos()); + d->mouseDoubleClickEvent(ev, ev->button(), transform.map(ev->position().toPoint()), ev->modifiers(), + ev->buttons(), ev->globalPosition().toPoint()); break; } case QEvent::InputMethod: d->inputMethodEvent(static_cast<QInputMethodEvent *>(e)); @@ -1096,13 +1096,13 @@ void QWidgetTextControl::processEvent(QEvent *e, const QTransform &transform, QW break; case QEvent::DragMove: { QDragMoveEvent *ev = static_cast<QDragMoveEvent *>(e); - if (d->dragMoveEvent(e, ev->mimeData(), transform.map(ev->pos()))) + if (d->dragMoveEvent(e, ev->mimeData(), transform.map(ev->position().toPoint()))) ev->acceptProposedAction(); break; } case QEvent::Drop: { QDropEvent *ev = static_cast<QDropEvent *>(e); - if (d->dropEvent(ev->mimeData(), transform.map(ev->pos()), ev->dropAction(), ev->source())) + if (d->dropEvent(ev->mimeData(), transform.map(ev->position().toPoint()), ev->dropAction(), ev->source())) ev->acceptProposedAction(); break; } |