From 1f90aed820a4e47730b44aa954057256c3fa838c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Tue, 24 Jun 2008 15:57:21 +0200
Subject: Use QColor instead of QRgb for simplicity.

---
 openglscene.cpp | 20 ++++++++++----------
 openglscene.h   |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/openglscene.cpp b/openglscene.cpp
index 8e10bf5..6a7e096 100644
--- a/openglscene.cpp
+++ b/openglscene.cpp
@@ -33,16 +33,16 @@ private:
 #endif
     QComboBox *m_models;
 
-    QRgb m_modelColor;
-    QRgb m_backgroundColor;
+    QColor m_modelColor;
+    QColor m_backgroundColor;
     QDir m_dir;
 };
 
 Controls::Controls(OpenGLScene *scene)
     : m_scene(scene)
     , m_models(new QComboBox)
-    , m_modelColor(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0).rgba())
-    , m_backgroundColor(QColor::fromCmykF(0.39, 0.39, 0.0, 0.0).rgba())
+    , m_modelColor(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0))
+    , m_backgroundColor(QColor::fromCmykF(0.39, 0.39, 0.0, 0.0))
     , m_dir(QLatin1String("models"))
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
@@ -118,7 +118,7 @@ void Controls::modelLoaded()
 void Controls::setModelColor(bool showDialog)
 {
     if (showDialog)
-        m_modelColor = QColorDialog::getRgba(m_modelColor);
+        m_modelColor = QColorDialog::getColor(m_modelColor);
 
     m_scene->setModelColor(m_modelColor);
 }
@@ -126,7 +126,7 @@ void Controls::setModelColor(bool showDialog)
 void Controls::setBackgroundColor(bool showDialog)
 {
     if (showDialog)
-        m_backgroundColor = QColorDialog::getRgba(m_backgroundColor);
+        m_backgroundColor = QColorDialog::getColor(m_backgroundColor);
 
     m_scene->setBackgroundColor(m_backgroundColor);
 }
@@ -157,7 +157,7 @@ void OpenGLScene::drawBackground(QPainter *painter, const QRectF &)
         return;
     }
 
-    glClearColor(qRed(m_backgroundColor)/255.0f, qGreen(m_backgroundColor)/255.0f, qBlue(m_backgroundColor)/255.0f, 1);
+    glClearColor(m_backgroundColor.redF(), m_backgroundColor.greenF(), m_backgroundColor.blueF(), 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     glMatrixMode(GL_PROJECTION);
@@ -171,7 +171,7 @@ void OpenGLScene::drawBackground(QPainter *painter, const QRectF &)
 
     float pos[] = { m_lightPos, 5, 2, 0 };
     glLightfv(GL_LIGHT0, GL_POSITION, pos);
-    glColor4f(qRed(m_modelColor)/255.0f, qGreen(m_modelColor)/255.0f, qBlue(m_modelColor)/255.0f, 1.0f);
+    glColor4f(m_modelColor.redF(), m_modelColor.greenF(), m_modelColor.blueF(), 1.0f);
 
     if (!m_rotating) {
         const int delta = m_time.elapsed() - m_lastTime;
@@ -222,13 +222,13 @@ void OpenGLScene::setLightPosition(int pos)
     update();
 }
 
-void OpenGLScene::setModelColor(QRgb color)
+void OpenGLScene::setModelColor(const QColor &color)
 {
     m_modelColor = color;
     update();
 }
 
-void OpenGLScene::setBackgroundColor(QRgb color)
+void OpenGLScene::setBackgroundColor(const QColor &color)
 {
     m_backgroundColor = color;
     update();
diff --git a/openglscene.h b/openglscene.h
index 70f1c41..e572527 100644
--- a/openglscene.h
+++ b/openglscene.h
@@ -22,8 +22,8 @@ public slots:
     void enableWireframe(bool enabled);
     void enableNormals(bool enabled);
     void setLightPosition(int pos);
-    void setModelColor(QRgb color);
-    void setBackgroundColor(QRgb color);
+    void setModelColor(const QColor &color);
+    void setBackgroundColor(const QColor &color);
 
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
@@ -39,8 +39,8 @@ private:
     float m_lightPos;
     float m_distance;
 
-    QRgb m_backgroundColor;
-    QRgb m_modelColor;
+    QColor m_backgroundColor;
+    QColor m_modelColor;
 
     Model *m_model;
 
-- 
cgit v1.2.3