r23277 by jghali - Remove unused argument from ScribusDoc's adjustItemSize

scribus-commit scribus-commit at lists.scribus.net
Fri Oct 25 01:14:44 UTC 2019


Author: jghali
Date: Fri Oct 25 01:14:44 2019
New Revision: 23277

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23277
Log:
Remove unused argument from ScribusDoc's adjustItemSize

Modified:
    trunk/Scribus/scribus/canvasmode.cpp
    trunk/Scribus/scribus/canvasmode_nodeedit.cpp
    trunk/Scribus/scribus/nodeeditcontext.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h
    trunk/Scribus/scribus/ui/nodeeditpalette.cpp

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23277&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode.cpp	Fri Oct 25 01:14:44 2019
@@ -1734,7 +1734,7 @@
 					PageItem *currItem = m_doc->m_Selection->itemAt(0);
 					double xposOrig = currItem->xPos();
 					double yposOrig = currItem->yPos();
-					m_doc->adjustItemSize(currItem, true, true);
+					m_doc->adjustItemSize(currItem, true);
 					if (!m_doc->nodeEdit.isContourLine())
 						currItem->ContourLine.translate(xposOrig - currItem->xPos(),yposOrig - currItem->yPos());
 					currItem->update();

Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23277&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp	Fri Oct 25 01:14:44 2019
@@ -459,7 +459,7 @@
 			}
 			m_doc->nodeEdit.moveClipPoint(currItem, npf);
 		}
-		m_doc->adjustItemSize(currItem, true, true);
+		m_doc->adjustItemSize(currItem, true);
 		if (!m_doc->nodeEdit.isContourLine())
 			currItem->ContourLine.translate(xposOrig - currItem->xPos(), yposOrig - currItem->yPos());
 		m_doc->regionsChanged()->update(QRectF());
@@ -727,7 +727,7 @@
 						bb->setRotation(currItem->rotation());
 						bb->ClipEdited = true;
 						m_doc->Items->insert(m_doc->Items->indexOf(currItem), bb);
-						m_doc->adjustItemSize(bb, true, true);
+						m_doc->adjustItemSize(bb, true);
 					}
 					currItem->PoLine = cli.copy();
 				}
@@ -754,7 +754,7 @@
 						else
 							bb->PoLine.putPoints(0, Clip.size()-(m_doc->nodeEdit.clre()+2), Clip, m_doc->nodeEdit.clre()+2);
 						bb->setRotation(currItem->rotation());
-						m_doc->adjustItemSize(bb, true, true);
+						m_doc->adjustItemSize(bb, true);
 						bb->ClipEdited = true;
 						bb->setFrameType(currItem->frameType());
 						cli.resize(0);
@@ -930,7 +930,7 @@
 		yp = currItem->yPos();
 		w = currItem->width();
 		h = currItem->height();
-		m_doc->adjustItemSize(currItem, true, true);
+		m_doc->adjustItemSize(currItem, true);
 		xp2 = currItem->xPos();
 		yp2 = currItem->yPos();
 		w2 = currItem->width();

Modified: trunk/Scribus/scribus/nodeeditcontext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23277&path=/trunk/Scribus/scribus/nodeeditcontext.cpp
==============================================================================
--- trunk/Scribus/scribus/nodeeditcontext.cpp	(original)
+++ trunk/Scribus/scribus/nodeeditcontext.cpp	Fri Oct 25 01:14:44 2019
@@ -391,7 +391,7 @@
 	{
 		currItem->PoLine.setPoint(Doc->nodeEdit.m_ClRe, np);
 	//	if (!(currItem->isGroup() || currItem->isSymbol()))
-			Doc->adjustItemSize(currItem, true, true);
+			Doc->adjustItemSize(currItem, true);
 		Doc->regionsChanged()->update(QRectF());
 	}
 	undoManager->setUndoEnabled(true);
@@ -484,7 +484,7 @@
 	{
 		currItem->PoLine = Clip.copy();
 	//	if (!(currItem->isGroup() || currItem->isSymbol()))
-			Doc->adjustItemSize(currItem, true, true);
+			Doc->adjustItemSize(currItem, true);
 		Doc->regionsChanged()->update(QRectF());
 	}
 	else

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23277&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Fri Oct 25 01:14:44 2019
@@ -14508,7 +14508,7 @@
 }
 
 
-void ScribusDoc::adjustItemSize(PageItem *currItem, bool includeGroup, bool moveInGroup)
+void ScribusDoc::adjustItemSize(PageItem *currItem, bool includeGroup)
 {
 	if (currItem->isArc())
 		return;
@@ -14797,12 +14797,12 @@
 			{
 				double oldGW = item->groupWidth;
 				double oldGH = item->groupHeight;
-				adjustItemSize(item, true, false);
+				adjustItemSize(item, true);
 				item->groupWidth = oldGW;
 				item->groupHeight = oldGH;
 			}
 			else
-				adjustItemSize(item, true, false);
+				adjustItemSize(item, true);
 			if (item->isArc() || item->isSpiral() || item->isRegularPolygon())
 				item->setXYPos(b1.x() + gx, b1.y() + gy);
 			else
@@ -14830,12 +14830,12 @@
 					// after fixing adjustItemSize() for groups
 					//double oldGW = item->groupWidth;
 					//double oldGH = item->groupHeight;
-					adjustItemSize(item, true, false);
+					adjustItemSize(item, true);
 					//item->groupWidth = oldGW;
 					//item->groupHeight = oldGH;
 				}
 				else
-					adjustItemSize(item, true, false);
+					adjustItemSize(item, true);
 			}
 		}
 		if (scaleText)

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23277&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h	(original)
+++ trunk/Scribus/scribus/scribusdoc.h	Fri Oct 25 01:14:44 2019
@@ -1200,7 +1200,7 @@
 	void moveRotated(PageItem *currItem, const FPoint& npv);
 	bool sizeItem(double newX, double newY, PageItem *pi, bool fromMP = false, bool DoUpdateClip = true, bool redraw = true);
 	bool moveSizeItem(const FPoint& newX, const FPoint& newY, PageItem* currItem, bool fromMP = false, bool constrainRotation = false);
-	void adjustItemSize(PageItem *currItem, bool includeGroup = false, bool moveInGroup = true);
+	void adjustItemSize(PageItem *currItem, bool includeGroup = false);
 	void moveGroup(double x, double y, Selection* customSelection = nullptr);
 	void rotateGroup(double angle, Selection* customSelection = nullptr);
 	void rotateGroup(double angle, const FPoint& RCenter, Selection* customSelection = nullptr);

Modified: trunk/Scribus/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23277&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp	Fri Oct 25 01:14:44 2019
@@ -625,7 +625,7 @@
 			np -= zp;
 		}
 		m_doc->nodeEdit.moveClipPoint(currItem, np);
-		m_doc->adjustItemSize(currItem, true, true);
+		m_doc->adjustItemSize(currItem, true);
 		if (currItem->itemType() == PageItem::PathText)
 			currItem->updatePolyClip();
 		m_doc->regionsChanged()->update(QRectF());




More information about the scribus-commit mailing list