From 38ef0d247648babda0a531327b6e41ac3a23ac01 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Mon, 31 Oct 2005 09:48:26 +0000
Subject: [PATCH] Use a QColor instead of a QString for the KPlotObject color.

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=476013
---
 kdeeduplot/kplotobject.cpp |  4 ++--
 kdeeduplot/kplotobject.h   |  9 +++++----
 kdeeduplot/kplotwidget.cpp | 11 +++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kdeeduplot/kplotobject.cpp b/kdeeduplot/kplotobject.cpp
index 361191d..2ca2780 100644
--- a/kdeeduplot/kplotobject.cpp
+++ b/kdeeduplot/kplotobject.cpp
@@ -21,10 +21,10 @@
 #include "kplotobject.h"
 
 KPlotObject::KPlotObject() {
-	KPlotObject( "", "white", POINTS );
+	KPlotObject( "", Qt::white, POINTS );
 }
 
-KPlotObject::KPlotObject( const QString &n, const QString &c, PTYPE t, unsigned int s, unsigned int p ) {
+KPlotObject::KPlotObject( const QString &n, const QColor &c, PTYPE t, unsigned int s, unsigned int p ) {
 	//We use the set functions because they may include data validation
 	setName( n );
 	setColor( c );
diff --git a/kdeeduplot/kplotobject.h b/kdeeduplot/kplotobject.h
index ae76bf9..ae01e44 100644
--- a/kdeeduplot/kplotobject.h
+++ b/kdeeduplot/kplotobject.h
@@ -65,7 +65,7 @@ public:
 	/**
 	 * Constructor. Create a KPlotObject according to the arguments.
 	 */
-	KPlotObject( const QString &name, const QString &color, PTYPE otype, unsigned int size=2, unsigned int param=0 );
+	KPlotObject( const QString &name, const QColor &color, PTYPE otype, unsigned int size=2, unsigned int param=0 );
 
 	/**
 	 * Destructor (empty)
@@ -86,13 +86,13 @@ public:
 	/**
 	 * @return the KPlotObject's Color
 	 */
-	QString color() const { return Color; }
+	QColor color() const { return Color; }
 
 	/**
 	 * Set the KPlotObject's Color
 	 * @param c the new color
 	 */
-	void setColor( const QString &c ) { Color = c; }
+	void setColor( const QColor &c ) { Color = c; }
 
 	/**
 	 * @return the KPlotObject's Type
@@ -170,7 +170,8 @@ private:
 	QList<QPointF*> pList;
 	PTYPE Type;
 	unsigned int Size, Parameter;
-	QString Color, Name;
+	QString Name;
+	QColor Color;
 };
 
 #endif
diff --git a/kdeeduplot/kplotwidget.cpp b/kdeeduplot/kplotwidget.cpp
index bafc002..c17e9a5 100644
--- a/kdeeduplot/kplotwidget.cpp
+++ b/kdeeduplot/kplotwidget.cpp
@@ -159,12 +159,12 @@ void KPlotWidget::drawObjects( QPainter *p ) {
 		KPlotObject *po = ( *it );
 		if ( po->points()->count() ) {
 			//draw the plot object
-			p->setPen( QColor( po->color() ) );
+			p->setPen( po->color() );
 
 			switch ( po->type() ) {
 				case KPlotObject::POINTS :
 				{
-					p->setBrush( QColor( po->color() ) );
+					p->setBrush( po->color() );
 
 					for ( QList<QPointF*>::ConstIterator dpit = po->points()->begin(); dpit != po->points()->constEnd(); ++dpit )
 					{
@@ -186,7 +186,7 @@ void KPlotWidget::drawObjects( QPainter *p ) {
 
 				case KPlotObject::CURVE :
 				{
-					p->setPen( QPen( QColor( po->color() ), po->size(), (Qt::PenStyle)po->param() ) );
+					p->setPen( QPen( po->color(), po->size(), (Qt::PenStyle)po->param() ) );
 					QPolygon poly;
 					for ( QList<QPointF*>::ConstIterator dpit = po->points()->begin(); dpit != po->points()->constEnd(); ++dpit )
 						poly << mapToPoint( **dpit );
@@ -203,9 +203,8 @@ void KPlotWidget::drawObjects( QPainter *p ) {
 
 				case KPlotObject::POLYGON :
 				{
-					QColor co( po->color() );
-					p->setPen( QPen( co, po->size(), (Qt::PenStyle)po->param() ) );
-					p->setBrush( co );
+					p->setPen( QPen( po->color(), po->size(), (Qt::PenStyle)po->param() ) );
+					p->setBrush( po->color() );
 
 					QPolygon a( po->count() );
 
-- 
2.47.3