r14790 by mrdocs - fixes a gcc++-4.5 compile issue - curvewidget works fine after clean install

scribus-commit scribus-commit at lists.scribus.net
Sun Feb 21 12:30:18 CET 2010


Revision: 14790
Author: mrdocs
Date: 2010-02-21T11:24:55.151719Z
Commit message: fixes a gcc++-4.5 compile issue - curvewidget works fine after clean install

Changeset: 
M  /branches/Version135/Scribus/scribus/curvewidget.cpp

Diffs:
Index: scribus/curvewidget.cpp
===================================================================
--- scribus/curvewidget.cpp	(revision 14789)
+++ scribus/curvewidget.cpp	(revision 14790)
@@ -63,7 +63,7 @@
 	//  draw background
 	p1.fillRect(QRect(0, 0, wWidth, wHeight), QColor(255, 255, 255));
 	// Draw grid separators.
-	p1.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
+	p1.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
 	p1.drawLine(wWidth/4, 0, wWidth/4, wHeight);
 	p1.drawLine(wWidth/2, 0, wWidth/2, wHeight);
 	p1.drawLine(3*wWidth/4, 0, 3*wWidth/4, wHeight);
@@ -73,7 +73,7 @@
 
 	// Draw curve.
 	double curvePrevVal = getCurveValue(0.0);
-	p1.setPen(QPen::QPen(Qt::black, 1, Qt::SolidLine));
+	p1.setPen(QPen(Qt::black, 1, Qt::SolidLine));
 	for (x = 0 ; x < wWidth ; x++)
 	{
 		double curveX;
@@ -90,12 +90,12 @@
 		FPoint p = m_points.point(dh);
 		if(p == m_grab_point)
 		{
-			p1.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine));
+			p1.setPen(QPen(Qt::red, 3, Qt::SolidLine));
 			p1.drawEllipse( int(p.x() * wWidth) - 2, wHeight - 2 - int(p.y() * wHeight), 4, 4 );
 		}
 		else
 		{
-			p1.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine));
+			p1.setPen(QPen(Qt::red, 1, Qt::SolidLine));
 			p1.drawEllipse( int(p.x() * wWidth) - 3, wHeight - 3 - int(p.y() * wHeight), 6, 6 );
 		}
 	}




More information about the scribus-commit mailing list