r14969 by cbradney - Move doc arrowStyles to doc prefs struct

scribus-commit scribus-commit at lists.scribus.net
Wed Apr 14 21:11:30 CEST 2010


Revision: 14969
Author: cbradney
Date: 2010-04-14T19:02:39.417880Z
Commit message: Move doc arrowStyles to doc prefs struct

Changeset: 
M  /trunk/Scribus/scribus/ui/propertiespalette.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
M  /trunk/Scribus/scribus/scribusXml.cpp
M  /trunk/Scribus/scribus/ui/prefs_itemtools.cpp
M  /trunk/Scribus/scribus/pageitem.cpp
M  /trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
M  /trunk/Scribus/scribus/scribusdoc.cpp
M  /trunk/Scribus/scribus/ui/tabtools.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
M  /trunk/Scribus/scribus/scribusdoc.h
M  /trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
M  /trunk/Scribus/scribus/pdflib_core.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
M  /trunk/Scribus/scribus/pslib.cpp
M  /trunk/Scribus/scribus/scribus.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
M  /trunk/Scribus/scribus/scpageoutput.cpp
M  /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp

Diffs:
Index: scribus/pdflib_core.cpp
===================================================================
--- scribus/pdflib_core.cpp	(revision 14968)
+++ scribus/pdflib_core.cpp	(revision 14969)
@@ -4326,7 +4326,7 @@
 QString PDFLibCore::drawArrow(PageItem *ite, QTransform &arrowTrans, int arrowIndex)
 {
 	QString tmp = "";
-	FPointArray arrow = doc.arrowStyles.at(arrowIndex-1).points.copy();
+	FPointArray arrow = doc.arrowStyles().at(arrowIndex-1).points.copy();
 	if (ite->NamedLStyle.isEmpty())
 	{
 		if (ite->lineWidth() != 0.0)
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 14968)
+++ scribus/scribusdoc.cpp	(revision 14969)
@@ -241,7 +241,7 @@
 	//->Prefs AutoSaveTime(appPrefsData.docSetupPrefs.AutoSaveTime),
 	autoSaveTimer(new QTimer(this)),
 	MLineStyles(),
-	arrowStyles(appPrefsData.arrowStyles),
+	//->Prefs arrowStyles(appPrefsData.arrowStyles),
 	WinHan(0),
 	DoDrawing(true),
 	OpenNodes(),
@@ -358,7 +358,7 @@
 	//->Prefs AutoSaveTime(appPrefsData.docSetupPrefs.AutoSaveTime),
 	autoSaveTimer(new QTimer(this)),
 	MLineStyles(),
-	arrowStyles(appPrefsData.arrowStyles),
+	//->Prefs arrowStyles(appPrefsData.arrowStyles),
 	WinHan(0),
 	DoDrawing(true),
 	OpenNodes(),
Index: scribus/scribusXml.cpp
===================================================================
--- scribus/scribusXml.cpp	(revision 14968)
+++ scribus/scribusXml.cpp	(revision 14969)
@@ -1135,7 +1135,7 @@
 	arrowID.clear();
 	QString CurDirP = QDir::currentPath();
 	QDir::setCurrent(QDir::homePath());
-	int startNumArrows = doc->arrowStyles.count();
+	int startNumArrows = doc->arrowStyles().count();
 	while (!sReader.atEnd() && !sReader.hasError())
 	{
 		if (sReader.readNext() != QXmlStreamReader::StartElement)
@@ -1163,8 +1163,8 @@
 					ya = ScCLocale::toDoubleC(xs);
 					arrow.points.addPoint(xa, ya);
 				}
-				doc->arrowStyles.append(arrow);
-				arrowID.insert(attIndex.toInt(), doc->arrowStyles.count());
+				doc->arrowStyles().append(arrow);
+				arrowID.insert(attIndex.toInt(), doc->arrowStyles().count());
 			}
 			else
 				arrowID.insert(attIndex.toInt(), attIndex.toInt());
@@ -2364,14 +2364,14 @@
 		int endIndex = item->endArrowIndex();
 		if (startIndex != 0)
 		{
-			arrow.points = doc->arrowStyles.at(startIndex-1).points.copy();
-			arrow.name = doc->arrowStyles.at(startIndex-1).name;
+			arrow.points = doc->arrowStyles().at(startIndex-1).points.copy();
+			arrow.name = doc->arrowStyles().at(startIndex-1).name;
 			usedArrows.insert(startIndex, arrow);
 		}
 		if (endIndex != 0)
 		{
-			arrow.points = doc->arrowStyles.at(endIndex-1).points.copy();
-			arrow.name = doc->arrowStyles.at(endIndex-1).name;
+			arrow.points = doc->arrowStyles().at(endIndex-1).points.copy();
+			arrow.name = doc->arrowStyles().at(endIndex-1).name;
 			usedArrows.insert(endIndex, arrow);
 		}
 	}
Index: scribus/scpageoutput.cpp
===================================================================
--- scribus/scpageoutput.cpp	(revision 14968)
+++ scribus/scpageoutput.cpp	(revision 14969)
@@ -1414,7 +1414,7 @@
 
 void ScPageOutput::drawArrow(ScPainterExBase* painter, PageItem* item, QTransform &arrowTrans, int arrowIndex)
 {
-	FPointArray arrow = m_doc->arrowStyles.at(arrowIndex-1).points.copy();
+	FPointArray arrow = m_doc->arrowStyles().at(arrowIndex-1).points.copy();
 	if (item->NamedLStyle.isEmpty())
 	{
 		if (item->lineWidth() != 0.0)
Index: scribus/pageitem.cpp
===================================================================
--- scribus/pageitem.cpp	(revision 14968)
+++ scribus/pageitem.cpp	(revision 14969)
@@ -5294,7 +5294,7 @@
 	if (m_startArrowIndex != 0)
 	{
 		QTransform arrowTrans;
-		FPointArray arrow = m_Doc->arrowStyles.at(m_startArrowIndex-1).points.copy();
+		FPointArray arrow = m_Doc->arrowStyles().at(m_startArrowIndex-1).points.copy();
 		arrowTrans.translate(Xpos, Ypos);
 		arrowTrans.rotate(Rot);
 		if (itemType() == Line)
@@ -5347,7 +5347,7 @@
 	if (m_endArrowIndex != 0)
 	{
 		QTransform arrowTrans;
-		FPointArray arrow = m_Doc->arrowStyles.at(m_endArrowIndex-1).points.copy();
+		FPointArray arrow = m_Doc->arrowStyles().at(m_endArrowIndex-1).points.copy();
 		arrowTrans.translate(Xpos, Ypos);
 		arrowTrans.rotate(Rot);
 		if (itemType() == Line)
@@ -5452,11 +5452,11 @@
 		*x2 = *x1 + qMax(visualWidth(), extraSpace);
 		*y2 = *y1 + qMax(visualHeight(), extraSpace);
 	}
-	QRectF totalRect = QRectF(QPointF(*x1, *y1), QPointF(*x2, *y2));
+	QRectF totalRect(QPointF(*x1, *y1), QPointF(*x2, *y2));
 	if (m_startArrowIndex != 0)
 	{
 		QTransform arrowTrans;
-		FPointArray arrow = m_Doc->arrowStyles.at(m_startArrowIndex-1).points.copy();
+		FPointArray arrow = m_Doc->arrowStyles().at(m_startArrowIndex-1).points.copy();
 		arrowTrans.translate(Xpos, Ypos);
 		arrowTrans.rotate(Rot);
 		if (itemType() == Line)
@@ -5509,7 +5509,7 @@
 	if (m_endArrowIndex != 0)
 	{
 		QTransform arrowTrans;
-		FPointArray arrow = m_Doc->arrowStyles.at(m_endArrowIndex-1).points.copy();
+		FPointArray arrow = m_Doc->arrowStyles().at(m_endArrowIndex-1).points.copy();
 		arrowTrans.translate(Xpos, Ypos);
 		arrowTrans.rotate(Rot);
 		if (itemType() == Line)
@@ -6024,7 +6024,7 @@
 
 void PageItem::drawArrow(ScPainter *p, QTransform &arrowTrans, int arrowIndex)
 {
-	FPointArray arrow = m_Doc->arrowStyles.at(arrowIndex-1).points.copy();
+	FPointArray arrow = m_Doc->arrowStyles().at(arrowIndex-1).points.copy();
 	if (NamedLStyle.isEmpty())
 	{
 		if (m_lineWidth != 0.0)
Index: scribus/scribusdoc.h
===================================================================
--- scribus/scribusdoc.h	(revision 14968)
+++ scribus/scribusdoc.h	(revision 14969)
@@ -180,7 +180,12 @@
 	void setTocSetups(ToCSetupVector& tsv) { docPrefsData.tocPrefs.defaultToCSetups=tsv; }
 	void clearTocSetups() { docPrefsData.tocPrefs.defaultToCSetups.clear(); }
 	void appendToTocSetups(const ToCSetup& ts) { docPrefsData.tocPrefs.defaultToCSetups.append(ts); }
+	void setArrowStyles(QList<ArrowDesc>& as) { docPrefsData.arrowStyles=as; }
+	QList<ArrowDesc>& arrowStyles() { return docPrefsData.arrowStyles; }
+	void appendToArrowStyles(const struct ArrowDesc& as) { docPrefsData.arrowStyles.append(as); }
 
+
+
 	TypoPrefs& typographicPrefs() { return docPrefsData.typoPrefs; }
 	GuidesPrefs& guidesPrefs() { return docPrefsData.guidesPrefs; }
 	ItemToolPrefs& itemToolPrefs() { return docPrefsData.itemToolPrefs; }
@@ -1141,7 +1146,7 @@
 	//->Prefs int AutoSaveTime;
 	QTimer * const autoSaveTimer;
 	QMap<QString,multiLine> MLineStyles;
-	QList<ArrowDesc> arrowStyles;
+	//->Prefs QList<ArrowDesc> arrowStyles;
 	QMap<QString, ScPattern> docPatterns;
 	QMap<QString, VGradient> docGradients;
 	QWidget* WinHan;
Index: scribus/ui/prefs_itemtools.cpp
===================================================================
--- scribus/ui/prefs_itemtools.cpp	(revision 14968)
+++ scribus/ui/prefs_itemtools.cpp	(revision 14969)
@@ -154,8 +154,8 @@
 	lineStyleComboBox->setCurrentIndex(static_cast<int>(prefsData->itemToolPrefs.lineStyle) - 1);
 	if (m_doc != 0)
 	{
-		lineStartArrowComboBox->rebuildList(&m_doc->arrowStyles);
-		lineEndArrowComboBox->rebuildList(&m_doc->arrowStyles);
+		lineStartArrowComboBox->rebuildList(&m_doc->arrowStyles());
+		lineEndArrowComboBox->rebuildList(&m_doc->arrowStyles());
 	}
 	else
 	{
Index: scribus/ui/tabtools.cpp
===================================================================
--- scribus/ui/tabtools.cpp	(revision 14968)
+++ scribus/ui/tabtools.cpp	(revision 14969)
@@ -782,8 +782,8 @@
 	comboStyleLine->setCurrentIndex(static_cast<int>(itemPrefsData->lineStyle) - 1);
 	if (docu != 0)
 	{
-		startArrow->rebuildList(&docu->arrowStyles);
-		endArrow->rebuildList(&docu->arrowStyles);
+		startArrow->rebuildList(&docu->arrowStyles());
+		endArrow->rebuildList(&docu->arrowStyles());
 	}
 	else
 	{
Index: scribus/ui/propertiespalette.cpp
===================================================================
--- scribus/ui/propertiespalette.cpp	(revision 14968)
+++ scribus/ui/propertiespalette.cpp	(revision 14969)
@@ -1415,8 +1415,8 @@
 	paraStyleCombo->setDoc(doc);
 	charStyleCombo->setDoc(doc);
 	SetLineFormats(doc);
-	startArrow->rebuildList(&doc->arrowStyles);
-	endArrow->rebuildList(&doc->arrowStyles);
+	startArrow->rebuildList(&doc->arrowStyles());
+	endArrow->rebuildList(&doc->arrowStyles());
 
 	connect(this->Tpal, SIGNAL(NewTrans(double)), doc, SLOT(itemSelection_SetItemFillTransparency(double)));
 	connect(this->Tpal, SIGNAL(NewTransS(double)), doc, SLOT(itemSelection_SetItemLineTransparency(double)));
@@ -4880,10 +4880,10 @@
 	if (HaveDoc)
 	{
 		int arrowItem=startArrow->currentIndex();
-		startArrow->rebuildList(&doc->arrowStyles);
+		startArrow->rebuildList(&doc->arrowStyles());
 		startArrow->setCurrentIndex(arrowItem);
 		arrowItem=endArrow->currentIndex();
-		endArrow->rebuildList(&doc->arrowStyles);
+		endArrow->rebuildList(&doc->arrowStyles());
 		endArrow->setCurrentIndex(arrowItem);
 	}
 	linewidthLabel->setText( tr("Line &Width:"));
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 14968)
+++ scribus/scribus.cpp	(revision 14969)
@@ -3560,8 +3560,8 @@
 		propertiesPalette->paraStyleCombo->setDoc(doc);
 		propertiesPalette->charStyleCombo->setDoc(doc);
 		propertiesPalette->SetLineFormats(doc);
-		propertiesPalette->startArrow->rebuildList(&doc->arrowStyles);
-		propertiesPalette->endArrow->rebuildList(&doc->arrowStyles);
+		propertiesPalette->startArrow->rebuildList(&doc->arrowStyles());
+		propertiesPalette->endArrow->rebuildList(&doc->arrowStyles());
 		if (!Mpa)
 		{
 			scanDocument();
Index: scribus/plugins/tools/pathstroker/pathstroker.cpp
===================================================================
--- scribus/plugins/tools/pathstroker/pathstroker.cpp	(revision 14968)
+++ scribus/plugins/tools/pathstroker/pathstroker.cpp	(revision 14969)
@@ -152,7 +152,7 @@
 					{
 						double r = atan2(Start.y()-Vector.y(),Start.x()-Vector.x())*(180.0/M_PI);
 						QTransform arrowTrans;
-						FPointArray arrow = currDoc->arrowStyles.at(currItem->startArrowIndex()-1).points.copy();
+						FPointArray arrow = currDoc->arrowStyles().at(currItem->startArrowIndex()-1).points.copy();
 						arrowTrans.translate(Start.x(), Start.y());
 						arrowTrans.rotate(r);
 						arrowTrans.scale(currItem->lineWidth(), currItem->lineWidth());
@@ -172,7 +172,7 @@
 					{
 						double r = atan2(End.y()-Vector.y(),End.x()-Vector.x())*(180.0/M_PI);
 						QTransform arrowTrans;
-						FPointArray arrow = currDoc->arrowStyles.at(currItem->endArrowIndex()-1).points.copy();
+						FPointArray arrow = currDoc->arrowStyles().at(currItem->endArrowIndex()-1).points.copy();
 						arrowTrans.translate(End.x(), End.y());
 						arrowTrans.rotate(r);
 						arrowTrans.scale(currItem->lineWidth(), currItem->lineWidth());
@@ -270,7 +270,7 @@
 					{
 						double r = atan2(Start.y()-Vector.y(),Start.x()-Vector.x())*(180.0/M_PI);
 						QTransform arrowTrans;
-						FPointArray arrow = currDoc->arrowStyles.at(currItem->startArrowIndex()-1).points.copy();
+						FPointArray arrow = currDoc->arrowStyles().at(currItem->startArrowIndex()-1).points.copy();
 						arrowTrans.translate(Start.x(), Start.y());
 						arrowTrans.rotate(r);
 						arrowTrans.scale(currItem->lineWidth(), currItem->lineWidth());
@@ -310,7 +310,7 @@
 					{
 						double r = atan2(End.y()-Vector.y(),End.x()-Vector.x())*(180.0/M_PI);
 						QTransform arrowTrans;
-						FPointArray arrow = currDoc->arrowStyles.at(currItem->endArrowIndex()-1).points.copy();
+						FPointArray arrow = currDoc->arrowStyles().at(currItem->endArrowIndex()-1).points.copy();
 						arrowTrans.translate(End.x(), End.y());
 						arrowTrans.rotate(r);
 						arrowTrans.scale(currItem->lineWidth(), currItem->lineWidth());
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14968)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14969)
@@ -598,7 +598,7 @@
 					fp >> ya;
 					arrow.points.addPoint(xa, ya);
 				}
-				m_Doc->arrowStyles.append(arrow);
+				m_Doc->appendToArrowStyles(arrow);
 			}
 			if(pg.tagName()=="PDF")
 			{
@@ -1372,7 +1372,7 @@
 		dc.appendChild(MuL);
 	}
 	QList<ArrowDesc>::Iterator itar;
-	for (itar = m_Doc->arrowStyles.begin(); itar != m_Doc->arrowStyles.end(); ++itar)
+	for (itar = m_Doc->arrowStyles().begin(); itar != m_Doc->arrowStyles().end(); ++itar)
 	{
 		if ((*itar).userArrow)
 		{
@@ -2222,14 +2222,14 @@
 	UndoManager::instance()->setUndoEnabled(false);
 	currItem->FrameType = obj->attribute("FRTYPE", "0").toInt();
 	int startArrowIndex = obj->attribute("startArrowIndex", "0").toInt();
-	if ((startArrowIndex < 0) || (startArrowIndex > static_cast<int>(doc->arrowStyles.size())))
+	if ((startArrowIndex < 0) || (startArrowIndex > static_cast<int>(doc->arrowStyles().size())))
 	{
 		qDebug() << QString("scribus13format: invalid arrow index: %").arg(startArrowIndex);
 		startArrowIndex = 0;
 	}
 	currItem->setStartArrowIndex(startArrowIndex);
 	int endArrowIndex = obj->attribute("endArrowIndex", "0").toInt();
-	if ((endArrowIndex < 0) || (endArrowIndex > static_cast<int>(doc->arrowStyles.size())))
+	if ((endArrowIndex < 0) || (endArrowIndex > static_cast<int>(doc->arrowStyles().size())))
 	{
 		qDebug() << QString("scribus13format: invalid arrow index: %").arg(endArrowIndex);
 		endArrowIndex = 0;
@@ -2759,7 +2759,7 @@
 					fp >> ya;
 					arrow.points.addPoint(xa, ya);
 				}
-				m_Doc->arrowStyles.append(arrow);
+				m_Doc->appendToArrowStyles(arrow);
 			}
 			if (((pg.tagName()=="PAGE") || (pg.tagName()=="MASTERPAGE")) && (pg.attribute("NUM").toInt() == pageNumber))
 			{
Index: scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(revision 14968)
+++ scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(revision 14969)
@@ -331,7 +331,7 @@
 		docu.writeEndElement();
 	}
 	QList<ArrowDesc>::Iterator itar;
-	for (itar = m_Doc->arrowStyles.begin(); itar != m_Doc->arrowStyles.end(); ++itar)
+	for (itar = m_Doc->arrowStyles().begin(); itar != m_Doc->arrowStyles().end(); ++itar)
 	{
 		if ((*itar).userArrow)
 		{
Index: scribus/plugins/fileloader/scribus150format/scribus150format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 14968)
+++ scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(revision 14969)
@@ -1309,7 +1309,7 @@
 		fp >> ya;
 		arrow.points.addPoint(xa, ya);
 	}
-	doc->arrowStyles.append(arrow);
+	doc->appendToArrowStyles(arrow);
 	return true;
 }
 
@@ -2478,14 +2478,14 @@
 	UndoManager::instance()->setUndoEnabled(false);
 	currItem->FrameType = attrs.valueAsInt("FRTYPE", 0);
 	int startArrowIndex = attrs.valueAsInt("startArrowIndex", 0);
-	if ((startArrowIndex < 0) || (startArrowIndex > static_cast<int>(doc->arrowStyles.size())))
+	if ((startArrowIndex < 0) || (startArrowIndex > static_cast<int>(doc->arrowStyles().size())))
 	{
 		qDebug() << QString("scribus150format: invalid arrow index: %").arg(startArrowIndex);
 		startArrowIndex = 0;
 	}
 	currItem->setStartArrowIndex(startArrowIndex);
 	int endArrowIndex = attrs.valueAsInt("endArrowIndex", 0);
-	if ((endArrowIndex < 0) || (endArrowIndex > static_cast<int>(doc->arrowStyles.size())))
+	if ((endArrowIndex < 0) || (endArrowIndex > static_cast<int>(doc->arrowStyles().size())))
 	{
 		qDebug() << QString("scribus150format: invalid arrow index: %").arg(endArrowIndex);
 		endArrowIndex = 0;
Index: scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 14968)
+++ scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 14969)
@@ -328,7 +328,7 @@
 		docu.writeEndElement();
 	}
 	QList<ArrowDesc>::Iterator itar;
-	for (itar = m_Doc->arrowStyles.begin(); itar != m_Doc->arrowStyles.end(); ++itar)
+	for (itar = m_Doc->arrowStyles().begin(); itar != m_Doc->arrowStyles().end(); ++itar)
 	{
 		if ((*itar).userArrow)
 		{
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14968)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14969)
@@ -1304,7 +1304,7 @@
 		fp >> ya;
 		arrow.points.addPoint(xa, ya);
 	}
-	doc->arrowStyles.append(arrow);
+	doc->appendToArrowStyles(arrow);
 	return true;
 }
 
@@ -2470,14 +2470,14 @@
 	UndoManager::instance()->setUndoEnabled(false);
 	currItem->FrameType = attrs.valueAsInt("FRTYPE", 0);
 	int startArrowIndex = attrs.valueAsInt("startArrowIndex", 0);
-	if ((startArrowIndex < 0) || (startArrowIndex > static_cast<int>(doc->arrowStyles.size())))
+	if ((startArrowIndex < 0) || (startArrowIndex > static_cast<int>(doc->arrowStyles().size())))
 	{
 		qDebug() << QString("scribus134format: invalid arrow index: %").arg(startArrowIndex);
 		startArrowIndex = 0;
 	}
 	currItem->setStartArrowIndex(startArrowIndex);
 	int endArrowIndex = attrs.valueAsInt("endArrowIndex", 0);
-	if ((endArrowIndex < 0) || (endArrowIndex > static_cast<int>(doc->arrowStyles.size())))
+	if ((endArrowIndex < 0) || (endArrowIndex > static_cast<int>(doc->arrowStyles().size())))
 	{
 		qDebug() << QString("scribus134format: invalid arrow index: %").arg(endArrowIndex);
 		endArrowIndex = 0;
Index: scribus/plugins/svgexplugin/svgexplugin.cpp
===================================================================
--- scribus/plugins/svgexplugin/svgexplugin.cpp	(revision 14968)
+++ scribus/plugins/svgexplugin/svgexplugin.cpp	(revision 14969)
@@ -1244,7 +1244,7 @@
 	if (Item->startArrowIndex() != 0)
 	{
 		QTransform arrowTrans;
-		FPointArray arrow = m_Doc->arrowStyles.at(Item->startArrowIndex()-1).points.copy();
+		FPointArray arrow = m_Doc->arrowStyles().at(Item->startArrowIndex()-1).points.copy();
 		if (Item->itemType() == PageItem::Line)
 		{
 			arrowTrans.translate(0, 0);
@@ -1400,7 +1400,7 @@
 	if (Item->endArrowIndex() != 0)
 	{
 		QTransform arrowTrans;
-		FPointArray arrow = m_Doc->arrowStyles.at(Item->endArrowIndex()-1).points.copy();
+		FPointArray arrow = m_Doc->arrowStyles().at(Item->endArrowIndex()-1).points.copy();
 		if (Item->itemType() == PageItem::Line)
 		{
 			arrowTrans.translate(Item->width(), 0);
Index: scribus/pslib.cpp
===================================================================
--- scribus/pslib.cpp	(revision 14968)
+++ scribus/pslib.cpp	(revision 14969)
@@ -4147,7 +4147,7 @@
 {
 	int h, s, v, k;
 	QVector<double> dum;
-	FPointArray arrow = m_Doc->arrowStyles.at(arrowIndex-1).points.copy();
+	FPointArray arrow = m_Doc->arrowStyles().at(arrowIndex-1).points.copy();
 	if (ite->NamedLStyle.isEmpty())
 	{
 		if (ite->lineWidth() != 0.0)




More information about the scribus-commit mailing list