aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename method to avoid collision with an enum class.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2021-09-14 19:54:51 +03:00
parent 4c946d7da5
commit 9397a57477
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/puzzle/scene/vpgraphicspiececontrols.cpp
View File

@ -395,7 +395,7 @@ void VPGraphicsPieceControls::mousePressEvent(QGraphicsSceneMouseEvent *event)
m_rotationStartPoint = event->scenePos(); m_rotationStartPoint = event->scenePos();
m_rotationSum = 0; m_rotationSum = 0;
m_controlsVisible = false; m_controlsVisible = false;
m_handleCorner = HandleCorner(event->scenePos()); m_handleCorner = SelectedHandleCorner(event->scenePos());
m_ignorePieceTransformation = true; m_ignorePieceTransformation = true;
prepareGeometryChange(); prepareGeometryChange();
} }
@ -409,7 +409,7 @@ void VPGraphicsPieceControls::mousePressEvent(QGraphicsSceneMouseEvent *event)
void VPGraphicsPieceControls::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void VPGraphicsPieceControls::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{ {
if((event->modifiers() & Qt::ShiftModifier) != 0U if((event->modifiers() & Qt::ShiftModifier) != 0U
&& static_cast<enum HandleCorner>(m_handleCorner) != HandleCorner::Invalid) && static_cast<HandleCorner>(m_handleCorner) != HandleCorner::Invalid)
{ {
if (not m_originSaved) if (not m_originSaved)
{ {
@ -426,19 +426,19 @@ void VPGraphicsPieceControls::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
VPTransformationOrigon origin; VPTransformationOrigon origin;
origin.custom = true; origin.custom = true;
if (static_cast<enum HandleCorner>(m_handleCorner) == HandleCorner::TopLeft) if (static_cast<HandleCorner>(m_handleCorner) == HandleCorner::TopLeft)
{ {
origin.origin = m_pieceRect.topLeft(); origin.origin = m_pieceRect.topLeft();
} }
else if (static_cast<enum HandleCorner>(m_handleCorner) == HandleCorner::TopRight) else if (static_cast<HandleCorner>(m_handleCorner) == HandleCorner::TopRight)
{ {
origin.origin = m_pieceRect.topRight(); origin.origin = m_pieceRect.topRight();
} }
else if (static_cast<enum HandleCorner>(m_handleCorner) == HandleCorner::BottomRight) else if (static_cast<HandleCorner>(m_handleCorner) == HandleCorner::BottomRight)
{ {
origin.origin = m_pieceRect.bottomRight(); origin.origin = m_pieceRect.bottomRight();
} }
else if (static_cast<enum HandleCorner>(m_handleCorner) == HandleCorner::BottomLeft) else if (static_cast<HandleCorner>(m_handleCorner) == HandleCorner::BottomLeft)
{ {
origin.origin = m_pieceRect.bottomLeft(); origin.origin = m_pieceRect.bottomLeft();
} }
@ -831,7 +831,7 @@ auto VPGraphicsPieceControls::PiecesBoundingRect(const QList<VPPiecePtr> &select
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
auto VPGraphicsPieceControls::HandleCorner(const QPointF &pos) const -> int auto VPGraphicsPieceControls::SelectedHandleCorner(const QPointF &pos) const -> int
{ {
if (TopLeftControl().boundingRect().contains(pos)) if (TopLeftControl().boundingRect().contains(pos))
{ {

2
src/app/puzzle/scene/vpgraphicspiececontrols.h
View File

@ -129,7 +129,7 @@ private:
auto ArrowPath() const -> QPainterPath; auto ArrowPath() const -> QPainterPath;
auto HandleCorner(const QPointF &pos) const -> int; auto SelectedHandleCorner(const QPointF &pos) const -> int;
auto SelectedPieces() const -> QList<VPPiecePtr>; auto SelectedPieces() const -> QList<VPPiecePtr>;
static auto PiecesBoundingRect(const QList<VPPiecePtr> &selectedPieces) -> QRectF; static auto PiecesBoundingRect(const QList<VPPiecePtr> &selectedPieces) -> QRectF;