r23105 by jghali - Code style fixes

scribus-commit scribus-commit at lists.scribus.net
Tue Aug 6 03:07:17 UTC 2019


Author: jghali
Date: Tue Aug  6 03:07:16 2019
New Revision: 23105

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23105
Log:
Code style fixes

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23105&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Tue Aug  6 03:07:16 2019
@@ -14576,13 +14576,13 @@
 		if (bb->isGroup() || scaleLine)				// change the LineWidth only when the item is within a real Group
 		{
 			if (bb->lineWidth() != 0)				// don't try to scale hairlines
-				bb->setLineWidth(qMax(bb->lineWidth()*((scx+scy)/2), 0.01));
+				bb->setLineWidth(qMax(bb->lineWidth() * ((scx + scy) / 2), 0.01));
 		}
 		if (bb->itemType() == PageItem::Line)
 		{
-			bb->setRotation(atan2(t1.y()-b1.y(),t1.x()-b1.x())*(180.0/M_PI));
-			bb->setWidth(sqrt(pow(t1.x()-b1.x(),2)+pow(t1.y()-b1.y(),2)));
-			bb->setXYPos(b1.x()+gx, b1.y()+gy);
+			bb->setRotation(atan2(t1.y() - b1.y(), t1.x() - b1.x()) * (180.0 / M_PI));
+			bb->setWidth(sqrt(pow(t1.x() - b1.x(), 2) + pow(t1.y() - b1.y(), 2)));
+			bb->setXYPos(b1.x() + gx, b1.y() + gy);
 		}
 		else
 		{
@@ -14591,7 +14591,7 @@
 			ma.rotate(bb->rotation());
 			bb->PoLine.map(ma);
 			QTransform ma2;
-			ma2.translate(gx-bb->xPos(), gy-bb->yPos());
+			ma2.translate(gx - bb->xPos(), gy - bb->yPos());
 			ma2.scale(scx, scy);
 			bb->PoLine.map(ma2);
 			bb->setRotation(0.0);
@@ -14631,15 +14631,15 @@
 				QTransform ma3;
 				ma3.translate(gx, gy);
 				ma3.scale(scx, scy);
-				FPoint n(gx-oldPos.x(), gy-oldPos.y());
+				FPoint n(gx - oldPos.x(), gy - oldPos.y());
 				double x = ma3.m11() * n.x() + ma3.m21() * n.y() + ma3.dx();
 				double y = ma3.m22() * n.y() + ma3.m12() * n.x() + ma3.dy();
-				//MoveItem(gx-x, gy-y, bb);
+				//moveItem(gx - x, gy - y, bb);
 				bb->moveBy(gx - x, gy - y);
 			}
 			if (oldRot != 0)
 			{
-				bb->setRotation(atan2(t1.y()-b1.y(),t1.x()-b1.x())*(180.0/M_PI));
+				bb->setRotation(atan2(t1.y() - b1.y(), t1.x() - b1.x()) * (180.0 / M_PI));
 				if (!bb->isArc() && !bb->isSpiral() && !bb->isRegularPolygon())
 				{
 					QTransform ma;




More information about the scribus-commit mailing list