r22725 by jghali - refactor VGradient and VGradientEx classes

scribus-commit scribus-commit at lists.scribus.net
Sat Oct 6 00:03:19 UTC 2018


Author: jghali
Date: Sat Oct  6 00:03:19 2018
New Revision: 22725

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22725
Log:
refactor VGradient and VGradientEx classes

Modified:
    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/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/import/oodraw/oodrawimp.cpp
    trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scpainterex_cairo.cpp
    trunk/Scribus/scribus/scpainterex_ps2.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/ui/colorsandfills.cpp
    trunk/Scribus/scribus/ui/gradientpreview.cpp
    trunk/Scribus/scribus/vgradient.cpp
    trunk/Scribus/scribus/vgradient.h
    trunk/Scribus/scribus/vgradientex.cpp
    trunk/Scribus/scribus/vgradientex.h

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Sat Oct  6 00:03:19 2018
@@ -1878,7 +1878,7 @@
 					gradientVal = "";
 				if (!(gradientVal.isEmpty()) && (m_Doc->docGradients.contains(gradientVal)))
 					fill_gradient = m_Doc->docGradients[gradientVal];
-				if ((fill_gradient.Stops() < 2) && (GrType < 9)) // fall back to solid filling if there are not enough colorstops in the gradient.
+				if ((fill_gradient.stops() < 2) && (GrType < 9)) // fall back to solid filling if there are not enough colorstops in the gradient.
 				{
 					if (fillColor() != CommonStrings::None)
 					{
@@ -2076,7 +2076,7 @@
 							gradientStrokeVal = "";
 						if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 							stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
-						if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+						if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 						{
 							if (lineColor() != CommonStrings::None)
 							{
@@ -3287,7 +3287,7 @@
 {
 	VGradient gradient;
 	gradient.clearStops();
-	if (fill_gradient.Stops() < 2)
+	if (fill_gradient.stops() < 2)
 	{
 		fill_gradient.clearStops();
 		const ScColor& col = m_Doc->PageColors["Black"];
@@ -3301,7 +3301,7 @@
 	double lastStop = -1.0;
 	double actualStop = 0.0;
 	bool   isFirst = true;
-	for (int cst = 0; cst < fill_gradient.Stops(); ++cst)
+	for (int cst = 0; cst < fill_gradient.stops(); ++cst)
 	{
 		actualStop = cstops.at(cst)->rampPoint;
 		if ((actualStop == lastStop) && (!isFirst))
@@ -3345,7 +3345,7 @@
 			while (actualStop > actDist);
 			gradient.addStop(cstops.at(cst)->color, cstops.at(cst)->rampPoint, cstops.at(cst)->midPoint, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
 		}
-		if ((cst == fill_gradient.Stops()-1) && (actualStop < 1.0))
+		if ((cst == fill_gradient.stops()-1) && (actualStop < 1.0))
 		{
 			double distToGo = 1.0 - actualStop;
 			if (distToGo <= 0.25)
@@ -3444,7 +3444,7 @@
 	mgP3.color.setAlphaF(mgP3.transparency);
 	mgList2.append(mgP3);
 	startAngle -= stepAngle;
-	for (int rst = 2; rst < gradient.Stops(); ++rst)
+	for (int rst = 2; rst < gradient.stops(); ++rst)
 	{
 		stepAngle = 360 * (rstops.at(rst)->rampPoint - rstops.at(rst-1)->rampPoint);
 		if (stepAngle <= 0)
@@ -7725,7 +7725,7 @@
 		GrColorP4 = *it;
 
 	QList<VColorStop*> cstops = fill_gradient.colorStops();
-	for (int cst = 0; cst < fill_gradient.Stops(); ++cst)
+	for (int cst = 0; cst < fill_gradient.stops(); ++cst)
 	{
 		it = newNames.colors().find(cstops.at(cst)->name);
 		if (it != newNames.colors().end())
@@ -7760,7 +7760,7 @@
 			meshGradientPatches[col].BR.colorName = *it;
 	}
 	cstops = stroke_gradient.colorStops();
-	for (int cst = 0; cst < stroke_gradient.Stops(); ++cst)
+	for (int cst = 0; cst < stroke_gradient.stops(); ++cst)
 	{
 		it = newNames.colors().find(cstops.at(cst)->name);
 		if (it != newNames.colors().end())
@@ -7770,7 +7770,7 @@
 		}
 	}
 	cstops = mask_gradient.colorStops();
-	for (int cst = 0; cst < mask_gradient.Stops(); ++cst)
+	for (int cst = 0; cst < mask_gradient.stops(); ++cst)
 	{
 		it = newNames.colors().find(cstops.at(cst)->name);
 		if (it != newNames.colors().end())
@@ -8694,7 +8694,7 @@
 		if ((!gradientVal.isEmpty()) && (m_Doc->docGradients.contains(gradientVal)))
 			lists.collectGradient(gradientVal);
 		QList<VColorStop*> cstops = fill_gradient.colorStops();
-		for (int cst = 0; cst < fill_gradient.Stops(); ++cst)
+		for (int cst = 0; cst < fill_gradient.stops(); ++cst)
 		{
 			lists.collectColor(cstops.at(cst)->name);
 		}
@@ -8734,7 +8734,7 @@
 		if ((!gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 			lists.collectGradient(gradientStrokeVal);
 		QList<VColorStop*> cstops = stroke_gradient.colorStops();
-		for (int cst = 0; cst < stroke_gradient.Stops(); ++cst)
+		for (int cst = 0; cst < stroke_gradient.stops(); ++cst)
 		{
 			lists.collectColor(cstops.at(cst)->name);
 		}
@@ -8742,7 +8742,7 @@
 	if ((GrMask == 1) || (GrMask == 2) || (GrMask == 4) || (GrMask == 5))
 	{
 		QList<VColorStop*> cstops = mask_gradient.colorStops();
-		for (int cst = 0; cst < mask_gradient.Stops(); ++cst)
+		for (int cst = 0; cst < mask_gradient.stops(); ++cst)
 		{
 			lists.collectColor(cstops.at(cst)->name);
 		}
@@ -9669,7 +9669,7 @@
 					gradientStrokeVal = "";
 				if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 					stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
-				if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+				if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 				{
 					if (lineColor() != CommonStrings::None)
 					{

Modified: trunk/Scribus/scribus/pageitem_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/pageitem_line.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_line.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_line.cpp	Sat Oct  6 00:03:19 2018
@@ -86,7 +86,7 @@
 					gradientStrokeVal = "";
 				if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 					stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
-				if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+				if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 				{
 					if (lineColor() != CommonStrings::None)
 					{

Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_pathtext.cpp	Sat Oct  6 00:03:19 2018
@@ -109,7 +109,7 @@
 						gradientStrokeVal = "";
 					if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 						stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
-					if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+					if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 					{
 						if (lineColor() != CommonStrings::None)
 						{

Modified: trunk/Scribus/scribus/pageitem_polyline.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/pageitem_polyline.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_polyline.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_polyline.cpp	Sat Oct  6 00:03:19 2018
@@ -119,7 +119,7 @@
 					gradientStrokeVal = "";
 				if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 					stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
-				if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+				if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 				{
 					if (lineColor() != CommonStrings::None)
 					{

Modified: trunk/Scribus/scribus/pageitem_spiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/pageitem_spiral.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_spiral.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_spiral.cpp	Sat Oct  6 00:03:19 2018
@@ -124,7 +124,7 @@
 					gradientStrokeVal = "";
 				if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 					stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
-				if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+				if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 				{
 					if (lineColor() != CommonStrings::None)
 					{

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sat Oct  6 00:03:19 2018
@@ -3686,7 +3686,7 @@
 						gradientStrokeVal = "";
 					if (!(gradientStrokeVal.isEmpty()) && (m_Doc->docGradients.contains(gradientStrokeVal)))
 						stroke_gradient = m_Doc->docGradients[gradientStrokeVal];
-					if (stroke_gradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+					if (stroke_gradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 					{
 						if (lineColor() != CommonStrings::None)
 						{

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Sat Oct  6 00:03:19 2018
@@ -6225,7 +6225,7 @@
 			mpa.scale(1, Gscale);
 		}
 		QColor qStopColor;
-		for (int cst = 0; cst < gradient.Stops(); ++cst)
+		for (int cst = 0; cst < gradient.stops(); ++cst)
 		{
 			double actualStop = cstops.at(cst)->rampPoint;
 			qStopColor = cstops.at(cst)->color;
@@ -6241,7 +6241,7 @@
 			}
 			StopVec.append(actualStop);
 			TransVec.append(a);
-			if ((cst == gradient.Stops()-1) && (actualStop < 1.0))
+			if ((cst == gradient.stops()-1) && (actualStop < 1.0))
 			{
 				StopVec.append(1.0);
 				TransVec.append(a);
@@ -7401,7 +7401,7 @@
 	Gcolors.clear();
 	colorNames.clear();
 	colorShades.clear();
-	for (int cst = 0; cst < gradient.Stops(); ++cst)
+	for (int cst = 0; cst < gradient.stops(); ++cst)
 	{
 		double actualStop = cstops.at(cst)->rampPoint;
 		if (cst == 0)
@@ -8242,7 +8242,7 @@
 	double lastStop = -1.0;
 	double actualStop = 0.0;
 	bool   isFirst = true, transparencyFound = false;
-	for (int cst = 0; cst < gradient.Stops(); ++cst)
+	for (int cst = 0; cst < gradient.stops(); ++cst)
 	{
 		actualStop = cstops.at(cst)->rampPoint;
 		if ((actualStop == lastStop) && (!isFirst))
@@ -8274,7 +8274,7 @@
 				spotColorSet.append(cstops.at(cst)->name);
 		}
 		Gcolors.append(SetGradientColor(cstops.at(cst)->name, cstops.at(cst)->shade));
-		if ((cst == gradient.Stops()-1) && (actualStop < 1.0))
+		if ((cst == gradient.stops()-1) && (actualStop < 1.0))
 		{
 			StopVec.append(1.0);
 			colorNames.append(cstops.at(cst)->name);

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&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	Sat Oct  6 00:03:19 2018
@@ -1591,7 +1591,7 @@
 				bool   isFirst = true;
 				double actualStop = 0.0, lastStop = 0.0;
 				QList<VColorStop*> cstops = Item->stroke_gradient.colorStops();
-				for (int cst = 0; cst < Item->stroke_gradient.Stops(); ++cst)
+				for (int cst = 0; cst < Item->stroke_gradient.stops(); ++cst)
 				{
 					actualStop = cstops.at(cst)->rampPoint;
 					if ((actualStop != lastStop) || (isFirst))
@@ -1756,7 +1756,7 @@
 				bool   isFirst = true;
 				double actualStop = 0.0, lastStop = 0.0;
 				QList<VColorStop*> cstops = Item->stroke_gradient.colorStops();
-				for (int cst = 0; cst < Item->stroke_gradient.Stops(); ++cst)
+				for (int cst = 0; cst < Item->stroke_gradient.stops(); ++cst)
 				{
 					actualStop = cstops.at(cst)->rampPoint;
 					if ((actualStop != lastStop) || (isFirst))
@@ -1918,7 +1918,7 @@
 			grad.setAttribute("id", "Grad"+IToStr(GradCount));
 			grad.setAttribute("gradientUnits", "userSpaceOnUse");
 			QList<VColorStop*> cstops = Item->mask_gradient.colorStops();
-			for (int cst = 0; cst < Item->mask_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < Item->mask_gradient.stops(); ++cst)
 			{
 				QDomElement itcl = docu.createElement("stop");
 				itcl.setAttribute("offset", FToStr(cstops.at(cst)->rampPoint*100)+"%");
@@ -2043,7 +2043,7 @@
 				bool   isFirst = true;
 				double actualStop = 0.0, lastStop = 0.0;
 				QList<VColorStop*> cstops = Item->fill_gradient.colorStops();
-				for (int cst = 0; cst < Item->fill_gradient.Stops(); ++cst)
+				for (int cst = 0; cst < Item->fill_gradient.stops(); ++cst)
 				{
 					actualStop = cstops.at(cst)->rampPoint;
 					if ((actualStop != lastStop) || (isFirst))
@@ -2230,7 +2230,7 @@
 		bool   isFirst = true;
 		double actualStop = 0.0, lastStop = 0.0;
 		QList<VColorStop*> cstops = Item->stroke_gradient.colorStops();
-		for (int cst = 0; cst < Item->stroke_gradient.Stops(); ++cst)
+		for (int cst = 0; cst < Item->stroke_gradient.stops(); ++cst)
 		{
 			actualStop = cstops.at(cst)->rampPoint;
 			if ((actualStop != lastStop) || (isFirst))

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&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	Sat Oct  6 00:03:19 2018
@@ -2104,7 +2104,7 @@
 			bool   isFirst = true;
 			double actualStop = 0.0, lastStop = 0.0;
 			QList<VColorStop*> cstops = Item->stroke_gradient.colorStops();
-			for (int cst = 0; cst < Item->stroke_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < Item->stroke_gradient.stops(); ++cst)
 			{
 				actualStop = cstops.at(cst)->rampPoint;
 				if ((actualStop != lastStop) || (isFirst))
@@ -2204,7 +2204,7 @@
 		bool   isFirst = true;
 		double actualStop = 0.0, lastStop = 0.0;
 		QList<VColorStop*> cstops = Item->fill_gradient.colorStops();
-		for (int cst = 0; cst < Item->fill_gradient.Stops(); ++cst)
+		for (int cst = 0; cst < Item->fill_gradient.stops(); ++cst)
 		{
 			actualStop = cstops.at(cst)->rampPoint;
 			if ((actualStop != lastStop) || (isFirst))
@@ -2336,7 +2336,7 @@
 		bool   isFirst = true;
 		double actualStop = 0.0, lastStop = 0.0;
 		QList<VColorStop*> cstops = Item->mask_gradient.colorStops();
-		for (int cst = 0; cst < Item->mask_gradient.Stops(); ++cst)
+		for (int cst = 0; cst < Item->mask_gradient.stops(); ++cst)
 		{
 			actualStop = cstops.at(cst)->rampPoint;
 			if ((actualStop != lastStop) || (isFirst))

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&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	Sat Oct  6 00:03:19 2018
@@ -2082,7 +2082,7 @@
 		newItem->itemText.setDefaultStyle(newDefault);
 	}
 
-	if (newItem->fill_gradient.Stops() == 0)
+	if (newItem->fill_gradient.stops() == 0)
 	{
 		const ScColor& col1 = doc->PageColors[doc->itemToolPrefs().shapeFillColor];
 		const ScColor& col2 = doc->PageColors[doc->itemToolPrefs().shapeLineColor];

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&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	Sat Oct  6 00:03:19 2018
@@ -929,7 +929,7 @@
 					IT=IT.nextSibling();
 				}
 				delete last;
-				if (Neu->fill_gradient.Stops() == 0)
+				if (Neu->fill_gradient.stops() == 0)
 				{
 					const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs().shapeFillColor];
 					const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs().shapeLineColor];
@@ -2334,7 +2334,7 @@
 						IT=IT.nextSibling();
 					}
 					delete last;
-					if (Neu->fill_gradient.Stops() == 0)
+					if (Neu->fill_gradient.stops() == 0)
 					{
 						const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs().shapeFillColor];
 						const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs().shapeLineColor];

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&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	Sat Oct  6 00:03:19 2018
@@ -4157,7 +4157,7 @@
 		newItem->itemText.setDefaultStyle(newDefault);
 	}
 
-	if (newItem->fill_gradient.Stops() == 0)
+	if (newItem->fill_gradient.stops() == 0)
 	{
 		const ScColor& col1 = doc->PageColors[doc->itemToolPrefs().shapeFillColor];
 		const ScColor& col2 = doc->PageColors[doc->itemToolPrefs().shapeLineColor];
@@ -4165,7 +4165,7 @@
 		newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs().shapeLineColor, 100);
 	}
 
-	if (newItem->stroke_gradient.Stops() == 0)
+	if (newItem->stroke_gradient.stops() == 0)
 	{
 		const ScColor& col1 = doc->PageColors[doc->itemToolPrefs().shapeFillColor];
 		const ScColor& col2 = doc->PageColors[doc->itemToolPrefs().shapeLineColor];
@@ -4173,7 +4173,7 @@
 		newItem->stroke_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs().shapeLineColor, 100);
 	}
 
-	if (newItem->mask_gradient.Stops() == 0)
+	if (newItem->mask_gradient.stops() == 0)
 	{
 		const ScColor& col1 = doc->PageColors[doc->itemToolPrefs().shapeFillColor];
 		const ScColor& col2 = doc->PageColors[doc->itemToolPrefs().shapeLineColor];

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&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	Sat Oct  6 00:03:19 2018
@@ -635,7 +635,7 @@
 		VGradient gra = itGrad.value();
 		docu.writeAttribute("Ext", gra.repeatMethod());
 		const QList<VColorStop*>& cstops = gra.colorStops();
-		for (int cst = 0; cst < gra.Stops(); ++cst)
+		for (int cst = 0; cst < gra.stops(); ++cst)
 		{
 			docu.writeEmptyElement("CSTOP");
 			docu.writeAttribute("RAMP", cstops.at(cst)->rampPoint);
@@ -2073,7 +2073,7 @@
 		if (((item->GrType > 0) && (item->GrType != 8) && (item->GrType != 9) && (item->GrType != 11) && (item->GrType != 14)) && (item->gradient().isEmpty()))
 		{
 			QList<VColorStop*> cstops = item->fill_gradient.colorStops();
-			for (int cst = 0; cst < item->fill_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < item->fill_gradient.stops(); ++cst)
 			{
 				docu.writeEmptyElement("CSTOP");
 				docu.writeAttribute("RAMP", cstops.at(cst)->rampPoint);
@@ -2085,7 +2085,7 @@
 		if ((item->GrTypeStroke > 0) && (item->strokeGradient().isEmpty()))
 		{
 			QList<VColorStop*> cstops = item->stroke_gradient.colorStops();
-			for (int cst = 0; cst < item->stroke_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < item->stroke_gradient.stops(); ++cst)
 			{
 				docu.writeEmptyElement("S_CSTOP");
 				docu.writeAttribute("RAMP", cstops.at(cst)->rampPoint);
@@ -2097,7 +2097,7 @@
 		if ((item->GrMask > 0) && (item->gradientMask().isEmpty()))
 		{
 			QList<VColorStop*> cstops = item->mask_gradient.colorStops();
-			for (int cst = 0; cst < item->mask_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < item->mask_gradient.stops(); ++cst)
 			{
 				docu.writeEmptyElement("M_CSTOP");
 				docu.writeAttribute("RAMP", cstops.at(cst)->rampPoint);

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	Sat Oct  6 00:03:19 2018
@@ -1153,7 +1153,7 @@
 	if (oostyle.haveGradient)
 	{
 		item->GrType = 0;
-		if (oostyle.gradient.Stops() > 1)
+		if (oostyle.gradient.stops() > 1)
 		{
 			item->fill_gradient = oostyle.gradient;
 			if (oostyle.gradientType == 1)

Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp	Sat Oct  6 00:03:19 2018
@@ -748,7 +748,7 @@
 					}
 				}
 			}
-			if (currentGradient.Stops() > 1)
+			if (currentGradient.stops() > 1)
 				isGradient = true;
 		}
 		else
@@ -2429,7 +2429,7 @@
 					}
 				}
 			}
-			if (currentGradient.Stops() > 1)
+			if (currentGradient.stops() > 1)
 				isGradient = true;
 		}
 		else

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp	Sat Oct  6 00:03:19 2018
@@ -699,7 +699,7 @@
 		}
 		else
 		{
-			if (gc->FillGradient.Stops() > 1)
+			if (gc->FillGradient.stops() > 1)
 			{
 				item->fill_gradient = gc->FillGradient;
 				item->setGradient(importedGradTrans[gc->GFillCol1]);
@@ -778,7 +778,7 @@
 		}
 		else
 		{
-			if (gc->StrokeGradient.Stops() > 1)
+			if (gc->StrokeGradient.stops() > 1)
 			{
 				item->stroke_gradient = gc->StrokeGradient;
 				item->setStrokeGradient(importedGradTrans[gc->GStrokeCol1]);

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Sat Oct  6 00:03:19 2018
@@ -3482,7 +3482,7 @@
 	gradient.setRepeatMethod(item->getGradientExtend());
 	QList<VColorStop*> colorStops = gradient.colorStops();
 	QList<double> qStopRampPoints;
-	for (int cst = 0; cst < gradient.Stops(); ++cst)
+	for (int cst = 0; cst < gradient.stops(); ++cst)
 	{
 		if (cst == 0)
 		{
@@ -3893,7 +3893,7 @@
 	PutStream("/PatternType 2\n");
 	PutStream("/Shading\n");
 	PutStream("<<\n");
-	for (int cst = 0; cst < gradient.Stops(); ++cst)
+	for (int cst = 0; cst < gradient.stops(); ++cst)
 	{
 		double actualStop = cstops.at(cst)->rampPoint;
 		if ((cst == 0) && (actualStop != 0.0))
@@ -3910,7 +3910,7 @@
 			if (!spotColorSet.contains(cstops.at(cst)->name))
 				spotColorSet.append(cstops.at(cst)->name);
 		}
-		if ((cst == gradient.Stops()-1) && (actualStop < 1.0))
+		if ((cst == gradient.stops()-1) && (actualStop < 1.0))
 		{
 			StopVec.append(1.0);
 			colorNames.append(cstops.at(cst)->name);

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Sat Oct  6 00:03:19 2018
@@ -279,7 +279,7 @@
 			gradientVal = "";
 		if (!(gradientVal.isEmpty()) && (m_doc->docGradients.contains(gradientVal)))
 			painter->m_fillGradient = VGradientEx(m_doc->docGradients[gradientVal], *m_doc);
-		if ((painter->m_fillGradient.Stops() < 2) && (item->GrType < 9)) // fall back to solid filling if there are not enough colorstops in the gradient.
+		if ((painter->m_fillGradient.stops() < 2) && (item->GrType < 9)) // fall back to solid filling if there are not enough colorstops in the gradient.
 		{
 			if (item->fillColor() != CommonStrings::None)
 			{
@@ -447,7 +447,7 @@
 						gradientStrokeVal = "";
 					if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
 						painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
-					if (painter->m_strokeGradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+					if (painter->m_strokeGradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 					{
 						if (item->lineColor() != CommonStrings::None)
 						{
@@ -855,7 +855,7 @@
 				gradientStrokeVal = "";
 			if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
 				painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
-			if (painter->m_strokeGradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+			if (painter->m_strokeGradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 			{
 				if (item->lineColor() != CommonStrings::None)
 				{
@@ -1192,7 +1192,7 @@
 				gradientStrokeVal = "";
 			if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
 				painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
-			if (painter->m_strokeGradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+			if (painter->m_strokeGradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 			{
 				if (item->lineColor() != CommonStrings::None)
 				{
@@ -1359,7 +1359,7 @@
 				gradientStrokeVal = "";
 			if (!(gradientStrokeVal.isEmpty()) && (m_doc->docGradients.contains(gradientStrokeVal)))
 				painter->m_strokeGradient = VGradientEx(m_doc->docGradients[gradientStrokeVal], *m_doc);
-			if (painter->m_strokeGradient.Stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
+			if (painter->m_strokeGradient.stops() < 2) // fall back to solid stroking if there are not enough colorstops in the gradient.
 			{
 				if (item->lineColor() != CommonStrings::None)
 				{

Modified: trunk/Scribus/scribus/scpainterex_cairo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/scpainterex_cairo.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_cairo.cpp	(original)
+++ trunk/Scribus/scribus/scpainterex_cairo.cpp	Sat Oct  6 00:03:19 2018
@@ -661,7 +661,7 @@
 	VColorStopEx* stop = nullptr;
 	QColor color;
 
-	if ( gradient.Stops() < 2 )
+	if ( gradient.stops() < 2 )
 		return;
 
 	double x1 = gradient.origin().x();
@@ -674,7 +674,7 @@
 
 	bool   isFirst  = true;
 	double lastStop = 0.0;
-	for (uint index = 0 ; index < gradient.Stops(); index++)
+	for (int index = 0 ; index < gradient.stops(); index++)
 	{
 		stop  = colorStops.at(index);
 		if ((lastStop == stop->rampPoint) && (!isFirst))
@@ -725,7 +725,7 @@
 
 	bool   isFirst  = true;
 	double lastStop = 0.0;
-	for (uint index = 0 ; index < gradient.Stops() ; index++)
+	for (int index = 0 ; index < gradient.stops() ; index++)
 	{
 		stop  = colorStops.at(index);
 		if ((lastStop == stop->rampPoint) && (!isFirst))
@@ -1241,7 +1241,7 @@
 
 	bool   isFirst  = true;
 	double lastStop = 0.0;
-	for (uint index = 0 ; index < gradient.Stops(); index++)
+	for (int index = 0 ; index < gradient.stops(); index++)
 	{
 		stop  = colorStops.at(index);
 		if ((lastStop == stop->rampPoint) && (!isFirst))
@@ -1293,7 +1293,7 @@
 
 	bool   isFirst  = true;
 	double lastStop = 0.0;
-	for (uint index = 0 ; index < gradient.Stops(); index++)
+	for (int index = 0 ; index < gradient.stops(); index++)
 	{
 		stop  = colorStops.at(index);
 		if ((lastStop == stop->rampPoint) && (!isFirst))

Modified: trunk/Scribus/scribus/scpainterex_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/scpainterex_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_ps2.cpp	(original)
+++ trunk/Scribus/scribus/scpainterex_ps2.cpp	Sat Oct  6 00:03:19 2018
@@ -999,7 +999,7 @@
 	RGBColorF rgb;
 	FPoint p1, p2;
 
-	if (gradient.Stops() < 2) 
+	if (gradient.stops() < 2) 
 		return;
 
 	clipBoxWidth = rect.width();
@@ -1032,7 +1032,7 @@
 	rgb.getValues(r1, g1, b1);
 	m_stream << QString("%1 %2 %3 setrgbcolor fill\n").arg(r1/255.0).arg(g1/255.0).arg(b1/255.0);
 
-	for (uint index = 1; index < gradient.Stops(); index++)
+	for (int index = 1; index < gradient.stops(); index++)
 	{
 		stop2 = *colorStops[index];
 		ramp2 = stop2.rampPoint;
@@ -1098,7 +1098,7 @@
 	CMYKColorF cmyk;
 	FPoint p1, p2;
 
-	if ( gradient.Stops() < 2 ) 
+	if ( gradient.stops() < 2 ) 
 		return;
 
 	clipBoxWidth = rect.width();
@@ -1132,7 +1132,7 @@
 	m_stream << QString("/DeviceCMYK setcolorspace\n");
 	m_stream << QString("%1 %2 %3 %4 setcolor fill\n").arg(c1).arg(m1).arg(j1).arg(n1);
 
-	for (uint index = 1; index < gradient.Stops(); index++)
+	for (int index = 1; index < gradient.stops(); index++)
 	{
 		stop2 = *colorStops[index];
 		ramp2 = stop2.rampPoint;
@@ -1204,8 +1204,8 @@
 	double ramp1, ramp2;
 	int clipBoxWidth, clipBoxHeight, maxDim;
 	QList<VColorStopEx*> colorStops = gradient.colorStops();
-	VColorStopEx stop1( *colorStops[gradient.Stops() - 1] );
-	VColorStopEx stop2( *colorStops[gradient.Stops() - 1] );
+	VColorStopEx stop1( *colorStops[gradient.stops() - 1] );
+	VColorStopEx stop2( *colorStops[gradient.stops() - 1] );
 	RGBColorF rgb;
 
 	clipBoxWidth = rect.width();
@@ -1231,9 +1231,9 @@
 	ScColorEngine::getShadeColorRGB(stop2.color, m_options.document, rgb, stop2.shade);
 	rgb.getValues(r2, g2, b2);
 	m_stream << QString("%1 %2 %3 setrgbcolor fill\n").arg(r2).arg(g2).arg(b2);
-	if ( gradient.Stops() < 2 ) return;
-
-	for (int index = gradient.Stops() - 2; index >= 0; index--)
+	if ( gradient.stops() < 2 ) return;
+
+	for (int index = gradient.stops() - 2; index >= 0; index--)
 	{
 		stop1 = *colorStops[index];
 		ramp1 = stop1.rampPoint;
@@ -1286,8 +1286,8 @@
 	double ramp1, ramp2;
 	int clipBoxWidth, clipBoxHeight, maxDim;
 	QList<VColorStopEx*> colorStops = gradient.colorStops();
-	VColorStopEx stop1( *colorStops[gradient.Stops() - 1] );
-	VColorStopEx stop2( *colorStops[gradient.Stops() - 1] );
+	VColorStopEx stop1( *colorStops[gradient.stops() - 1] );
+	VColorStopEx stop2( *colorStops[gradient.stops() - 1] );
 	CMYKColorF cmyk;
 
 	clipBoxWidth = rect.width();
@@ -1314,9 +1314,9 @@
 	cmyk.getValues(c2, m2, y2, k2);
 	m_stream << QString("/DeviceCMYK setcolorspace\n");
 	m_stream << QString("%0 %1 %2 %3 setcolor fill\n").arg(c2).arg(m2).arg(y2).arg(k2);
-	if (gradient.Stops() < 2) return;
-
-	for (int index = gradient.Stops() - 2; index >= 0; index--)
+	if (gradient.stops() < 2) return;
+
+	for (int index = gradient.stops() - 2; index >= 0; index--)
 	{
 		stop1 = *colorStops[index];
 		ramp1 = stop1.rampPoint;

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Sat Oct  6 00:03:19 2018
@@ -1158,7 +1158,7 @@
 	for (itg = docGradients.begin(); itg != docGradients.end(); ++itg)
 	{
 		QList<VColorStop*> cstops = itg.value().colorStops();
-		for (int cst = 0; cst < itg.value().Stops(); ++cst)
+		for (int cst = 0; cst < itg.value().stops(); ++cst)
 		{
 			lists.collectColor(cstops.at(cst)->name);
 		}
@@ -1400,7 +1400,7 @@
 			
 		QMap<QString,QString>::ConstIterator itc;
 		QList<VColorStop*> cstops = itg.value().colorStops();
-		for (int cst = 0; cst < itg.value().Stops(); ++cst)
+		for (int cst = 0; cst < itg.value().stops(); ++cst)
 		{
 			itc = newNames.colors().find(cstops.at(cst)->name);
 			if (itc != newNames.colors().end())
@@ -5000,13 +5000,13 @@
 				ite->setMeshPointColor(grow, 4, patch.BL.colorName, patch.BL.shade, patch.BL.transparency, true);
 			}
 			QList<VColorStop*> cstops = ite->fill_gradient.colorStops();
-			for (int cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->fill_gradient.stops(); ++cst)
 				ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 			cstops = ite->stroke_gradient.colorStops();
-			for (int cst = 0; cst < ite->stroke_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->stroke_gradient.stops(); ++cst)
 				ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 			cstops = ite->mask_gradient.colorStops();
-			for (int cst = 0; cst < ite->mask_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->mask_gradient.stops(); ++cst)
 				ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 			if (ite->GrType == 13)
 				ite->createConicalMesh();
@@ -5045,13 +5045,13 @@
 			ite->setMeshPointColor(grow, 4, patch.BL.colorName, patch.BL.shade, patch.BL.transparency, true);
 		}
 		QList<VColorStop*> cstops = ite->fill_gradient.colorStops();
-		for (int cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
+		for (int cst = 0; cst < ite->fill_gradient.stops(); ++cst)
 			ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 		cstops = ite->stroke_gradient.colorStops();
-		for (int cst = 0; cst < ite->stroke_gradient.Stops(); ++cst)
+		for (int cst = 0; cst < ite->stroke_gradient.stops(); ++cst)
 			ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 		cstops = ite->mask_gradient.colorStops();
-		for (int cst = 0; cst < ite->mask_gradient.Stops(); ++cst)
+		for (int cst = 0; cst < ite->mask_gradient.stops(); ++cst)
 			ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 		if (ite->GrType == 13)
 			ite->createConicalMesh();
@@ -5069,7 +5069,7 @@
 	for (itGrad = docGradients.begin(); itGrad != docGradients.end(); ++itGrad)
 	{
 		QList<VColorStop*> cstops = itGrad.value().colorStops();
-		for (int cst = 0; cst < itGrad.value().Stops(); ++cst)
+		for (int cst = 0; cst < itGrad.value().stops(); ++cst)
 		{
 			if (cstops.at(cst)->name != CommonStrings::None)
 			{
@@ -5120,13 +5120,13 @@
 				ite->setMeshPointColor(grow, 4, patch.BL.colorName, patch.BL.shade, patch.BL.transparency, true);
 			}
 			QList<VColorStop*> cstops = ite->fill_gradient.colorStops();
-			for (int cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->fill_gradient.stops(); ++cst)
 				ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 			cstops = ite->stroke_gradient.colorStops();
-			for (int cst = 0; cst < ite->stroke_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->stroke_gradient.stops(); ++cst)
 				ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 			cstops = ite->mask_gradient.colorStops();
-			for (int cst = 0; cst < ite->mask_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->mask_gradient.stops(); ++cst)
 				ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 			if (ite->GrType == 13)
 				ite->createConicalMesh();
@@ -5170,13 +5170,13 @@
 					ite->setMeshPointColor(grow, 4, patch.BL.colorName, patch.BL.shade, patch.BL.transparency, true);
 				}
 				QList<VColorStop*> cstops = ite->fill_gradient.colorStops();
-				for (int cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
+				for (int cst = 0; cst < ite->fill_gradient.stops(); ++cst)
 					ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 				cstops = ite->stroke_gradient.colorStops();
-				for (int cst = 0; cst < ite->stroke_gradient.Stops(); ++cst)
+				for (int cst = 0; cst < ite->stroke_gradient.stops(); ++cst)
 					ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 				cstops = ite->mask_gradient.colorStops();
-				for (int cst = 0; cst < ite->mask_gradient.Stops(); ++cst)
+				for (int cst = 0; cst < ite->mask_gradient.stops(); ++cst)
 					ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
 				if (ite->asImageFrame())
 					loadPict(ite->Pfile, ite, true, false);

Modified: trunk/Scribus/scribus/ui/colorsandfills.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/ui/colorsandfills.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorsandfills.cpp	Sat Oct  6 00:03:19 2018
@@ -1462,7 +1462,7 @@
 	for (itg = dialogGradients.begin(); itg != dialogGradients.end(); ++itg)
 	{
 		QList<VColorStop*> cstops = itg.value().colorStops();
-		for (int cst = 0; cst < itg.value().Stops(); ++cst)
+		for (int cst = 0; cst < itg.value().stops(); ++cst)
 		{
 			if ((!colorList.contains(cstops.at(cst)->name)) && (cstops.at(cst)->name != CommonStrings::None))
 				colorList.insert(cstops.at(cst)->name, m_colorList[cstops.at(cst)->name]);
@@ -1499,19 +1499,19 @@
 				}
 			}
 			QList<VColorStop*> cstops = ite->fill_gradient.colorStops();
-			for (int cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->fill_gradient.stops(); ++cst)
 			{
 				if ((!colorList.contains(cstops.at(cst)->name)) && (cstops.at(cst)->name != CommonStrings::None))
 					colorList.insert(cstops.at(cst)->name, m_colorList[cstops.at(cst)->name]);
 			}
 			cstops = ite->stroke_gradient.colorStops();
-			for (int cst = 0; cst < ite->stroke_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->stroke_gradient.stops(); ++cst)
 			{
 				if ((!colorList.contains(cstops.at(cst)->name)) && (cstops.at(cst)->name != CommonStrings::None))
 					colorList.insert(cstops.at(cst)->name, m_colorList[cstops.at(cst)->name]);
 			}
 			cstops = ite->mask_gradient.colorStops();
-			for (int cst = 0; cst < ite->mask_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->mask_gradient.stops(); ++cst)
 			{
 				if ((!colorList.contains(cstops.at(cst)->name)) && (cstops.at(cst)->name != CommonStrings::None))
 					colorList.insert(cstops.at(cst)->name, m_colorList[cstops.at(cst)->name]);
@@ -1528,7 +1528,7 @@
 	for (itg = dialogGradients.begin(); itg != dialogGradients.end(); ++itg)
 	{
 		QList<VColorStop*> cstops = itg.value().colorStops();
-		for (int cst = 0; cst < itg.value().Stops(); ++cst)
+		for (int cst = 0; cst < itg.value().stops(); ++cst)
 		{
 			if (oldName == cstops.at(cst)->name)
 			{
@@ -1575,7 +1575,7 @@
 				}
 			}
 			QList<VColorStop*> cstops = ite->fill_gradient.colorStops();
-			for (int cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->fill_gradient.stops(); ++cst)
 			{
 				if (oldName == cstops.at(cst)->name)
 				{
@@ -1584,7 +1584,7 @@
 				}
 			}
 			cstops = ite->stroke_gradient.colorStops();
-			for (int cst = 0; cst < ite->stroke_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->stroke_gradient.stops(); ++cst)
 			{
 				if (oldName == cstops.at(cst)->name)
 				{
@@ -1593,7 +1593,7 @@
 				}
 			}
 			cstops = ite->mask_gradient.colorStops();
-			for (int cst = 0; cst < ite->mask_gradient.Stops(); ++cst)
+			for (int cst = 0; cst < ite->mask_gradient.stops(); ++cst)
 			{
 				if (oldName == cstops.at(cst)->name)
 				{

Modified: trunk/Scribus/scribus/ui/gradientpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/ui/gradientpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gradientpreview.cpp	(original)
+++ trunk/Scribus/scribus/ui/gradientpreview.cpp	Sat Oct  6 00:03:19 2018
@@ -64,7 +64,7 @@
 	StopM.clear();
 	contextStop = 0;
 	ActStop = 0;
-	for (int i = 0; i < fill_gradient.Stops(); ++i)
+	for (int i = 0; i < fill_gradient.stops(); ++i)
 	{
 		int center = qRound(cstops.at(i)->rampPoint * (width()-20))+10;
 		StopM.append(center);
@@ -75,7 +75,7 @@
 {
 	QList<VColorStop*> cstops = fill_gradient.colorStops();
 	StopM.clear();
-	for (int i = 0; i < fill_gradient.Stops(); ++i)
+	for (int i = 0; i < fill_gradient.stops(); ++i)
 	{
 		int center = qRound(cstops.at(i)->rampPoint * (width()-20))+10;
 		StopM.append(center);
@@ -100,7 +100,7 @@
 	pw.drawImage(10, 5, pixm);
 	if (isEditable)
 	{
-		for (int i = 0; i < fill_gradient.Stops(); ++i)
+		for (int i = 0; i < fill_gradient.stops(); ++i)
 		{
 			int center = qRound(cstops.at(i)->rampPoint * (width()-20))+10;
 			pw.setPen(QPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));

Modified: trunk/Scribus/scribus/vgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/vgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/vgradient.cpp	(original)
+++ trunk/Scribus/scribus/vgradient.cpp	Sat Oct  6 00:03:19 2018
@@ -33,7 +33,7 @@
 {
 	double r1 = item1->rampPoint;
 	double r2 = item2->rampPoint;
-	return ( r1 < r2 );
+	return (r1 < r2);
 }
 
 int VGradient::compareItems(const VColorStop* item1, const VColorStop* item2 ) const
@@ -41,11 +41,10 @@
 	double r1 = item1->rampPoint;
 	double r2 = item2->rampPoint;
 
-	return ( r1 == r2 ? 0 : r1 < r2 ? -1 : 1 );
-} // VGradient::VColorStopList::compareItems
-
-
-void VGradient::inSort( VColorStop* d )
+	return (r1 == r2 ? 0 : r1 < r2 ? -1 : 1);
+}
+
+void VGradient::inSort(VColorStop* d)
 {
 	int index = 0;
 	VColorStop *n = m_colorStops.value(index);
@@ -57,7 +56,7 @@
 	m_colorStops.insert( qMin(index, m_colorStops.size()), d );
 }
 
-VGradient::VGradient( VGradientType type ) : m_type( type )
+VGradient::VGradient(VGradientType type) : m_type( type )
 {
 	// set up dummy gradient
 	QColor color;
@@ -73,28 +72,30 @@
 	setRepeatMethod( VGradient::pad );
 }
 
-VGradient::VGradient( const VGradient& gradient )
+VGradient::VGradient(const VGradient& gradient)
 {
 	m_origin		= gradient.m_origin;
 	m_focalPoint	= gradient.m_focalPoint;
 	m_vector		= gradient.m_vector;
 	m_type			= gradient.m_type;
 	m_repeatMethod	= gradient.m_repeatMethod;
+
 	clearStops();
+
 	QList<VColorStop*> cs = gradient.colorStops();
 	qStableSort(cs.begin(), cs.end(), compareStops);
 	for (int i = 0; i < cs.count(); ++i)
-		m_colorStops.append( new VColorStop( *cs[i] ) );
-} // VGradient::VGradient
+		m_colorStops.append( new VColorStop(*cs[i]) );
+}
 
 VGradient::~VGradient()
 {
 	clearStops();
 }
 
-VGradient& VGradient::operator=( const VGradient& gradient )
-{
-	if ( this == &gradient )
+VGradient& VGradient::operator=(const VGradient& gradient)
+{
+	if (this == &gradient)
 		return *this;
 
 	m_origin		= gradient.m_origin;
@@ -104,18 +105,20 @@
 	m_repeatMethod	= gradient.m_repeatMethod;
 
 	clearStops();
+
 	QList<VColorStop*> cs = gradient.colorStops();
 	qStableSort(cs.begin(), cs.end(), compareStops);
 	for (int i = 0; i < cs.count(); ++i)
 		m_colorStops.append( new VColorStop( *cs[i] ) );
 	return *this;
-} // VGradient::operator=
+}
 
 bool VGradient::operator==(const VGradient &gradient) const 
 {
-	if (m_colorStops.count() != gradient.Stops())
+	if (m_colorStops.count() != gradient.stops())
 		return false;
 	const QList<VColorStop*>& cs = gradient.colorStops();
+
 	bool retVal = true;
 	for (int i = 0; i < m_colorStops.count(); ++i)
 	{
@@ -146,23 +149,20 @@
 const QList<VColorStop*>& VGradient::colorStops() const
 {
 	return m_colorStops;
-} // VGradient::colorStops()
-
-void
-VGradient::clearStops()
+}
+
+void VGradient::clearStops()
 {
 	while (!m_colorStops.isEmpty())
 		delete m_colorStops.takeFirst();
 }
 
-void
-VGradient::addStop( const VColorStop& colorStop )
+void VGradient::addStop(const VColorStop& colorStop)
 {
 	inSort( new VColorStop( colorStop ) );
-} // VGradient::addStop
-
-void
-VGradient::addStop( const QColor &color, double rampPoint, double midPoint, double opa, const QString& name, int shade )
+}
+
+void VGradient::addStop(const QColor &color, double rampPoint, double midPoint, double opa, const QString& name, int shade)
 {
 	// Clamping between 0.0 and 1.0
 	rampPoint = qMax( 0.0, rampPoint );
@@ -174,8 +174,7 @@
 	inSort( new VColorStop( rampPoint, midPoint, color, opa, name, shade ) );
 }
 
-void 
-VGradient::setStop( const QColor &color, double rampPoint, double midPoint, double opa, const QString& name, int shade )
+void  VGradient::setStop(const QColor &color, double rampPoint, double midPoint, double opa, const QString& name, int shade)
 {
 	for (int i = 0; i < m_colorStops.count(); ++i)
 	{
@@ -188,13 +187,14 @@
 	addStop(color, rampPoint, midPoint, opa, name, shade);
 }
 
-void VGradient::removeStop( VColorStop& colorstop )
+void VGradient::removeStop(VColorStop& colorstop)
 {
 	int n = m_colorStops.indexOf(&colorstop);
-	delete m_colorStops.takeAt(n);
-}
-
-void VGradient::removeStop( uint n )
+	if (n >= 0)
+		delete m_colorStops.takeAt(n);
+}
+
+void VGradient::removeStop(int n)
 {
 	delete m_colorStops.takeAt(n);
 }

Modified: trunk/Scribus/scribus/vgradient.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/vgradient.h
==============================================================================
--- trunk/Scribus/scribus/vgradient.h	(original)
+++ trunk/Scribus/scribus/vgradient.h	Sat Oct  6 00:03:19 2018
@@ -36,7 +36,7 @@
 class SCRIBUS_API VColorStop
 {
 public:
-	VColorStop( double r, double m, const QColor& c, double o, const QString& n, int s )
+	VColorStop(double r, double m, const QColor& c, double o, const QString& n, int s)
 	{
 		rampPoint = r;
 		midPoint = m; 
@@ -46,7 +46,7 @@
 		shade = s;
 	}
 	
-	VColorStop( const VColorStop& colorStop )
+	VColorStop(const VColorStop& colorStop)
 	{
 		rampPoint = colorStop.rampPoint;
 		midPoint = colorStop.midPoint;
@@ -67,13 +67,15 @@
 	double opacity;
 	int shade;
 	QString name;
-	friend inline bool operator== ( VColorStop& s1, VColorStop& s2 )
-	{ return s1.rampPoint == s2.rampPoint; }
-}
-; // VColorStop
+
+	friend inline bool operator== (const VColorStop& s1, const VColorStop& s2)
+	{
+		return s1.rampPoint == s2.rampPoint;
+	}
+};
 
 // comparison function for use with stable_sort
-bool compareStops( const VColorStop* item1, const VColorStop* item2 );
+bool compareStops(const VColorStop* item1, const VColorStop* item2);
 
 class SCRIBUS_API VGradient
 {
@@ -98,48 +100,48 @@
 		pad     = 3
 	};
 
-	VGradient( VGradientType type = linear );
-	VGradient( const VGradient& gradient );
+	VGradient(VGradientType type = linear);
+	VGradient(const VGradient& gradient);
 	~VGradient();
 
 	VGradient& operator=(const VGradient& gradient);
 	bool operator==(const VGradient& gradient) const;
 
 	VGradientType type() const { return m_type; }
-	void setType( VGradientType type ) { m_type = type; }
+	void setType(VGradientType type) { m_type = type; }
 
 	VGradientRepeatMethod repeatMethod() const { return m_repeatMethod; }
-	void setRepeatMethod( VGradientRepeatMethod repeatMethod ) { m_repeatMethod = repeatMethod; }
+	void setRepeatMethod(VGradientRepeatMethod repeatMethod) { m_repeatMethod = repeatMethod; }
 
 	const QList<VColorStop*>& colorStops() const;
-	void addStop( const VColorStop& colorStop );
-	void addStop( const QColor &color, double rampPoint, double midPoint, double opa, const QString& name = "", int shade = 100 );
-	void setStop(const QColor &color, double rampPoint, double midPoint, double opa, const QString& name = "", int shade = 100 );
-	void removeStop( VColorStop& colorStop );
-	void removeStop( uint n );
+	void addStop(const VColorStop& colorStop);
+	void addStop(const QColor &color, double rampPoint, double midPoint, double opa, const QString& name = "", int shade = 100);
+	void setStop(const QColor &color, double rampPoint, double midPoint, double opa, const QString& name = "", int shade = 100);
+	void removeStop(VColorStop& colorStop);
+	void removeStop(int n);
 	void clearStops();
-	int Stops()  const { return m_colorStops.count(); }
+	int  stops() const { return m_colorStops.count(); }
 
 	// This function let only one stop with offset value equal to 0 and 1.0
 	// by removing the firsts with 0.0 value and the lasts with 1.0 value;
 	void filterStops();
 
 	FPoint origin() const { return m_origin; }
-	void setOrigin( const FPoint &origin ) { m_origin = origin; }
+	void setOrigin(const FPoint &origin) { m_origin = origin; }
 
 	FPoint focalPoint() const { return m_focalPoint; }
-	void setFocalPoint( const FPoint &focalPoint ) { m_focalPoint = focalPoint; }
+	void setFocalPoint(const FPoint &focalPoint) { m_focalPoint = focalPoint; }
 
 	FPoint vector() const { return m_vector; }
-	void setVector( const FPoint &vector ) { m_vector = vector; }
+	void setVector(const FPoint &vector) { m_vector = vector; }
 
-	void transform( const QTransform& m );
+	void transform(const QTransform& m);
 
 protected:
 	QList<VColorStop*> m_colorStops;
 
 	int  compareItems(const VColorStop* item1, const VColorStop* item2 ) const;
-	void inSort( VColorStop* d );
+	void inSort(VColorStop* d);
 
 private:
 	VGradientType m_type;
@@ -149,7 +151,6 @@
 	FPoint m_origin;
 	FPoint m_focalPoint;
 	FPoint m_vector;
-}
-; // VGradient
+};
 
 #endif /* __VGRADIENT_H__ */

Modified: trunk/Scribus/scribus/vgradientex.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/vgradientex.cpp
==============================================================================
--- trunk/Scribus/scribus/vgradientex.cpp	(original)
+++ trunk/Scribus/scribus/vgradientex.cpp	Sat Oct  6 00:03:19 2018
@@ -30,22 +30,22 @@
 #include "scribusdoc.h"
 
 // comparison function for use with stable_sort
-bool compareStopsEx( const VColorStopEx* item1, const VColorStopEx* item2 )
+bool compareStopsEx(const VColorStopEx* item1, const VColorStopEx* item2)
 {
 	double r1 = item1->rampPoint;
 	double r2 = item2->rampPoint;
-	return ( r1 < r2 );
+	return (r1 < r2);
 }
 
-int VGradientEx::compareItems( const VColorStopEx* item1, const VColorStopEx* item2 ) const
+int VGradientEx::compareItems(const VColorStopEx* item1, const VColorStopEx* item2) const
 {
 	double r1 = item1->rampPoint;
 	double r2 = item2->rampPoint;
 
-	return ( r1 == r2 ? 0 : r1 < r2 ? -1 : 1 );
-} // VGradientEx::VColorStopList::compareItems
+	return (r1 == r2 ? 0 : r1 < r2 ? -1 : 1);
+}
 
-void VGradientEx::inSort( VColorStopEx* d )
+void VGradientEx::inSort(VColorStopEx* d)
 {
 	int index = 0;
 	VColorStopEx *n = m_colorStops.value(index);
@@ -57,7 +57,7 @@
 	m_colorStops.insert( qMin(index, m_colorStops.size()), d );
 }
 
-VGradientEx::VGradientEx( VGradientEx::Type type ) : m_type( type )
+VGradientEx::VGradientEx(VGradientEx::Type type) : m_type(type)
 {
 	// set up dummy gradient
 	addStop( ScColor(255,0,0) , 0.0, 0.5, 1.0 );
@@ -69,7 +69,7 @@
 	setRepeatMethod( VGradientEx::pad );
 }
 
-VGradientEx::VGradientEx( const VGradientEx& gradient )
+VGradientEx::VGradientEx(const VGradientEx& gradient)
 {
 	m_origin		= gradient.m_origin;
 	m_focalPoint	= gradient.m_focalPoint;
@@ -78,13 +78,14 @@
 	m_repeatMethod	= gradient.m_repeatMethod;
 
 	clearStops();
+
 	QList<VColorStopEx*> cs = gradient.colorStops();
 	qStableSort( cs.begin(), cs.end(), compareStopsEx);
 	for (int i = 0; i < cs.count(); ++i)
-		m_colorStops.append( new VColorStopEx( *cs[i] ) );
+		m_colorStops.append( new VColorStopEx(*cs[i]) );
 }
 
-VGradientEx::VGradientEx( const VGradient& gradient, ScribusDoc& doc )
+VGradientEx::VGradientEx(const VGradient& gradient, ScribusDoc& doc)
 {
 	m_origin		= gradient.origin();
 	m_focalPoint	= gradient.focalPoint();
@@ -109,9 +110,9 @@
 	}
 }
 
-VGradientEx& VGradientEx::operator=( const VGradientEx& gradient )
+VGradientEx& VGradientEx::operator=(const VGradientEx& gradient)
 {
-	if ( this == &gradient )
+	if (this == &gradient)
 		return *this;
 
 	m_origin		= gradient.m_origin;
@@ -121,12 +122,13 @@
 	m_repeatMethod	= gradient.m_repeatMethod;
 
 	clearStops();
+
 	QList<VColorStopEx*> cs = gradient.colorStops();
 	qStableSort( cs.begin(), cs.end(), compareStopsEx);
 	for (int i = 0; i < cs.count(); ++i)
 		m_colorStops.append( new VColorStopEx( *cs[i] ) );
 	return *this;
-} // VGradientEx::operator=
+}
 
 VGradientEx::~VGradientEx()
 {
@@ -136,23 +138,20 @@
 const QList<VColorStopEx*> VGradientEx::colorStops() const
 {
 	return m_colorStops;
-} // VGradientEx::colorStops()
+}
 
-void
-VGradientEx::clearStops()
+void VGradientEx::clearStops()
 {
 	while (!m_colorStops.isEmpty())
 		delete m_colorStops.takeFirst();
 }
 
-void
-VGradientEx::addStop( const VColorStopEx& colorStop )
+void VGradientEx::addStop(const VColorStopEx& colorStop)
 {
 	inSort( new VColorStopEx( colorStop ) );
 } // VGradientEx::addStop
 
-void
-VGradientEx::addStop( const ScColor &color, double rampPoint, double midPoint, double opa, const QString& name, int shade )
+void VGradientEx::addStop(const ScColor &color, double rampPoint, double midPoint, double opa, const QString& name, int shade)
 {
 	// Clamping between 0.0 and 1.0
 	rampPoint = qMax( 0.0, rampPoint );
@@ -161,21 +160,22 @@
 	midPoint = qMax( 0.0, midPoint );
 	midPoint = qMin( 1.0, midPoint );
 
-	inSort( new VColorStopEx( rampPoint, midPoint, color, opa, name, shade ) );
+	inSort( new VColorStopEx(rampPoint, midPoint, color, opa, name, shade) );
 }
 
-void VGradientEx::removeStop( VColorStopEx& colorstop )
+void VGradientEx::removeStop(VColorStopEx& colorstop)
 {
 	int n = m_colorStops.indexOf(&colorstop);
-	delete m_colorStops.takeAt(n);
+	if (n >= 0)
+		delete m_colorStops.takeAt(n);
 }
 
-void VGradientEx::removeStop( uint n )
+void VGradientEx::removeStop(int n)
 {
 	delete m_colorStops.takeAt(n);
 }
 
-void VGradientEx::transform( const QTransform &m )
+void VGradientEx::transform(const QTransform &m)
 {
 	double mx, my;
 	mx = m.m11() * m_origin.x() + m.m21() * m_origin.y() + m.dx();

Modified: trunk/Scribus/scribus/vgradientex.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22725&path=/trunk/Scribus/scribus/vgradientex.h
==============================================================================
--- trunk/Scribus/scribus/vgradientex.h	(original)
+++ trunk/Scribus/scribus/vgradientex.h	Sat Oct  6 00:03:19 2018
@@ -38,7 +38,7 @@
 class SCRIBUS_API VColorStopEx
 {
 public:
-	VColorStopEx( double r, double m, ScColor c, double o, QString n, int s )
+	VColorStopEx(double r, double m, ScColor c, double o, QString n, int s)
 	{
 		rampPoint = r;
 		midPoint = m; 
@@ -48,7 +48,7 @@
 		shade = s;
 	};
 	
-	VColorStopEx( const VColorStopEx& colorStop )
+	VColorStopEx(const VColorStopEx& colorStop)
 	{
 		rampPoint = colorStop.rampPoint;
 		midPoint = colorStop.midPoint;
@@ -69,13 +69,15 @@
 	double opacity;
 	int shade;
 	QString name;
-	friend inline bool operator== ( VColorStopEx& s1, VColorStopEx& s2 )
-	{ return s1.rampPoint == s2.rampPoint; };
-}
-; // VColorStopEx
+
+	friend inline bool operator== (const VColorStopEx& s1, const VColorStopEx& s2)
+	{
+		return s1.rampPoint == s2.rampPoint;
+	};
+};
 
 // comparison function for use with stable_sort
-bool compareStopsEx( const VColorStopEx* item1, const VColorStopEx* item2 );
+bool compareStopsEx(const VColorStopEx* item1, const VColorStopEx* item2);
 
 class SCRIBUS_API VGradientEx
 {
@@ -100,43 +102,43 @@
 		pad     = 3
 	};
 
-	VGradientEx( VGradientEx::Type type = linear );
-	VGradientEx( const VGradientEx& gradient );
-	VGradientEx( const VGradient& gradient, ScribusDoc& doc );
+	VGradientEx(VGradientEx::Type type = linear);
+	VGradientEx(const VGradientEx& gradient);
+	VGradientEx(const VGradient& gradient, ScribusDoc& doc);
 	~VGradientEx();
 
 	VGradientEx& operator=(const VGradientEx& gradient);
 
 	VGradientEx::Type type() const { return m_type; }
-	void setType( VGradientEx::Type type ) { m_type = type; }
+	void setType(VGradientEx::Type type) { m_type = type; }
 
 	VGradientEx::RepeatMethod repeatMethod() const { return m_repeatMethod; }
-	void setRepeatMethod( VGradientEx::RepeatMethod repeatMethod ) { m_repeatMethod = repeatMethod; }
+	void setRepeatMethod(VGradientEx::RepeatMethod repeatMethod) { m_repeatMethod = repeatMethod; }
 
 	const QList<VColorStopEx*> colorStops() const;
-	void addStop( const VColorStopEx& colorStop );
-	void addStop(const ScColor &color, double rampPoint, double midPoint, double opa, const QString& name = "", int shade = 100 );
-	void removeStop( VColorStopEx& colorStop );
-	void removeStop( uint n );
+	void addStop(const VColorStopEx& colorStop);
+	void addStop(const ScColor &color, double rampPoint, double midPoint, double opa, const QString& name = "", int shade = 100);
+	void removeStop(VColorStopEx& colorStop);
+	void removeStop(int n);
 	void clearStops();
-	uint Stops() { return m_colorStops.count(); }
+	int  stops() const { return m_colorStops.count(); }
 
 	FPoint origin() const { return m_origin; }
-	void setOrigin( const FPoint &origin ) { m_origin = origin; }
+	void setOrigin(const FPoint &origin) { m_origin = origin; }
 
 	FPoint focalPoint() const { return m_focalPoint; }
-	void setFocalPoint( const FPoint &focalPoint ) { m_focalPoint = focalPoint; }
+	void setFocalPoint(const FPoint &focalPoint) { m_focalPoint = focalPoint; }
 
 	FPoint vector() const { return m_vector; }
-	void setVector( const FPoint &vector ) { m_vector = vector; }
+	void setVector(const FPoint &vector) { m_vector = vector; }
 
-	void transform( const QTransform& m );
+	void transform(const QTransform& m);
 
 protected:
 	QList<VColorStopEx*>        m_colorStops;
 
-	int  compareItems( const VColorStopEx* item1, const VColorStopEx* item2 ) const;
-	void inSort( VColorStopEx* d );
+	int  compareItems(const VColorStopEx* item1, const VColorStopEx* item2) const;
+	void inSort(VColorStopEx* d);
 
 private:
 	VGradientEx::Type         m_type;
@@ -146,7 +148,6 @@
 	FPoint m_origin;
 	FPoint m_focalPoint;
 	FPoint m_vector;
-}
-; // VGradientEx
+};
 
 #endif /* __VGRADIENT_H__ */




More information about the scribus-commit mailing list