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

Cppcheck warnings.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2022-01-29 18:05:15 +02:00
parent be52aeb68e
commit 28b4874441
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/libs/vtools/tools/backgroundimage/vbackgroundimagecontrols.cpp
View File

@ -864,14 +864,14 @@ auto VBackgroundImageControls::ScaleByTopLeft(QGraphicsSceneMouseEvent *event) c
QTransform m; QTransform m;
QPointF scaleCenterOriginal = event->modifiers() & Qt::ShiftModifier ? rectOriginal.center() QPointF scaleCenterOriginal = (event->modifiers() & Qt::ShiftModifier) ? rectOriginal.center()
: rectOriginal.bottomRight(); : rectOriginal.bottomRight();
m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y()); m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y());
m.scale(scaleX, scaleY); m.scale(scaleX, scaleY);
QPointF scaleCenter = event->modifiers() & Qt::ShiftModifier ? rect.center() : rect.bottomRight(); QPointF scaleCenter = (event->modifiers() & Qt::ShiftModifier) ? rect.center() : rect.bottomRight();
if (newScalePoint.x() > scaleCenter.x()) if (newScalePoint.x() > scaleCenter.x())
{ {
@ -950,13 +950,13 @@ auto VBackgroundImageControls::ScaleByTop(QGraphicsSceneMouseEvent *event) const
QTransform m; QTransform m;
QPointF scaleCenterOriginal = event->modifiers() & Qt::ShiftModifier ? rectOriginal.center() QPointF scaleCenterOriginal = (event->modifiers() & Qt::ShiftModifier) ? rectOriginal.center()
: RectBottomPoint(rectOriginal); : RectBottomPoint(rectOriginal);
m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y()); m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y());
m.scale(scaleX, scaleY); m.scale(scaleX, scaleY);
QPointF scaleCenter = event->modifiers() & Qt::ShiftModifier ? rect.center() : rect.bottomRight(); QPointF scaleCenter = (event->modifiers() & Qt::ShiftModifier) ? rect.center() : rect.bottomRight();
if (newScalePoint.y() > scaleCenter.y()) if (newScalePoint.y() > scaleCenter.y())
{ {
@ -1077,13 +1077,13 @@ auto VBackgroundImageControls::ScaleByTopRight(QGraphicsSceneMouseEvent *event)
QPointF newScalePoint = pos - m_scaleDiff; QPointF newScalePoint = pos - m_scaleDiff;
QTransform m; QTransform m;
QPointF scaleCenterOriginal = event->modifiers() & Qt::ShiftModifier ? rectOriginal.center() QPointF scaleCenterOriginal = (event->modifiers() & Qt::ShiftModifier) ? rectOriginal.center()
: rectOriginal.bottomLeft(); : rectOriginal.bottomLeft();
m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y()); m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y());
m.scale(scaleX, scaleY); m.scale(scaleX, scaleY);
QPointF scaleCenter = event->modifiers() & Qt::ShiftModifier ? rect.center() : rect.bottomLeft(); QPointF scaleCenter = (event->modifiers() & Qt::ShiftModifier) ? rect.center() : rect.bottomLeft();
if (newScalePoint.x() < scaleCenter.x()) if (newScalePoint.x() < scaleCenter.x())
{ {
@ -1163,13 +1163,13 @@ auto VBackgroundImageControls::ScaleByRight(QGraphicsSceneMouseEvent *event) con
QTransform m; QTransform m;
QPointF scaleCenterOriginal = event->modifiers() & Qt::ShiftModifier ? rectOriginal.center() QPointF scaleCenterOriginal = (event->modifiers() & Qt::ShiftModifier) ? rectOriginal.center()
: RectLeftPoint(rectOriginal); : RectLeftPoint(rectOriginal);
m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y()); m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y());
m.scale(scaleX, scaleY); m.scale(scaleX, scaleY);
QPointF scaleCenter = event->modifiers() & Qt::ShiftModifier ? rect.center() : RectLeftPoint(rect); QPointF scaleCenter = (event->modifiers() & Qt::ShiftModifier) ? rect.center() : RectLeftPoint(rect);
if (newScalePoint.x() < scaleCenter.x()) if (newScalePoint.x() < scaleCenter.x())
{ {
@ -1286,14 +1286,14 @@ auto VBackgroundImageControls::ScaleByBottomRight(QGraphicsSceneMouseEvent *even
QTransform m; QTransform m;
QPointF scaleCenterOriginal = event->modifiers() & Qt::ShiftModifier ? rectOriginal.center() QPointF scaleCenterOriginal = (event->modifiers() & Qt::ShiftModifier) ? rectOriginal.center()
: rectOriginal.topLeft(); : rectOriginal.topLeft();
m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y()); m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y());
m.scale(scaleX, scaleY); m.scale(scaleX, scaleY);
QPointF scaleCenter = event->modifiers() & Qt::ShiftModifier ? rect.center() : rect.topLeft(); QPointF scaleCenter = (event->modifiers() & Qt::ShiftModifier) ? rect.center() : rect.topLeft();
if (newScalePoint.x() < scaleCenter.x()) if (newScalePoint.x() < scaleCenter.x())
{ {
@ -1372,13 +1372,13 @@ auto VBackgroundImageControls::ScaleByBottom(QGraphicsSceneMouseEvent *event) co
QTransform m; QTransform m;
QPointF scaleCenterOriginal = event->modifiers() & Qt::ShiftModifier ? rectOriginal.center() QPointF scaleCenterOriginal = (event->modifiers() & Qt::ShiftModifier) ? rectOriginal.center()
: RectTopPoint(rectOriginal); : RectTopPoint(rectOriginal);
m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y()); m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y());
m.scale(scaleX, scaleY); m.scale(scaleX, scaleY);
QPointF scaleCenter = event->modifiers() & Qt::ShiftModifier ? rect.center() : RectTopPoint(rect); QPointF scaleCenter = (event->modifiers() & Qt::ShiftModifier) ? rect.center() : RectTopPoint(rect);
if (newScalePoint.y() < scaleCenter.y()) if (newScalePoint.y() < scaleCenter.y())
{ {
@ -1500,13 +1500,13 @@ auto VBackgroundImageControls::ScaleByBottomLeft(QGraphicsSceneMouseEvent *event
QPointF newScalePoint = pos - m_scaleDiff; QPointF newScalePoint = pos - m_scaleDiff;
QTransform m; QTransform m;
QPointF scaleCenterOriginal = event->modifiers() & Qt::ShiftModifier ? rectOriginal.center() QPointF scaleCenterOriginal = (event->modifiers() & Qt::ShiftModifier) ? rectOriginal.center()
: rectOriginal.topRight(); : rectOriginal.topRight();
m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y()); m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y());
m.scale(scaleX, scaleY); m.scale(scaleX, scaleY);
QPointF scaleCenter = event->modifiers() & Qt::ShiftModifier ? rect.center() : rect.topRight(); QPointF scaleCenter = (event->modifiers() & Qt::ShiftModifier) ? rect.center() : rect.topRight();
if (newScalePoint.x() > scaleCenter.x()) if (newScalePoint.x() > scaleCenter.x())
{ {
@ -1585,13 +1585,13 @@ auto VBackgroundImageControls::ScaleByLeft(QGraphicsSceneMouseEvent *event) cons
QTransform m; QTransform m;
QPointF scaleCenterOriginal = event->modifiers() & Qt::ShiftModifier ? rectOriginal.center() QPointF scaleCenterOriginal = (event->modifiers() & Qt::ShiftModifier) ? rectOriginal.center()
: RectRightPoint(rectOriginal); : RectRightPoint(rectOriginal);
m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y()); m.translate(scaleCenterOriginal.x(), scaleCenterOriginal.y());
m.scale(scaleX, scaleY); m.scale(scaleX, scaleY);
QPointF scaleCenter = event->modifiers() & Qt::ShiftModifier ? rect.center() : RectRightPoint(rect); QPointF scaleCenter = (event->modifiers() & Qt::ShiftModifier) ? rect.center() : RectRightPoint(rect);
if (newScalePoint.x() > scaleCenter.x()) if (newScalePoint.x() > scaleCenter.x())
{ {