r18114 by jghali - change FPointArray index type from uint to int in order to match the underlying type used by QVector

scribus-commit scribus-commit at lists.scribus.net
Fri Jan 25 12:00:35 UTC 2013


Author: jghali
Date: Fri Jan 25 12:00:35 2013
New Revision: 18114

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18114
Log:
change FPointArray index type from uint to int in order to match the underlying type used by QVector

Modified:
    trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
    trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
    trunk/Scribus/scribus/canvasmode_nodeedit.cpp
    trunk/Scribus/scribus/fpointarray.cpp
    trunk/Scribus/scribus/fpointarray.h
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_pathtext.cpp
    trunk/Scribus/scribus/pageitem_polyline.cpp
    trunk/Scribus/scribus/pageitem_spiral.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
    trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
    trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
    trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scpainter.cpp
    trunk/Scribus/scribus/scpainterex_cairo.cpp
    trunk/Scribus/scribus/scpainterex_ps2.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/third_party/lib2geom/scribushelper.cpp
    trunk/Scribus/scribus/ui/curvewidget.cpp
    trunk/Scribus/scribus/ui/effectsdialog.cpp
    trunk/Scribus/scribus/util_color.cpp
    trunk/Scribus/scribus/util_math.cpp

Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp Fri Jan 25 12:00:35 2013
@@ -127,7 +127,7 @@
 		QPolygon& redrawPolygon(m_canvas->newRedrawPolygon());
 		double mx = sin(m_doc->itemToolPrefs().calligrapicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligrapicPenWidth / 2.0);
 		double my = cos(m_doc->itemToolPrefs().calligrapicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligrapicPenWidth / 2.0);
-		for (uint px = 0; px < RecordP.size()-1; ++px)
+		for (int px = 0; px < RecordP.size()-1; ++px)
 		{
 			FPoint clp = RecordP.point(px);
 			redrawPolygon.append(QPoint(qRound(clp.x() - mx), qRound(clp.y() - my)));
@@ -252,7 +252,7 @@
 			QList<QPointF> clipL;
 			double mx = sin(m_doc->itemToolPrefs().calligrapicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligrapicPenWidth / 2.0);
 			double my = cos(m_doc->itemToolPrefs().calligrapicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligrapicPenWidth / 2.0);
-			for (uint px = 0; px < RecordP.size()-1; ++px)
+			for (int px = 0; px < RecordP.size()-1; ++px)
 			{
 				FPoint clp = RecordP.point(px);
 				clipU.append(QPointF(clp.x() - mx, clp.y() - my));

Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawfreehand.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawfreehand.cpp Fri Jan 25 12:00:35 2013
@@ -120,7 +120,7 @@
 		else
 			RecordP.addPoint(FPoint(newXF, newYF));
 		QPolygon& redrawPolygon(m_canvas->newRedrawPolygon());
-		for (uint pp = 0; pp < RecordP.size(); pp++)
+		for (int pp = 0; pp < RecordP.size(); pp++)
 		{
 			redrawPolygon << RecordP.pointQ(pp);
 		}
@@ -237,7 +237,7 @@
 			if (m->modifiers() & Qt::ControlModifier)
 			{
 				QList<QPointF> clip;
-				for (uint px = 0; px < RecordP.size()-1; ++px)
+				for (int px = 0; px < RecordP.size()-1; ++px)
 				{
 					FPoint clp = RecordP.point(px);
 					clip.append(QPointF(clp.x(), clp.y()));
@@ -249,7 +249,7 @@
 			{
 				currItem->PoLine.addPoint(RecordP.point(0));
 				currItem->PoLine.addPoint(RecordP.point(0));
-				for (uint px = 1; px < RecordP.size()-1; ++px)
+				for (int px = 1; px < RecordP.size()-1; ++px)
 				{
 					currItem->PoLine.addPoint(RecordP.point(px));
 					currItem->PoLine.addPoint(RecordP.point(px));

Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp Fri Jan 25 12:00:35 2013
@@ -89,7 +89,7 @@
 	const double onePerScale = 1 / scale;
 	if (cli.size() > 3)
 	{
-		for (uint poi=0; poi<cli.size()-3; poi += 4)
+		for (int poi=0; poi<cli.size()-3; poi += 4)
 		{
 			if (cli.point(poi).x() > 900000)
 				continue;
@@ -108,7 +108,7 @@
 		}
 	}
 	// draw points
-	for (uint a=0; a<cli.size()-1; a += 2)
+	for (int a = 0; a < cli.size()-1; a += 2)
 	{
 		if (cli.point(a).x() > 900000)
 			continue;
@@ -196,7 +196,7 @@
 				}
 			}
 		}
-		for (uint a = 0; a < Clip.size(); ++a)
+		for (int a = 0; a < Clip.size(); ++a)
 		{
 			if (Clip.point(a).x() > 900000)
 				continue;
@@ -566,7 +566,7 @@
 	FPointArray cli;
 	uint EndInd = Clip.size();
 	uint StartInd = 0;
-	for (uint n = m_doc->nodeEdit.ClRe; n < Clip.size(); ++n)
+	for (int n = m_doc->nodeEdit.ClRe; n < Clip.size(); ++n)
 	{
 		if (Clip.point(n).x() > 900000)
 		{
@@ -603,7 +603,7 @@
 			double nearT = 0.0;
 			QRect mpo2(0, 0, m_doc->guidesPrefs().grabRadius*3, m_doc->guidesPrefs().grabRadius*3);
 			mpo2.moveCenter(QPoint(qRound(npf2.x()), qRound(npf2.y())));
-			for (uint poi=0; poi<Clip.size()-3; poi += 4)
+			for (int poi=0; poi<Clip.size()-3; poi += 4)
 			{
 				FPoint a1 = Clip.point(poi);
 				FPoint a2 = Clip.point(poi+1);
@@ -669,7 +669,7 @@
 				m_doc->nodeEdit.ClRe2 = -1;
 				EndInd = Clip.size();
 				StartInd = 0;
-				for (uint n = m_doc->nodeEdit.ClRe; n < Clip.size(); ++n)
+				for (int n = m_doc->nodeEdit.ClRe; n < Clip.size(); ++n)
 				{
 					if (Clip.point(n).x() > 900000)
 					{
@@ -856,7 +856,7 @@
 		double nearT = 0.0;
 		QRect mpo2(0, 0, m_doc->guidesPrefs().grabRadius*3, m_doc->guidesPrefs().grabRadius*3);
 		mpo2.moveCenter(QPoint(qRound(npf2.x()), qRound(npf2.y())));
-		for (uint poi=0; poi<Clip.size()-3; poi += 4)
+		for (int poi = 0; poi < Clip.size()-3; poi += 4)
 		{
 			FPoint a1 = Clip.point(poi);
 			FPoint a2 = Clip.point(poi+1);
@@ -1024,7 +1024,7 @@
 		(m_doc->nodeEdit.submode == NodeEditContext::MOVE_POINT) || 
 		(m_doc->nodeEdit.submode == NodeEditContext::SPLIT_PATH && m_doc->nodeEdit.EdPoints))
 	{
-		for (uint poi=0; poi<Clip.size()-3; poi += 4)
+		for (int poi = 0; poi < Clip.size()-3; poi += 4)
 		{
 			// create bezier curve in canvas coords
 			QPointF a1 = itemPos.map(Clip.pointQF(poi));

Modified: trunk/Scribus/scribus/fpointarray.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/fpointarray.cpp
==============================================================================
--- trunk/Scribus/scribus/fpointarray.cpp (original)
+++ trunk/Scribus/scribus/fpointarray.cpp Fri Jan 25 12:00:35 2013
@@ -60,9 +60,9 @@
  *   when growing, try to double size
  *   if capacity permits, just increase count
  */
-bool FPointArray::resize(uint newCount)
-{
-	if (newCount == 0)
+bool FPointArray::resize(int newCount)
+{
+	if (newCount <= 0)
 	{
 		QVector<FPoint>::resize(0);
 		QVector<FPoint>::squeeze();
@@ -153,33 +153,26 @@
 	return true;
 }
 
-void FPointArray::point(uint i, double *x, double *y) const
-{
-//	FPoint p = QMemArray<FPoint>::at(i);
-	ConstIterator p = begin();
-	p += i;
+void FPointArray::point(int i, double *x, double *y) const
+{
+	const FPoint& p = QVector<FPoint>::at(i);
 	if (x)
-		*x = p->xp;
+		*x = p.xp;
 	if (y)
-		*y = p->yp;
-}
-
-
-QPoint FPointArray::pointQ(uint i) const
-{
-//	FPoint p = QMemArray<FPoint>::at(i);
-	ConstIterator p = begin();
-	p += i;
-	QPoint r(qRound(p->xp),qRound(p->yp));
-	return r;
-}
-
-QPointF FPointArray::pointQF(uint i) const
-{
-//	FPoint p = QMemArray<FPoint>::at(i);
-	ConstIterator p = begin();
-	p += i;
-	QPointF r(p->xp,p->yp);
+		*y = p.yp;
+}
+
+
+QPoint FPointArray::pointQ(int i) const
+{
+	const FPoint& p = QVector<FPoint>::at(i);
+	return QPoint(qRound(p.xp), qRound(p.yp));
+}
+
+QPointF FPointArray::pointQF(int i) const
+{
+	const FPoint& p = QVector<FPoint>::at(i);
+	QPointF r(p.xp, p.yp);
 	return r;
 }
 
@@ -490,7 +483,7 @@
 	bool first = true;
 	if (size() > 3)
 	{
-		for (uint poi=0; poi < size()-3; poi += 4)
+		for (int poi=0; poi < size()-3; poi += 4)
 		{
 			if (point(poi).x() > 900000)
 			{
@@ -532,7 +525,7 @@
 	FPoint np, np1, np2, np3, np4, firstP;
 	if (size() > 3)
 	{
-		for (uint poi = 0; poi < size()-3; poi += 4)
+		for (int poi = 0; poi < size()-3; poi += 4)
 		{
 			if (point(poi).x() > 900000)
 			{

Modified: trunk/Scribus/scribus/fpointarray.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/fpointarray.h
==============================================================================
--- trunk/Scribus/scribus/fpointarray.h (original)
+++ trunk/Scribus/scribus/fpointarray.h Fri Jan 25 12:00:35 2013
@@ -45,18 +45,18 @@
 	FPointArray() : svgState(NULL) {};
 	FPointArray(int size) : QVector<FPoint>(size), svgState(NULL) {};
 	FPointArray(const FPointArray &a) : QVector<FPoint>(a), svgState(NULL) {};
-	uint size() const { return static_cast<uint>(QVector<FPoint>::count()); };
-	bool resize(uint newCount);
+	int  size() const { return QVector<FPoint>::count(); }
+	bool resize(int newCount);
 	void reverse();
-	void setPoint(uint i, double x, double y) { Iterator p = begin(); p+=i; p->xp = x; p->yp = y; };
-	void setPoint(uint i, FPoint p) {	setPoint(i, p.xp, p.yp); };
+	void setPoint(int i, double x, double y) { FPoint& p = QVector<FPoint>::operator[](i); p.xp = x; p.yp = y; };
+	void setPoint(int i, FPoint p) { setPoint(i, p.xp, p.yp); }
 	bool setPoints( int nPoints, double firstx, double firsty, ... );
 	bool putPoints( int index, int nPoints, double firstx, double firsty,  ... );
 	bool putPoints( int index, int nPoints, const FPointArray & from, int fromIndex = 0 );
-	void point(uint i, double *x, double *y) const;
-	const FPoint & point(uint i)  const{ ConstIterator p = begin(); p+=i; return *p; };
-	QPoint pointQ(uint i) const;
-	QPointF pointQF(uint i) const;
+	void point(int i, double *x, double *y) const;
+	const FPoint& point(int i)  const{ return QVector<FPoint>::at(i); }
+	QPoint pointQ(int i) const;
+	QPointF pointQF(int i) const;
 	void translate( double dx, double dy );
 	void scale( double sx, double sy );
 	FPoint WidthHeight() const;

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Fri Jan 25 12:00:35 2013
@@ -8538,7 +8538,7 @@
 		else
 		{
 			FPoint Start = PoLine.point(0);
-			for (uint xx = 1; xx < PoLine.size(); xx += 2)
+			for (int xx = 1; xx < PoLine.size(); xx += 2)
 			{
 				FPoint Vector = PoLine.point(xx);
 				if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
@@ -8712,7 +8712,7 @@
 		else
 		{
 			FPoint Start = PoLine.point(0);
-			for (uint xx = 1; xx < PoLine.size(); xx += 2)
+			for (int xx = 1; xx < PoLine.size(); xx += 2)
 			{
 				FPoint Vector = PoLine.point(xx);
 				if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
@@ -9146,7 +9146,7 @@
 				FPointArray Vals = pixm.imgInfo.duotoneColors[0].Curve;
 				tmp.setNum(Vals.size());
 				efVal += " "+tmp;
-				for (uint p = 0; p < Vals.size(); p++)
+				for (int p = 0; p < Vals.size(); p++)
 				{
 					FPoint pv = Vals.point(p);
 					efVal += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -9155,7 +9155,7 @@
 				Vals = pixm.imgInfo.duotoneColors[1].Curve;
 				tmp.setNum(Vals.size());
 				efVal += " "+tmp;
-				for (uint p = 0; p < Vals.size(); p++)
+				for (int p = 0; p < Vals.size(); p++)
 				{
 					FPoint pv = Vals.point(p);
 					efVal += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -9171,7 +9171,7 @@
 				FPointArray Vals = pixm.imgInfo.duotoneColors[0].Curve;
 				tmp.setNum(Vals.size());
 				efVal += " "+tmp;
-				for (uint p = 0; p < Vals.size(); p++)
+				for (int p = 0; p < Vals.size(); p++)
 				{
 					FPoint pv = Vals.point(p);
 					efVal += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -9180,7 +9180,7 @@
 				Vals = pixm.imgInfo.duotoneColors[1].Curve;
 				tmp.setNum(Vals.size());
 				efVal += " "+tmp;
-				for (uint p = 0; p < Vals.size(); p++)
+				for (int p = 0; p < Vals.size(); p++)
 				{
 					FPoint pv = Vals.point(p);
 					efVal += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -9189,7 +9189,7 @@
 				Vals = pixm.imgInfo.duotoneColors[2].Curve;
 				tmp.setNum(Vals.size());
 				efVal += " "+tmp;
-				for (uint p = 0; p < Vals.size(); p++)
+				for (int p = 0; p < Vals.size(); p++)
 				{
 					FPoint pv = Vals.point(p);
 					efVal += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -9205,7 +9205,7 @@
 				FPointArray Vals = pixm.imgInfo.duotoneColors[0].Curve;
 				tmp.setNum(Vals.size());
 				efVal += " "+tmp;
-				for (uint p = 0; p < Vals.size(); p++)
+				for (int p = 0; p < Vals.size(); p++)
 				{
 					FPoint pv = Vals.point(p);
 					efVal += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -9214,7 +9214,7 @@
 				Vals = pixm.imgInfo.duotoneColors[1].Curve;
 				tmp.setNum(Vals.size());
 				efVal += " "+tmp;
-				for (uint p = 0; p < Vals.size(); p++)
+				for (int p = 0; p < Vals.size(); p++)
 				{
 					FPoint pv = Vals.point(p);
 					efVal += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -9223,7 +9223,7 @@
 				Vals = pixm.imgInfo.duotoneColors[2].Curve;
 				tmp.setNum(Vals.size());
 				efVal += " "+tmp;
-				for (uint p = 0; p < Vals.size(); p++)
+				for (int p = 0; p < Vals.size(); p++)
 				{
 					FPoint pv = Vals.point(p);
 					efVal += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -9232,7 +9232,7 @@
 				Vals = pixm.imgInfo.duotoneColors[3].Curve;
 				tmp.setNum(Vals.size());
 				efVal += " "+tmp;
-				for (uint p = 0; p < Vals.size(); p++)
+				for (int p = 0; p < Vals.size(); p++)
 				{
 					FPoint pv = Vals.point(p);
 					efVal += QString(" %1 %2").arg(pv.x()).arg(pv.y());

Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.cpp (original)
+++ trunk/Scribus/scribus/pageitem_pathtext.cpp Fri Jan 25 12:00:35 2013
@@ -221,7 +221,7 @@
 		else
 			totalTextLen += hl->glyph.wide()+hl->fontSize() * hl->tracking() / 10000.0;
 	}
-	for (uint segs = 0; segs < PoLine.size()-3; segs += 4)
+	for (int segs = 0; segs < PoLine.size()-3; segs += 4)
 	{
 		totalCurveLen += PoLine.lenPathSeg(segs);
 	}

Modified: trunk/Scribus/scribus/pageitem_polyline.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/pageitem_polyline.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_polyline.cpp (original)
+++ trunk/Scribus/scribus/pageitem_polyline.cpp Fri Jan 25 12:00:35 2013
@@ -62,7 +62,7 @@
 			FPointArray cli;
 			FPoint Start;
 			bool firstp = true;
-			for (uint n = 0; n < PoLine.size()-3; n += 4)
+			for (int n = 0; n < PoLine.size()-3; n += 4)
 			{
 				if (firstp)
 				{
@@ -169,7 +169,7 @@
 	if (m_startArrowIndex != 0)
 	{
 		FPoint Start = PoLine.point(0);
-		for (uint xx = 1; xx < PoLine.size(); xx += 2)
+		for (int xx = 1; xx < PoLine.size(); xx += 2)
 		{
 			FPoint Vector = PoLine.point(xx);
 			if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))

Modified: trunk/Scribus/scribus/pageitem_spiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/pageitem_spiral.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_spiral.cpp (original)
+++ trunk/Scribus/scribus/pageitem_spiral.cpp Fri Jan 25 12:00:35 2013
@@ -68,7 +68,7 @@
 			FPointArray cli;
 			FPoint Start;
 			bool firstp = true;
-			for (uint n = 0; n < PoLine.size()-3; n += 4)
+			for (int n = 0; n < PoLine.size()-3; n += 4)
 			{
 				if (firstp)
 				{
@@ -175,7 +175,7 @@
 	if (m_startArrowIndex != 0)
 	{
 		FPoint Start = PoLine.point(0);
-		for (uint xx = 1; xx < PoLine.size(); xx += 2)
+		for (int xx = 1; xx < PoLine.size(); xx += 2)
 		{
 			FPoint Vector = PoLine.point(xx);
 			if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Fri Jan 25 12:00:35 2013
@@ -1251,7 +1251,7 @@
 						mat.scale(100.0, -100.0);
 						gly.map(mat);
 						gly.translate(0, 1000);
-						for (uint poi = 0; poi < gly.size()-3; poi += 4)
+						for (int poi = 0; poi < gly.size()-3; poi += 4)
 						{
 							if (gly.point(poi).x() > 900000)
 							{
@@ -1365,7 +1365,7 @@
 						QTransform mat;
 						mat.scale(0.1, 0.1);
 						gly.map(mat);
-						for (uint poi = 0; poi < gly.size()-3; poi += 4)
+						for (int poi = 0; poi < gly.size()-3; poi += 4)
 						{
 							if (gly.point(poi).x() > 900000)
 							{
@@ -2465,7 +2465,7 @@
 						if (ite->startArrowIndex() != 0)
 						{
 							FPoint Start = ite->PoLine.point(0);
-							for (uint xx = 1; xx < ite->PoLine.size(); xx += 2)
+							for (int xx = 1; xx < ite->PoLine.size(); xx += 2)
 							{
 								FPoint Vector = ite->PoLine.point(xx);
 								if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
@@ -4071,7 +4071,7 @@
 			if (ite->startArrowIndex() != 0)
 			{
 				FPoint Start = ite->PoLine.point(0);
-				for (uint xx = 1; xx < ite->PoLine.size(); xx += 2)
+				for (int xx = 1; xx < ite->PoLine.size(); xx += 2)
 				{
 					FPoint Vector = ite->PoLine.point(xx);
 					if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
@@ -5354,7 +5354,7 @@
 					FPoint np;
 					if (gly.size() > 3)
 					{
-						for (uint poi=0; poi<gly.size()-3; poi += 4)
+						for (int poi=0; poi<gly.size()-3; poi += 4)
 						{
 							if (gly.point(poi).x() > 900000)
 							{
@@ -5459,7 +5459,7 @@
 					FPoint np;
 					if (gly.size() > 3)
 					{
-						for (uint poi=0; poi<gly.size()-3; poi += 4)
+						for (int poi=0; poi<gly.size()-3; poi += 4)
 						{
 							if (gly.point(poi).x() > 900000)
 							{
@@ -5746,7 +5746,7 @@
 	if (ite->imageClip.size() > 3)
 	{
 		bool nPath = true;
-		for (uint poi=0; poi<ite->imageClip.size()-3; poi += 4)
+		for (int poi=0; poi<ite->imageClip.size()-3; poi += 4)
 		{
 			if (ite->imageClip.point(poi).x() > 900000)
 			{
@@ -5786,7 +5786,7 @@
 	bool first = true;
 	if (ite->PoLine.size() > 3)
 	{
-		for (uint poi=0; poi<ite->PoLine.size()-3; poi += 4)
+		for (int poi=0; poi<ite->PoLine.size()-3; poi += 4)
 		{
 			if (ite->PoLine.point(poi).x() > 900000)
 			{
@@ -5830,7 +5830,7 @@
 	bool first = true;
 	if (ite->size() > 3)
 	{
-		for (uint poi=0; poi<ite->size()-3; poi += 4)
+		for (int poi=0; poi<ite->size()-3; poi += 4)
 		{
 			if (ite->point(poi).x() > 900000)
 			{

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&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 Fri Jan 25 12:00:35 2013
@@ -486,7 +486,7 @@
 			QString arp = "";
 			QString tmp, tmpy;
 			double xa, ya;
-			for (uint nxx = 0; nxx < (*itar).points.size(); ++nxx)
+			for (int nxx = 0; nxx < (*itar).points.size(); ++nxx)
 			{
 				(*itar).points.point(nxx, &xa, &ya);
 				arp += tmp.setNum(xa) + " " + tmpy.setNum(ya) + " ";

Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp Fri Jan 25 12:00:35 2013
@@ -2042,7 +2042,7 @@
 						if (scX > 0)
 						{
 							double totalCurveLen = 0;
-							for (uint segs = 0; segs < item->PoLine.size()-3; segs += 4)
+							for (int segs = 0; segs < item->PoLine.size()-3; segs += 4)
 							{
 								totalCurveLen += item->PoLine.lenPathSeg(segs);
 							}
@@ -2224,7 +2224,7 @@
 					if (scX > 0)
 					{
 						double totalCurveLen = 0;
-						for (uint segs = 0; segs < item->PoLine.size()-3; segs += 4)
+						for (int segs = 0; segs < item->PoLine.size()-3; segs += 4)
 						{
 							totalCurveLen += item->PoLine.lenPathSeg(segs);
 						}

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&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 Fri Jan 25 12:00:35 2013
@@ -859,7 +859,7 @@
 		if (markers.contains(gc->startMarker))
 		{
 			FPoint End = item->PoLine.point(0);
-			for (uint xx = 1; xx < item->PoLine.size(); xx += 2)
+			for (int xx = 1; xx < item->PoLine.size(); xx += 2)
 			{
 				FPoint Vector = item->PoLine.point(xx);
 				if ((End.x() != Vector.x()) || (End.y() != Vector.y()))

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Fri Jan 25 12:00:35 2013
@@ -276,12 +276,12 @@
 	double x = 0.0, y = 0.0;
 	FPointArray polyline;
 	polyline.svgInit();
-	for( uint i = 0; i < points.size(); ++i )
+	for (int i = 0; i < points.size(); ++i )
 	{
 		FPoint point = points.point(i);
 		x = point.x();
 		y = point.y();
-		if( bFirst )
+		if (bFirst)
 		{
 			polyline.svgMoveTo(x, y);
 			bFirst = false;

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp Fri Jan 25 12:00:35 2013
@@ -718,7 +718,7 @@
 		arrow_thicknessAB = arrow_thicknessAB / 80.0 * 72.0;
 		FPointArray arrow;
 		FPoint Start = ite->PoLine.point(0);
-		for (uint xx = 1; xx < ite->PoLine.size(); xx += 2)
+		for (int xx = 1; xx < ite->PoLine.size(); xx += 2)
 		{
 			FPoint Vector = ite->PoLine.point(xx);
 			if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))

Modified: trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp Fri Jan 25 12:00:35 2013
@@ -1502,7 +1502,7 @@
 		else
 		{
 			FPoint Start = Item->PoLine.point(0);
-			for (uint xx = 1; xx < Item->PoLine.size(); xx += 2)
+			for (int xx = 1; xx < Item->PoLine.size(); xx += 2)
 			{
 				FPoint Vector = Item->PoLine.point(xx);
 				if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
@@ -2293,7 +2293,7 @@
 	bool first = true;
 	if (ite->size() > 3)
 	{
-		for (uint poi=0; poi<ite->size()-3; poi += 4)
+		for (int poi=0; poi<ite->size()-3; poi += 4)
 		{
 			if (ite->point(poi).x() > 900000)
 			{

Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&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 Fri Jan 25 12:00:35 2013
@@ -149,7 +149,7 @@
 			if (currItem->startArrowIndex() != 0)
 			{
 				FPoint Start = currItem->PoLine.point(0);
-				for (uint xx = 1; xx < currItem->PoLine.size(); xx += 2)
+				for (int xx = 1; xx < currItem->PoLine.size(); xx += 2)
 				{
 					FPoint Vector = currItem->PoLine.point(xx);
 					if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
@@ -266,7 +266,7 @@
 			if (currItem->startArrowIndex() != 0)
 			{
 				FPoint Start = currItem->PoLine.point(0);
-				for (uint xx = 1; xx < currItem->PoLine.size(); xx += 2)
+				for (int xx = 1; xx < currItem->PoLine.size(); xx += 2)
 				{
 					FPoint Vector = currItem->PoLine.point(xx);
 					if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Fri Jan 25 12:00:35 2013
@@ -169,7 +169,7 @@
 				bool nPath = true;
 				if (ig.value().size() > 3)
 				{
-					for (uint poi = 0; poi < ig.value().size()-3; poi += 4)
+					for (int poi = 0; poi < ig.value().size()-3; poi += 4)
 					{
 						if (ig.value().point(poi).x() > 900000)
 						{
@@ -2078,7 +2078,7 @@
 			if (c->startArrowIndex() != 0)
 			{
 				FPoint Start = c->PoLine.point(0);
-				for (uint xx = 1; xx < c->PoLine.size(); xx += 2)
+				for (int xx = 1; xx < c->PoLine.size(); xx += 2)
 				{
 					FPoint Vector = c->PoLine.point(xx);
 					if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
@@ -5442,7 +5442,7 @@
 	bool first = true;
 	if (c->size() > 3)
 	{
-		for (uint poi=0; poi<c->size()-3; poi += 4)
+		for (int poi=0; poi < c->size()-3; poi += 4)
 		{
 			if (c->point(poi).x() > 900000)
 			{

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput.cpp Fri Jan 25 12:00:35 2013
@@ -1125,7 +1125,7 @@
 		else
 			totalTextLen += hl->glyph.wide()+hl->fontSize() * hl->tracking() / 10000.0;
 	}
-	for (uint segs = 0; segs < item->PoLine.size()-3; segs += 4)
+	for (int segs = 0; segs < item->PoLine.size()-3; segs += 4)
 	{
 		totalCurveLen += item->PoLine.lenPathSeg(segs);
 	}
@@ -1262,7 +1262,7 @@
 		FPointArray cli;
 		FPoint Start;
 		bool firstp = true;
-		for (uint n = 0; n < item->PoLine.size()-3; n += 4)
+		for (int n = 0; n < item->PoLine.size()-3; n += 4)
 		{
 			if (firstp)
 			{
@@ -1376,7 +1376,7 @@
 	if (startArrowIndex != 0)
 	{
 		FPoint Start = item->PoLine.point(0);
-		for (uint xx = 1; xx < item->PoLine.size(); xx += 2)
+		for (int xx = 1; xx < item->PoLine.size(); xx += 2)
 		{
 			FPoint Vector = item->PoLine.point(xx);
 			if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
@@ -1428,7 +1428,7 @@
 		FPointArray cli;
 		FPoint Start;
 		bool firstp = true;
-		for (uint n = 0; n < item->PoLine.size()-3; n += 4)
+		for (int n = 0; n < item->PoLine.size()-3; n += 4)
 		{
 			if (firstp)
 			{
@@ -1542,7 +1542,7 @@
 	if (startArrowIndex != 0)
 	{
 		FPoint Start = item->PoLine.point(0);
-		for (uint xx = 1; xx < item->PoLine.size(); xx += 2)
+		for (int xx = 1; xx < item->PoLine.size(); xx += 2)
 		{
 			FPoint Vector = item->PoLine.point(xx);
 			if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))

Modified: trunk/Scribus/scribus/scpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/scpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainter.cpp (original)
+++ trunk/Scribus/scribus/scpainter.cpp Fri Jan 25 12:00:35 2013
@@ -1981,7 +1981,7 @@
 		return;
 
 	newPath();
-	for (uint poi=0; poi<points->size()-3; poi += 4)
+	for (int poi=0; poi<points->size()-3; poi += 4)
 	{
 		if (points->point(poi).x() > 900000)
 		{
@@ -2025,7 +2025,7 @@
 		return;
 
 	newPath();
-	for (uint poi=0; poi<points->size()-3; poi += 4)
+	for (int poi=0; poi<points->size()-3; poi += 4)
 	{
 		if (points->point(poi).x() > 900000)
 		{

Modified: trunk/Scribus/scribus/scpainterex_cairo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/scpainterex_cairo.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_cairo.cpp (original)
+++ trunk/Scribus/scribus/scpainterex_cairo.cpp Fri Jan 25 12:00:35 2013
@@ -555,7 +555,7 @@
 		return;
 
 	newPath();
-	for (uint poi=0; poi<points->size()-3; poi += 4)
+	for (int poi=0; poi<points->size()-3; poi += 4)
 	{
 		if (points->point(poi).x() > 900000)
 		{

Modified: trunk/Scribus/scribus/scpainterex_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/scpainterex_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_ps2.cpp (original)
+++ trunk/Scribus/scribus/scpainterex_ps2.cpp Fri Jan 25 12:00:35 2013
@@ -884,7 +884,7 @@
 	if (points->size() > 3)
 	{
 		newPath();
-		for (uint poi=0; poi<points->size()-3; poi += 4)
+		for (int poi=0; poi<points->size()-3; poi += 4)
 		{
 			if (points->point(poi).x() > 900000)
 			{
@@ -1366,7 +1366,7 @@
 
 	r.setCoords(0, 0, 0, 0);
 
-	for( uint i = 0; i < points->size(); i++ )
+	for (int i = 0; i < points->size(); i++ )
 	{
 		point = points->point(i);
 		if( point.x() > 900000 )

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Fri Jan 25 12:00:35 2013
@@ -15917,7 +15917,7 @@
 	currItem->FrameType = 3;
 	uint EndInd = Clip.size();
 	uint StartInd = 0;
-	for (uint n = ClRe; n < Clip.size(); ++n)
+	for (int n = ClRe; n < Clip.size(); ++n)
 	{
 		if (Clip.point(n).x() > 900000)
 		{
@@ -16147,7 +16147,7 @@
 		Clip = currItem->PoLine.copy();
 	int EndInd = Clip.size();
 	int StartInd = 0;
-	for (uint n = ClRe; n < Clip.size(); ++n)
+	for (int n = ClRe; n < Clip.size(); ++n)
 	{
 		if (Clip.point(n).x() > 900000)
 		{

Modified: trunk/Scribus/scribus/third_party/lib2geom/scribushelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/third_party/lib2geom/scribushelper.cpp
==============================================================================
--- trunk/Scribus/scribus/third_party/lib2geom/scribushelper.cpp (original)
+++ trunk/Scribus/scribus/third_party/lib2geom/scribushelper.cpp Fri Jan 25 12:00:35 2013
@@ -112,7 +112,7 @@
 	bool nPath = true;
 	if (p.size() > 3)
 	{
-		for (uint poi=0; poi < p.size()-3; poi += 4)
+		for (int poi=0; poi < p.size()-3; poi += 4)
 		{
 			if (p.point(poi).x() > 900000)
 			{

Modified: trunk/Scribus/scribus/ui/curvewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/ui/curvewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/curvewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/curvewidget.cpp Fri Jan 25 12:00:35 2013
@@ -83,7 +83,7 @@
 		curvePrevVal = curveVal;
 	}
 	p1.drawLine(x - 1, wHeight - int(curvePrevVal * wHeight), x,     wHeight - int(getCurveValue(1.0) * wHeight));
-	for (uint dh = 0; dh < m_points.size(); dh++)
+	for (int dh = 0; dh < m_points.size(); dh++)
 	{
 		FPoint p = m_points.point(dh);
 		if(p == m_grab_point)
@@ -109,7 +109,7 @@
 			FPoint closest_point = m_points.point(0);
 			FPoint p = m_points.point(0);
 			int pos = 0;
-			uint cc =0;
+			int cc = 0;
 			double distance = 1000; // just a big number
 			while(cc < m_points.size())
 			{
@@ -148,7 +148,7 @@
 	FPoint p = m_points.point(0);
 	int insert_pos =0;
 	int pos = 0;
-	uint cc =0;
+	int cc = 0;
 	while(cc < m_points.size())
 	{
 		if (fabs (x - p.x()) < distance)
@@ -239,7 +239,7 @@
 		double distance = 1000;
 		double ydistance = 1000;
 		FPoint p = m_points.point(0);
-		uint cc =0;
+		int cc = 0;
 		while(cc < m_points.size())
 		{
 			if (fabs (x - p.x()) < distance)
@@ -381,7 +381,7 @@
 void CurveWidget::doInvert()
 {
 	FPointArray curve = cDisplay->getCurve();
-	for (uint a = 0; a < curve.size(); a++)
+	for (int a = 0; a < curve.size(); a++)
 	{
 		FPoint p = curve.point(a);
 		curve.setPoint(a, p.x(), 1.0 - p.y());
@@ -465,7 +465,7 @@
 			QString tmp;
 			tmp.setNum(Vals.size());
 			efval += tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());

Modified: trunk/Scribus/scribus/ui/effectsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/ui/effectsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/effectsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/effectsdialog.cpp Fri Jan 25 12:00:35 2013
@@ -1452,7 +1452,7 @@
 			FPointArray Vals = CurveD1->cDisplay->getCurve();
 			tmp.setNum(Vals.size());
 			efval += " "+tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -1464,7 +1464,7 @@
 			Vals = CurveD2->cDisplay->getCurve();
 			tmp.setNum(Vals.size());
 			efval += " "+tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -1491,7 +1491,7 @@
 			FPointArray Vals = CurveT1->cDisplay->getCurve();
 			tmp.setNum(Vals.size());
 			efval += " "+tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -1503,7 +1503,7 @@
 			Vals = CurveT2->cDisplay->getCurve();
 			tmp.setNum(Vals.size());
 			efval += " "+tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -1515,7 +1515,7 @@
 			Vals = CurveT3->cDisplay->getCurve();
 			tmp.setNum(Vals.size());
 			efval += " "+tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -1545,7 +1545,7 @@
 			FPointArray Vals = CurveQ1->cDisplay->getCurve();
 			tmp.setNum(Vals.size());
 			efval += " "+tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -1557,7 +1557,7 @@
 			Vals = CurveQ2->cDisplay->getCurve();
 			tmp.setNum(Vals.size());
 			efval += " "+tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -1569,7 +1569,7 @@
 			Vals = CurveQc3->cDisplay->getCurve();
 			tmp.setNum(Vals.size());
 			efval += " "+tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -1581,7 +1581,7 @@
 			Vals = CurveQ4->cDisplay->getCurve();
 			tmp.setNum(Vals.size());
 			efval += " "+tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());
@@ -1599,7 +1599,7 @@
 			QString tmp;
 			tmp.setNum(Vals.size());
 			efval += tmp;
-			for (uint p = 0; p < Vals.size(); p++)
+			for (int p = 0; p < Vals.size(); p++)
 			{
 				FPoint pv = Vals.point(p);
 				efval += QString(" %1 %2").arg(pv.x()).arg(pv.y());

Modified: trunk/Scribus/scribus/util_color.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/util_color.cpp
==============================================================================
--- trunk/Scribus/scribus/util_color.cpp (original)
+++ trunk/Scribus/scribus/util_color.cpp Fri Jan 25 12:00:35 2013
@@ -491,7 +491,7 @@
     p = curve.point(curve.size()-1);
     if(x >= p.x())
         return p.y();
-	uint cc = 0;
+	int cc = 0;
     // Find the four control points (two on each side of x)    
     p = curve.point(0);
     while(x >= p.x())

Modified: trunk/Scribus/scribus/util_math.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18114&path=/trunk/Scribus/scribus/util_math.cpp
==============================================================================
--- trunk/Scribus/scribus/util_math.cpp (original)
+++ trunk/Scribus/scribus/util_math.cpp Fri Jan 25 12:00:35 2013
@@ -398,7 +398,7 @@
 	Segs.clear();
 	if (ina.size() > 3)
 	{
-		for (uint poi=0; poi<ina.size()-3; poi += 4)
+		for (int poi=0; poi<ina.size()-3; poi += 4)
 		{
 			if (ina.point(poi).x() > 900000) // && cli.size() > 0)
 			{




More information about the scribus-commit mailing list