r23707 by jghali - Rename ScribusDoc's MLineStyles to docLineStyles

scribus-commit scribus-commit at lists.scribus.net
Tue May 5 23:18:53 UTC 2020


Author: jghali
Date: Tue May  5 23:18:53 2020
New Revision: 23707

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23707
Log:
Rename ScribusDoc's MLineStyles to docLineStyles

Modified:
    trunk/Scribus/scribus/canvas.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_line.cpp
    trunk/Scribus/scribus/pageitem_pathtext.cpp
    trunk/Scribus/scribus/pageitem_polyline.cpp
    trunk/Scribus/scribus/pageitem_spiral.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
    trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdsetprop.cpp
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
    trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h
    trunk/Scribus/scribus/ui/propertiespalette_line.cpp
    trunk/Scribus/scribus/ui/smlinestyle.cpp

Modified: trunk/Scribus/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp	(original)
+++ trunk/Scribus/scribus/canvas.cpp	Tue May  5 23:18:53 2020
@@ -1213,7 +1213,7 @@
 							}
 							else
 							{
-								multiLine ml = m_doc->MLineStyles[currItem->NamedLStyle];
+								multiLine ml = m_doc->docLineStyles[currItem->NamedLStyle];
 								lw2 = qRound(ml[ml.size()-1].Width  / 2.0);
 								lw = qRound(qMax(ml[ml.size()-1].Width, 1.0));
 								le = static_cast<Qt::PenCapStyle>(ml[ml.size()-1].LineEnd);
@@ -1247,7 +1247,7 @@
 				}
 				else
 				{
-					multiLine ml = m_doc->MLineStyles[currItem->NamedLStyle];
+					multiLine ml = m_doc->docLineStyles[currItem->NamedLStyle];
 					lw2 = qRound(ml[ml.size()-1].Width  / 2.0);
 					lw = qRound(qMax(ml[ml.size()-1].Width, 1.0));
 					le = static_cast<Qt::PenCapStyle>(ml[ml.size()-1].LineEnd);

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Tue May  5 23:18:53 2020
@@ -2136,7 +2136,7 @@
 				else
 				{
 					p->setStrokeMode(ScPainter::Solid);
-					multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+					multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 					QColor tmp;
 					for (int it = ml.size()-1; it > -1; it--)
 					{
@@ -9034,7 +9034,7 @@
 	}
 	else
 	{
-		multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+		multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 		const SingleLine& sl = ml.last();
 		if (sl.Color != CommonStrings::None)
 		{
@@ -9071,7 +9071,7 @@
 				}
 				else
 				{
-					const multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+					const multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 					const SingleLine& sl = ml.last();
 					if (sl.Width != 0.0)
 						arrowTrans.scale(sl.Width, sl.Width);
@@ -9113,7 +9113,7 @@
 				}
 				else
 				{
-					const multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+					const multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 					const SingleLine& sl = ml.last();
 					if (sl.Width != 0.0)
 						arrowTrans.scale(sl.Width, sl.Width);
@@ -9155,7 +9155,7 @@
 				}
 				else
 				{
-					const multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+					const multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 					const SingleLine& sl = ml.last();
 					if (sl.Width != 0.0)
 						arrowTrans.scale(sl.Width, sl.Width);
@@ -9197,7 +9197,7 @@
 				}
 				else
 				{
-					const multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+					const multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 					const SingleLine& sl = ml.last();
 					if (sl.Width != 0.0)
 						arrowTrans.scale(sl.Width, sl.Width);
@@ -9284,7 +9284,7 @@
 			}
 			else
 			{
-				multiLine ml = doc()->MLineStyles[NamedLStyle];
+				multiLine ml = doc()->docLineStyles[NamedLStyle];
 				int ind = ml.size()-1;
 				if ((ml[ind].Color != CommonStrings::None) && (ml[ind].Width != 0))
 				{
@@ -9693,7 +9693,7 @@
 	}
 	else
 	{
-		multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+		multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 		if (ml[ml.size()-1].Width != 0.0)
 			arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
 	}
@@ -9752,7 +9752,7 @@
 		}
 		else
 		{
-			multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 			QColor tmp;
 			if (ml[0].Color != CommonStrings::None)
 			{

Modified: trunk/Scribus/scribus/pageitem_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/pageitem_line.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_line.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_line.cpp	Tue May  5 23:18:53 2020
@@ -121,7 +121,7 @@
 		else
 		{
 			p->setStrokeMode(ScPainter::Solid);
-			multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 			QColor tmp;
 			for (int it = ml.size()-1; it > -1; it--)
 			{
@@ -346,7 +346,7 @@
 		}
 		else
 		{
-			const multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+			const multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 			const SingleLine& sl = ml.last();
 			if (sl.Width != 0.0)
 				arrowTrans.scale(sl.Width, sl.Width);
@@ -379,7 +379,7 @@
 		}
 		else
 		{
-			const multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+			const multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 			const SingleLine& sl = ml.last();
 			if (sl.Width != 0.0)
 				arrowTrans.scale(sl.Width, sl.Width);
@@ -412,7 +412,7 @@
 		}
 		else
 		{
-			const multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+			const multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 			const SingleLine& sl = ml.last();
 			if (sl.Width != 0.0)
 				arrowTrans.scale(sl.Width, sl.Width);
@@ -444,7 +444,7 @@
 		}
 		else
 		{
-			const multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+			const multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 			const SingleLine& sl = ml.last();
 			if (sl.Width != 0.0)
 				arrowTrans.scale(sl.Width, sl.Width);

Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_pathtext.cpp	Tue May  5 23:18:53 2020
@@ -139,7 +139,7 @@
 			else
 			{
 				p->setStrokeMode(ScPainter::Solid);
-				multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 				QColor tmp;
 				for (int it = ml.size()-1; it > -1; it--)
 				{

Modified: trunk/Scribus/scribus/pageitem_polyline.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/pageitem_polyline.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_polyline.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_polyline.cpp	Tue May  5 23:18:53 2020
@@ -157,7 +157,7 @@
 		else
 		{
 			p->setStrokeMode(ScPainter::Solid);
-			multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 			QColor tmp;
 			for (int it = ml.size()-1; it > -1; it--)
 			{

Modified: trunk/Scribus/scribus/pageitem_spiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/pageitem_spiral.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_spiral.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_spiral.cpp	Tue May  5 23:18:53 2020
@@ -159,7 +159,7 @@
 		else
 		{
 			p->setStrokeMode(ScPainter::Solid);
-			multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 			QColor tmp;
 			for (int it = ml.size()-1; it > -1; it--)
 			{

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Tue May  5 23:18:53 2020
@@ -1686,7 +1686,7 @@
 						realAsce = qMax(realAsce, gm.ascent + gm.descent);
 						wide += gm.width;
 					}
-					wide = (wide* scaleH) + (1 - scaleH);
+					wide = (wide * scaleH) + (1 - scaleH);
 					realAsce = realAsce  * scaleV + offset;
 					if (realCharHeight == 0)
 						realCharHeight = font.height(style.charStyle().fontSize() / 10.0);
@@ -3673,7 +3673,7 @@
 			else
 			{
 				p->setStrokeMode(ScPainter::Solid);
-				multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[NamedLStyle];
 				QColor tmp;
 				for (int it = ml.size()-1; it > -1; it--)
 				{

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Tue May  5 23:18:53 2020
@@ -2862,7 +2862,7 @@
 						}
 						else
 						{
-							multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+							multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 							for (int it = ml.size() - 1; it > -1; it--)
 							{
 								if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -2921,7 +2921,7 @@
 					}
 					else
 					{
-						multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+						multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 						for (int it = ml.size() - 1; it > -1; it--)
 						{
 							if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -3036,7 +3036,7 @@
 						}
 						else
 						{
-							multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+							multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 							for (int it = ml.size() - 1; it > -1; it--)
 							{
 								if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -3138,7 +3138,7 @@
 						}
 						else
 						{
-							multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+							multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 							for (int it = ml.size() - 1; it > -1; it--)
 							{
 								if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -4604,7 +4604,7 @@
 				}
 				else
 				{
-					multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+					multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 					for (int it = ml.size() - 1; it > -1; it--)
 					{
 						if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -4726,7 +4726,7 @@
 				}
 				else
 				{
-					multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+					multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 					for (int it = ml.size() - 1; it > -1; it--)
 					{
 						if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -4784,7 +4784,7 @@
 			}
 			else
 			{
-				multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+				multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 				for (int it = ml.size() - 1; it > -1; it--)
 				{
 					if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -4900,7 +4900,7 @@
 				}
 				else
 				{
-					multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+					multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 					for (int it = ml.size() - 1; it > -1; it--)
 					{
 						if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -5002,7 +5002,7 @@
 				}
 				else
 				{
-					multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+					multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 					for (int it = ml.size() - 1; it > -1; it--)
 					{
 						if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -5098,7 +5098,7 @@
 						}
 						else
 						{
-							multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+							multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 							for (int it = ml.size() - 1; it > -1; it--)
 							{
 								if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -5521,7 +5521,7 @@
 	}
 	else
 	{
-		multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+		multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 		if (ml[ml.size() - 1].Width != 0.0)
 			arrowTrans.scale(ml[ml.size() - 1].Width, ml[ml.size() - 1].Width);
 	}
@@ -5565,7 +5565,7 @@
 	}
 	else
 	{
-		multiLine ml = doc.MLineStyles[ite->NamedLStyle];
+		multiLine ml = doc.docLineStyles[ite->NamedLStyle];
 		if (ml[0].Color != CommonStrings::None)
 		{
 			tmp += putColor(ml[0].Color, ml[0].Shade, true);

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	Tue May  5 23:18:53 2020
@@ -964,7 +964,7 @@
 				ob2.setAttribute("style", "fill:none;" + drS);
 		}
 		ob.appendChild(ob2);
-		multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+		multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 		for (int it = ml.size()-1; it > -1; it--)
 		{
 			if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -993,7 +993,7 @@
 	{
 		ob = m_domDoc.createElement("g");
 		ob.setAttribute("transform", trans);
-		multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+		multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 		for (int i = ml.size()-1; i > -1; i--)
 		{
 			if ((ml[i].Color != CommonStrings::None) && (ml[i].Width != 0))
@@ -1128,7 +1128,7 @@
 	}
 	else
 	{
-		multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+		multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 		for (int it = ml.size()-1; it > -1; it--)
 		{
 			if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -1318,7 +1318,7 @@
 		}
 		else
 		{
-			multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 			for (int it = ml.size()-1; it > -1; it--)
 			{
 				if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -1356,7 +1356,7 @@
 		}
 		else
 		{
-			multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 			for (int it = ml.size()-1; it > -1; it--)
 			{
 				if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -1517,7 +1517,7 @@
 			}
 			else
 			{
-				multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 				if (ml[ml.size()-1].Width != 0.0)
 					arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
 			}
@@ -1542,7 +1542,7 @@
 					}
 					else
 					{
-						multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+						multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 						if (ml[ml.size()-1].Width != 0.0)
 							arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
 					}
@@ -1640,7 +1640,7 @@
 		}
 		else
 		{
-			multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 			if (ml[0].Color != CommonStrings::None)
 			{
 				ob = m_domDoc.createElement("path");
@@ -1683,7 +1683,7 @@
 			}
 			else
 			{
-				multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 				if (ml[ml.size()-1].Width != 0.0)
 					arrowTrans.scale(ml[ml.size() - 1].Width, ml[ml.size() - 1].Width);
 			}
@@ -1707,7 +1707,7 @@
 					}
 					else
 					{
-						multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+						multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 						if (ml[ml.size() - 1].Width != 0.0)
 							arrowTrans.scale(ml[ml.size() - 1].Width, ml[ml.size() - 1].Width);
 					}
@@ -1805,7 +1805,7 @@
 		}
 		else
 		{
-			multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 			if (ml[0].Color != CommonStrings::None)
 			{
 				ob = m_domDoc.createElement("path");

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp	Tue May  5 23:18:53 2020
@@ -608,7 +608,7 @@
 		else
 		{
 			QDomElement grp2 = p_docu.createElement("Canvas");
-			multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 			for (int it = ml.size()-1; it > -1; it--)
 			{
 				if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -648,7 +648,7 @@
 		else
 		{
 			ob = p_docu.createElement("Canvas");
-			multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 			for (int it = ml.size()-1; it > -1; it--)
 			{
 				if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -775,7 +775,7 @@
 		else
 		{
 			QDomElement grp2 = p_docu.createElement("Canvas");
-			multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 			for (int it = ml.size()-1; it > -1; it--)
 			{
 				if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -1089,7 +1089,7 @@
 			else
 			{
 				QDomElement grp2 = p_docu.createElement("Canvas");
-				multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 				for (int it = ml.size()-1; it > -1; it--)
 				{
 					if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -1144,7 +1144,7 @@
 			else
 			{
 				QDomElement grp2 = p_docu.createElement("Canvas");
-				multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 				for (int it = ml.size()-1; it > -1; it--)
 				{
 					if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
@@ -1669,7 +1669,7 @@
 			}
 			else
 			{
-				multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 				if (ml[ml.size()-1].Width != 0.0)
 					arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
 			}
@@ -1694,7 +1694,7 @@
 					}
 					else
 					{
-						multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+						multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 						if (ml[ml.size()-1].Width != 0.0)
 							arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
 					}
@@ -1720,7 +1720,7 @@
 			}
 			else
 			{
-				multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 				if (ml[ml.size()-1].Width != 0.0)
 					arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
 			}
@@ -1744,7 +1744,7 @@
 					}
 					else
 					{
-						multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+						multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 						if (ml[ml.size()-1].Width != 0.0)
 							arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
 					}
@@ -1781,7 +1781,7 @@
 	{
 		QDomElement grp2 = p_docu.createElement("Canvas");
 		grp2.setAttribute("RenderTransform", MatrixToStr(mpx));
-		multiLine ml = m_Doc->MLineStyles[Item->NamedLStyle];
+		multiLine ml = m_Doc->docLineStyles[Item->NamedLStyle];
 		if (ml[0].Color != CommonStrings::None)
 		{
 			QDomElement ob3 = p_docu.createElement("Path");

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Tue May  5 23:18:53 2020
@@ -941,7 +941,7 @@
 					ml.push_back(sl);
 					MuLn = MuLn.nextSibling();
 				}
-				m_Doc->MLineStyles.insert(pg.attribute("Name"), ml);
+				m_Doc->docLineStyles.insert(pg.attribute("Name"), ml);
 			}
 			if (pg.tagName() == "PAGE")
 			{
@@ -1937,10 +1937,10 @@
 				}
 				QString mlName = pg.attribute("Name");
 				QString mlName2 = mlName;
-				QHash<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.find(mlName2);
-				if (mlit != m_Doc->MLineStyles.constEnd() && ml != mlit.value())
-					mlName2 = getUniqueName(mlName2, m_Doc->MLineStyles);
-				m_Doc->MLineStyles.insert(mlName2, ml);
+				QHash<QString,multiLine>::ConstIterator mlit = m_Doc->docLineStyles.find(mlName2);
+				if (mlit != m_Doc->docLineStyles.constEnd() && ml != mlit.value())
+					mlName2 = getUniqueName(mlName2, m_Doc->docLineStyles);
+				m_Doc->docLineStyles.insert(mlName2, ml);
 			}
 			if ((pg.tagName() == "PAGE") && (pg.attribute("NUM").toInt() == pageNumber))
 			{
@@ -2010,7 +2010,7 @@
 					OB.Xpos = ScCLocale::toDoubleC(obj.attribute("XPOS"))+m_Doc->Pages->at(a)->xOffset();
 					OB.Ypos=ScCLocale::toDoubleC(obj.attribute("YPOS"))+m_Doc->Pages->at(a)->yOffset();
 					OB.NamedLStyle = obj.attribute("NAMEDLST", "");
-					if (!m_Doc->MLineStyles.contains(OB.NamedLStyle))
+					if (!m_Doc->docLineStyles.contains(OB.NamedLStyle))
 						OB.NamedLStyle = "";
 					OB.startArrowIndex =  0;
 					OB.endArrowIndex =  0;

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Tue May  5 23:18:53 2020
@@ -363,7 +363,7 @@
 			if (!success) break;
 			if (!mlName.isEmpty())
 			{
-				m_Doc->MLineStyles.insert(mlName, ml);
+				m_Doc->docLineStyles.insert(mlName, ml);
 			}
 		}
 		if (tagName == "Bookmark")
@@ -3290,10 +3290,10 @@
 			QString mlName  = attrs.valueAsString("Name");
 			QString mlName2 = mlName;
 			readMultiline(ml, reader);
-			QHash<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.constFind(mlName2);
-			if (mlit != m_Doc->MLineStyles.constEnd() && ml != mlit.value())
-					mlName2 = getUniqueName(mlName2, m_Doc->MLineStyles);
-			m_Doc->MLineStyles.insert(mlName2, ml);
+			QHash<QString,multiLine>::ConstIterator mlit = m_Doc->docLineStyles.constFind(mlName2);
+			if (mlit != m_Doc->docLineStyles.constEnd() && ml != mlit.value())
+					mlName2 = getUniqueName(mlName2, m_Doc->docLineStyles);
+			m_Doc->docLineStyles.insert(mlName2, ml);
 		}
 		if (tagName == "Pattern")
 		{

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp	Tue May  5 23:18:53 2020
@@ -590,7 +590,7 @@
 					ml.push_back(sl);
 					MuLn = MuLn.nextSibling();
 				}
-				m_Doc->MLineStyles.insert(pg.attribute("Name"), ml);
+				m_Doc->docLineStyles.insert(pg.attribute("Name"), ml);
 			}
 			if (pg.tagName() == "Arrows")
 			{
@@ -2161,10 +2161,10 @@
 				}
 				QString mlName = pg.attribute("Name");
 				QString mlName2 = mlName;
-				QHash<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.find(mlName2);
-				if (mlit != m_Doc->MLineStyles.constEnd() && ml != mlit.value())
-					mlName2 = getUniqueName(mlName2, m_Doc->MLineStyles);
-				m_Doc->MLineStyles.insert(mlName2, ml);
+				QHash<QString,multiLine>::ConstIterator mlit = m_Doc->docLineStyles.find(mlName2);
+				if (mlit != m_Doc->docLineStyles.constEnd() && ml != mlit.value())
+					mlName2 = getUniqueName(mlName2, m_Doc->docLineStyles);
+				m_Doc->docLineStyles.insert(mlName2, ml);
 			}
 			if (pg.tagName() == "Arrows")
 			{

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Tue May  5 23:18:53 2020
@@ -329,7 +329,7 @@
 			if (!success) break;
 			if (!mlName.isEmpty())
 			{
-				m_Doc->MLineStyles.insert(mlName, ml);
+				m_Doc->docLineStyles.insert(mlName, ml);
 			}
 		}
 		if ((tagName == "ITEM") || (tagName == "PAGEOBJECT") || (tagName == "FRAMEOBJECT"))
@@ -868,7 +868,7 @@
 			if (!success) break;
 			if (!mlName.isEmpty())
 			{
-				m_Doc->MLineStyles.insert(mlName, ml);
+				m_Doc->docLineStyles.insert(mlName, ml);
 			}
 		}
 		if (tagName == "PAGEOBJECT" || tagName == "MASTEROBJECT" || tagName == "FRAMEOBJECT")
@@ -1528,7 +1528,7 @@
 			if (!success) break;
 			if (!mlName.isEmpty())
 			{
-				m_Doc->MLineStyles.insert(mlName, ml);
+				m_Doc->docLineStyles.insert(mlName, ml);
 			}
 		}
 		if (tagName == "Bookmark")
@@ -6288,10 +6288,10 @@
 			QString mlName  = attrs.valueAsString("Name");
 			QString mlName2 = mlName;
 			readMultiline(ml, reader);
-			QHash<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.find(mlName2);
-			if (mlit != m_Doc->MLineStyles.end() && ml != mlit.value())
-					mlName2 = getUniqueName(mlName2, m_Doc->MLineStyles);
-			m_Doc->MLineStyles.insert(mlName2, ml);
+			QHash<QString,multiLine>::ConstIterator mlit = m_Doc->docLineStyles.find(mlName2);
+			if (mlit != m_Doc->docLineStyles.end() && ml != mlit.value())
+					mlName2 = getUniqueName(mlName2, m_Doc->docLineStyles);
+			m_Doc->docLineStyles.insert(mlName2, ml);
 		}
 		if (tagName == "Pattern")
 		{

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp	Tue May  5 23:18:53 2020
@@ -515,7 +515,7 @@
 void Scribus150Format::writeLineStyles(ScXmlStreamWriter& docu) 
 {
 	QHash<QString,multiLine>::Iterator itMU;
-	for (itMU = m_Doc->MLineStyles.begin(); itMU != m_Doc->MLineStyles.end(); ++itMU)
+	for (itMU = m_Doc->docLineStyles.begin(); itMU != m_Doc->docLineStyles.end(); ++itMU)
 	{
 		docu.writeStartElement("MultiLine");
 		docu.writeAttribute("Name",itMU.key());

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp	Tue May  5 23:18:53 2020
@@ -190,7 +190,7 @@
 	if (it == nullptr)
 		return nullptr;
 	QString qStyle = QString::fromUtf8(Style);
-	if (! ScCore->primaryMainWindow()->doc->MLineStyles.contains(qStyle))
+	if (! ScCore->primaryMainWindow()->doc->docLineStyles.contains(qStyle))
 	{
 		PyErr_SetString(NotFoundError, QObject::tr("Line Style not found.","python error").toLocal8Bit().constData());
 		return nullptr;
@@ -396,7 +396,7 @@
 	PageItem *currItem = GetUniqueItem(QString::fromUtf8(Name));
 	if (currItem == nullptr)
 		return nullptr;
-	if (!ScCore->primaryMainWindow()->doc->MLineStyles.contains(QString::fromUtf8(Style)))
+	if (!ScCore->primaryMainWindow()->doc->docLineStyles.contains(QString::fromUtf8(Style)))
 	{
 		PyErr_SetString(NotFoundError, QObject::tr("Line style not found.","python error").toLocal8Bit().constData());
 		return nullptr;

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp	Tue May  5 23:18:53 2020
@@ -392,7 +392,7 @@
 		ml.push_back(sl);
 	}
 	if (!ml.empty())
-		currentDoc->MLineStyles[Name] = ml;
+		currentDoc->docLineStyles[Name] = ml;
 	Py_RETURN_NONE;
 }
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdsetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdsetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdsetprop.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdsetprop.cpp	Tue May  5 23:18:53 2020
@@ -190,7 +190,7 @@
 	if (it == nullptr)
 		return nullptr;
 	QString qStyle = QString::fromUtf8(Style);
-	if (! ScCore->primaryMainWindow()->doc->MLineStyles.contains(qStyle))
+	if (! ScCore->primaryMainWindow()->doc->docLineStyles.contains(qStyle))
 	{
 		PyErr_SetString(NotFoundError, QObject::tr("Line Style not found.","python error").toLocal8Bit().constData());
 		return nullptr;
@@ -396,7 +396,7 @@
 	PageItem *currItem = GetUniqueItem(QString::fromUtf8(Name));
 	if (currItem == nullptr)
 		return nullptr;
-	if (!ScCore->primaryMainWindow()->doc->MLineStyles.contains(QString::fromUtf8(Style)))
+	if (!ScCore->primaryMainWindow()->doc->docLineStyles.contains(QString::fromUtf8(Style)))
 	{
 		PyErr_SetString(NotFoundError, QObject::tr("Line style not found.","python error").toLocal8Bit().constData());
 		return nullptr;

Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp	Tue May  5 23:18:53 2020
@@ -392,7 +392,7 @@
 		ml.push_back(sl);
 	}
 	if (!ml.empty())
-		currentDoc->MLineStyles[Name] = ml;
+		currentDoc->docLineStyles[Name] = ml;
 	Py_RETURN_NONE;
 }
 

Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp	Tue May  5 23:18:53 2020
@@ -216,7 +216,7 @@
 		else
 		{
 			currDoc->m_Selection->clear();
-			multiLine ml = currDoc->MLineStyles[currItem->NamedLStyle];
+			multiLine ml = currDoc->docLineStyles[currItem->NamedLStyle];
 			bool first = true;
 			for (int it = ml.size()-1; it > -1; it--)
 			{

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Tue May  5 23:18:53 2020
@@ -1905,7 +1905,7 @@
 			}
 			else
 			{
-				multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 				for (int it = ml.size() - 1; it > -1; it--)
 				{
 					if (ml[it].Color != CommonStrings::None) // && (ml[it].Width != 0))
@@ -2008,7 +2008,7 @@
 			}
 			else
 			{
-				multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 				for (int it = ml.size() - 1; it > -1; it--)
 				{
 					if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -2061,7 +2061,7 @@
 		}
 		else
 		{
-			multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+			multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 			for (int it = ml.size() - 1; it > -1; it--)
 			{
 				if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -2137,7 +2137,7 @@
 			}
 			else
 			{
-				multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 				for (int it = ml.size() - 1; it > -1; it--)
 				{
 					if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -2193,7 +2193,7 @@
 			}
 			else
 			{
-				multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+				multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 				for (int it = ml.size() - 1; it > -1; it--)
 				{
 					if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -2275,7 +2275,7 @@
 				}
 				else
 				{
-					multiLine ml = m_Doc->MLineStyles[item->NamedLStyle];
+					multiLine ml = m_Doc->docLineStyles[item->NamedLStyle];
 					for (int it = ml.size() - 1; it > -1; it--)
 					{
 						if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -2939,7 +2939,7 @@
 					}
 					else
 					{
-						multiLine ml = m_Doc->MLineStyles[ite->NamedLStyle];
+						multiLine ml = m_Doc->docLineStyles[ite->NamedLStyle];
 						for (int it = ml.size() - 1; it > -1; it--)
 						{
 							if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -2988,7 +2988,7 @@
 						}
 						else
 						{
-							multiLine ml = m_Doc->MLineStyles[ite->NamedLStyle];
+							multiLine ml = m_Doc->docLineStyles[ite->NamedLStyle];
 							for (int it = ml.size() - 1; it > -1; it--)
 							{
 								if (ml[it].Color != CommonStrings::None) //&& (ml[it].Width != 0))
@@ -4252,7 +4252,7 @@
 	}
 	else
 	{
-		multiLine ml = m_Doc->MLineStyles[ite->NamedLStyle];
+		multiLine ml = m_Doc->docLineStyles[ite->NamedLStyle];
 		if (ml[ml.size() - 1].Width != 0.0)
 			arrowTrans.scale(ml[ml.size() - 1].Width, ml[ml.size() - 1].Width);
 	}
@@ -4306,7 +4306,7 @@
 	}
 	else
 	{
-		multiLine ml = m_Doc->MLineStyles[ite->NamedLStyle];
+		multiLine ml = m_Doc->docLineStyles[ite->NamedLStyle];
 		if (ml[0].Color != CommonStrings::None)
 		{
 			SetColor(ml[0].Color, ml[0].Shade, &h, &s, &v, &k);

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Tue May  5 23:18:53 2020
@@ -482,7 +482,7 @@
 			}
 			else
 			{
-				multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
+				multiLine ml = m_doc->docLineStyles[item->NamedLStyle];
 				for (int it = ml.size() - 1; it > -1; it--)
 				{
 					const SingleLine& sl = ml[it];
@@ -891,7 +891,7 @@
 	else
 	{
 		painter->setStrokeMode(ScPainterExBase::Solid);
-		multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
+		multiLine ml = m_doc->docLineStyles[item->NamedLStyle];
 		for (int it = ml.size() - 1; it > -1; it--)
 		{
 			const SingleLine& sl = ml[it];
@@ -1231,7 +1231,7 @@
 	}
 	else
 	{
-		multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
+		multiLine ml = m_doc->docLineStyles[item->NamedLStyle];
 		for (int it = ml.size() - 1; it > -1; it--)
 		{
 			const SingleLine& sl = ml[it];
@@ -1398,7 +1398,7 @@
 	}
 	else
 	{
-		multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
+		multiLine ml = m_doc->docLineStyles[item->NamedLStyle];
 		for (int it = ml.size() - 1; it > -1; it--)
 		{
 			const SingleLine& sl = ml[it];
@@ -1475,7 +1475,7 @@
 		}
 		else
 		{
-			multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
+			multiLine ml = m_doc->docLineStyles[item->NamedLStyle];
 			for (int it = ml.size() - 1; it > -1; it--)
 			{
 				const SingleLine& sl = ml[it];
@@ -1526,7 +1526,7 @@
 	}
 	else
 	{
-		multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
+		multiLine ml = m_doc->docLineStyles[item->NamedLStyle];
 		if (ml[ml.size() - 1].Width != 0.0)
 			arrowTrans.scale(ml[ml.size() - 1].Width, ml[ml.size() - 1].Width);
 	}
@@ -1546,7 +1546,7 @@
 	}
 	else
 	{
-		multiLine ml = m_doc->MLineStyles[item->NamedLStyle];
+		multiLine ml = m_doc->docLineStyles[item->NamedLStyle];
 		if (ml[0].Color != CommonStrings::None)
 		{
 			ScColorShade tmp(m_doc->PageColors[ml[0].Color], ml[0].Shade);

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Tue May  5 23:18:53 2020
@@ -1448,7 +1448,7 @@
 {
 	StyleSet<ParagraphStyle> *wrkStyles     = &m_docParagraphStyles;
 	StyleSet<CharStyle> *wrkCharStyles      = &m_docCharStyles;
-	QHash<QString, multiLine> *wrkLineStyles = &MLineStyles;
+	QHash<QString, multiLine> *wrkLineStyles = &docLineStyles;
 	
 	int oldStyles = wrkStyles->count();
 	int oldCharStyles = wrkCharStyles->count();
@@ -3527,8 +3527,7 @@
 {
 	multiLine::iterator its;
 	QMap<QString, QString>::const_iterator it;
-	QHash<QString,multiLine>::iterator  itl;
-	for (itl = MLineStyles.begin(); itl != MLineStyles.end(); ++itl)
+	for (auto itl = docLineStyles.begin(); itl != docLineStyles.end(); ++itl)
 	{
 		multiLine& mline = itl.value();
 		for (its = mline.begin(); its != mline.end(); ++its)
@@ -3594,8 +3593,8 @@
 {
 	bool found = false;
 	multiLine::const_iterator its, itsend;
-	auto itmend = MLineStyles.constEnd();
-	for (auto itm = MLineStyles.constBegin(); itm != itmend && !found; ++itm)
+	auto itmend = docLineStyles.constEnd();
+	for (auto itm = docLineStyles.constBegin(); itm != itmend && !found; ++itm)
 	{
 		const multiLine& ml = itm.value();
 		itsend = ml.constEnd();

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h	(original)
+++ trunk/Scribus/scribus/scribusdoc.h	Tue May  5 23:18:53 2020
@@ -537,9 +537,9 @@
 	const StyleSet<ParagraphStyle>& paragraphStyles()  const { return m_docParagraphStyles; }
 	bool isDefaultStyle( const ParagraphStyle& p ) const { return m_docParagraphStyles.isDefault(p); }
 	bool isDefaultStyle( const CharStyle& c ) const { return m_docCharStyles.isDefault(c); }
-// 	bool isDefaultStyle( LineStyle& l ) const { return MLineStyles......; }
-
-	const QHash<QString, multiLine>& lineStyles() const { return MLineStyles; }
+// 	bool isDefaultStyle( LineStyle& l ) const { return docLineStyles......; }
+
+	const QHash<QString, multiLine>& lineStyles() const { return docLineStyles; }
 
 	/**
 	 * Returns the table style named @a name.
@@ -1405,7 +1405,7 @@
 	bool isConverted {false};
 	QTimer * const autoSaveTimer;
 	QList<QString> autoSaveFiles;
-	QHash<QString, multiLine> MLineStyles;
+	QHash<QString, multiLine> docLineStyles;
 	QHash<QString, ScPattern> docPatterns;
 	QHash<QString, VGradient> docGradients;
 	QWidget* WinHan {nullptr};

Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp	Tue May  5 23:18:53 2020
@@ -364,7 +364,7 @@
 	if (dd != nullptr)
 	{
 		QHash<QString,multiLine>::Iterator it;
-		for (it = dd->MLineStyles.begin(); it != dd->MLineStyles.end(); ++it)
+		for (it = dd->docLineStyles.begin(); it != dd->docLineStyles.end(); ++it)
 			lineStyles->addItem( new LineFormatItem(dd, it.value(), it.key()) );
 		lineStyles->sortItems();
 		lineStyles->insertItem( 0, tr("No Style"));

Modified: trunk/Scribus/scribus/ui/smlinestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23707&path=/trunk/Scribus/scribus/ui/smlinestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestyle.cpp	(original)
+++ trunk/Scribus/scribus/ui/smlinestyle.cpp	Tue May  5 23:18:53 2020
@@ -56,7 +56,7 @@
 	m_doc = doc;
 	if (m_doc)
 	{
-		m_tmpLines = m_doc->MLineStyles;
+		m_tmpLines = m_doc->docLineStyles;
 		m_selection.clear();
 		if (m_widget)
 		{
@@ -74,7 +74,7 @@
 QList<StyleName> SMLineStyle::styles(bool reloadFromDoc)
 {
 	if (m_doc && reloadFromDoc) {
-		m_tmpLines = m_doc->MLineStyles;
+		m_tmpLines = m_doc->docLineStyles;
 	}
 
 	QList<StyleName> tmp;
@@ -92,7 +92,7 @@
 		return;
 
 	m_selection.clear();
-	m_tmpLines = m_doc->MLineStyles;
+	m_tmpLines = m_doc->docLineStyles;
 }
 
 void SMLineStyle::selected(const QStringList &styleNames)
@@ -248,7 +248,7 @@
 		return;
 
 	PageItem* ite;
-	m_doc->MLineStyles = m_tmpLines;
+	m_doc->docLineStyles = m_tmpLines;
 	QMap<QString, QString> replacement;
 	for (int i = 0; i < m_deleted.count(); ++i)
 	{
@@ -264,7 +264,7 @@
 		ite = m_doc->DocItems.at(d);
 		if (!ite->NamedLStyle.isEmpty())
 		{
-			if (!m_doc->MLineStyles.contains(ite->NamedLStyle))
+			if (!m_doc->docLineStyles.contains(ite->NamedLStyle))
 				ite->NamedLStyle = replacement[ite->NamedLStyle];
 		}
 	}
@@ -273,7 +273,7 @@
 		ite = m_doc->MasterItems.at(d1);
 		if (!ite->NamedLStyle.isEmpty())
 		{
-			if (!m_doc->MLineStyles.contains(ite->NamedLStyle))
+			if (!m_doc->docLineStyles.contains(ite->NamedLStyle))
 				ite->NamedLStyle = replacement[ite->NamedLStyle];
 		}
 	}
@@ -282,7 +282,7 @@
 		ite = it.value();
 		if (!ite->NamedLStyle.isEmpty())
 		{
-			if (!m_doc->MLineStyles.contains(ite->NamedLStyle))
+			if (!m_doc->docLineStyles.contains(ite->NamedLStyle))
 				ite->NamedLStyle = replacement[ite->NamedLStyle];
 		}
 	}




More information about the scribus-commit mailing list