diff --git a/src/charts/tlinchartdelegate.cpp b/src/charts/tlinchartdelegate.cpp index f0697ad397d38cd2a0d450996301cefa7b707ebf..0bea6e7939f9300a72cc373d55683ac217eb26c7 100644 --- a/src/charts/tlinchartdelegate.cpp +++ b/src/charts/tlinchartdelegate.cpp @@ -364,14 +364,14 @@ void TlinChartDelegate::setProgressHoverred(bool ph) void TlinChartDelegate::hoverEnterEvent(QHoverEvent *e) { - if ((e->posF().y() > m_prevAverY && e->posF().y() < m_thisAverY) || (e->posF().y() < m_prevAverY && e->posF().y() > m_thisAverY)) + if ((e->position().y() > m_prevAverY && e->position().y() < m_thisAverY) || (e->position().y() < m_prevAverY && e->position().y() > m_thisAverY)) setProgressHoverred(true); } void TlinChartDelegate::hoverMoveEvent(QHoverEvent *e) { if (m_prevAverY) { - if ((e->posF().y() > m_prevAverY && e->posF().y() < m_thisAverY) || (e->posF().y() < m_prevAverY && e->posF().y() > m_thisAverY)) + if ((e->position().y() > m_prevAverY && e->position().y() < m_thisAverY) || (e->position().y() < m_prevAverY && e->position().y() > m_thisAverY)) setProgressHoverred(true); else setProgressHoverred(false); diff --git a/src/libs/core/instruments/tguitarbg.cpp b/src/libs/core/instruments/tguitarbg.cpp index d6bd505199790f17a135a2ccaf245034c265f232..b0269818a133706367e0e39340f0f8bb9d380013 100644 --- a/src/libs/core/instruments/tguitarbg.cpp +++ b/src/libs/core/instruments/tguitarbg.cpp @@ -422,7 +422,7 @@ void TguitarBg::pressedAt(qreal px, qreal py) { paintFingerAtPoint(QPointF(px, py).toPoint()); // skip press point set - not used in that event handler - auto me = new QMouseEvent(QEvent::MouseButtonPress, QPointF(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + auto me = new QMouseEvent(QEvent::MouseButtonPress, QPointF(), QPointF(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); mouseReleaseEvent(me); } @@ -494,7 +494,7 @@ void TguitarBg::hoverMoveEvent(QHoverEvent *event) if (!active()) hoverEnterEvent(nullptr); - paintFingerAtPoint(event->pos()); + paintFingerAtPoint(event->position().toPoint()); } void TguitarBg::mousePressEvent(QMouseEvent *event) diff --git a/src/libs/core/score/taddnoteitem.cpp b/src/libs/core/score/taddnoteitem.cpp index 6f8300877afda9e4e0b3802aec67e9ed52db6053..f4f734848ba9bba9da96743d3e43d1cf0eeb2db8 100644 --- a/src/libs/core/score/taddnoteitem.cpp +++ b/src/libs/core/score/taddnoteitem.cpp @@ -69,13 +69,13 @@ void TaddNoteItem::setScoreObject(TscoreObject *sc) void TaddNoteItem::hoverEnterEvent(QHoverEvent *event) { - if (event->pos().y() > 1.0) { + if (event->position().y() > 1.0) { m_hideTimer->stop(); m_active = true; m_hovered = true; - int yy = qFloor(event->pos().y()); + int yy = qFloor(event->position().y()); if (yy != static_cast<int>(m_yPos)) { - m_yPos = m_scoreObject->clefType() == Tclef::NoClef ? m_scoreObject->upperLine() + 7.0 : qFloor(event->pos().y()); + m_yPos = m_scoreObject->clefType() == Tclef::NoClef ? m_scoreObject->upperLine() + 7.0 : qFloor(event->position().y()); emit activeChanged(); emit yPosChanged(); } @@ -90,7 +90,7 @@ void TaddNoteItem::hoverLeaveEvent(QHoverEvent *) void TaddNoteItem::hoverMoveEvent(QHoverEvent *event) { - int yy = qFloor(event->pos().y()); + int yy = qFloor(event->position().y()); if (yy > 1 && yy != static_cast<int>(m_yPos)) { if (!m_active) { // sometimes hover enter seems to be omitted - fix that then m_active = true; diff --git a/src/libs/core/score/tnoteitem.cpp b/src/libs/core/score/tnoteitem.cpp index e54ff3b3b584194362f93ae253b8bb5612835568..a5906282d155123506cfc8d6e92ec17f9af82a5d 100644 --- a/src/libs/core/score/tnoteitem.cpp +++ b/src/libs/core/score/tnoteitem.cpp @@ -149,11 +149,11 @@ void TnoteItem::setColor(const QColor &c) m_alter->setProperty("color", c); m_flag->setProperty("color", c); m_stem->setProperty("color", c); - for (auto line : qAsConst(m_upLines)) + for (auto line : std::as_const(m_upLines)) line->setProperty("color", c); - for (auto line : qAsConst(m_loLines)) + for (auto line : std::as_const(m_loLines)) line->setProperty("color", c); - for (auto line : qAsConst(m_underLoLines)) + for (auto line : std::as_const(m_underLoLines)) line->setProperty("color", c); if (m_tie) m_tie->setProperty("color", c); @@ -696,7 +696,7 @@ void TnoteItem::keySignatureChanged() void TnoteItem::hoverEnterEvent(QHoverEvent *event) { if (!m_staff->score()->readOnly() && (m_staff->score()->singleNote() || m_staff->score()->editMode())) { - if (event->pos().y() > 2.0 && event->pos().y() < height()) { + if (event->position().y() > 2.0 && event->position().y() < height()) { m_measure->score()->setHoveredNote(this); m_measure->score()->changeActiveNote(this); } @@ -722,10 +722,10 @@ void TnoteItem::hoverMoveEvent(QHoverEvent *event) m_measure->score()->changeActiveNote(this); } - if (event->pos().y() > 2.0 && event->pos().y() < height()) { + if (event->position().y() > 2.0 && event->position().y() < height()) { if (!m_measure->score()->pressedNote() && m_measure->score()->hoveredNote() - && static_cast<int>(m_measure->score()->activeYpos()) != static_cast<int>(event->pos().y())) - m_measure->score()->setActiveNotePos(qFloor(event->pos().y())); + && static_cast<int>(m_measure->score()->activeYpos()) != static_cast<int>(event->position().y())) + m_measure->score()->setActiveNotePos(qFloor(event->position().y())); } } } diff --git a/src/libs/core/score/tnotepair.cpp b/src/libs/core/score/tnotepair.cpp index 72b284cae038641fed8b3b9f9dcdc836e26df5ae..1e030be06edb0d7dfa211a295793f9e48bf5649d 100644 --- a/src/libs/core/score/tnotepair.cpp +++ b/src/libs/core/score/tnotepair.cpp @@ -82,7 +82,7 @@ void TnotePair::approve() int TnotePair::pairsDuration(const QList<TnotePair *> &pairs) { int dur = 0; - for (TnotePair *np : qAsConst(pairs)) + for (TnotePair *np : std::as_const(pairs)) dur += np->note()->duration(); return dur; }