summaryrefslogtreecommitdiffstats
path: root/examples/opengl/samplebuffers
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-11 09:43:41 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-11 09:43:41 (GMT)
commit3058cd5f6ee3fb01e62d625b501e7eeeea70cd84 (patch)
tree880ceec3efd8979d5ceff6a58a1160f94e884e41 /examples/opengl/samplebuffers
parenta958ab9c98481100870a87ee07b8e0abddbfc804 (diff)
downloadQt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.zip
Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.tar.gz
Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.tar.bz2
Eliminate some mentions of Trolltech.
Reviewed-by: Trust Me
Diffstat (limited to 'examples/opengl/samplebuffers')
-rw-r--r--examples/opengl/samplebuffers/glwidget.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/opengl/samplebuffers/glwidget.cpp b/examples/opengl/samplebuffers/glwidget.cpp
index 7b45856..9a41f51 100644
--- a/examples/opengl/samplebuffers/glwidget.cpp
+++ b/examples/opengl/samplebuffers/glwidget.cpp
@@ -106,7 +106,7 @@ void GLWidget::timerEvent(QTimerEvent *)
void GLWidget::makeObject()
{
- QColor trolltechGreen(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0));
+ QColor qtGreen(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0));
const double Pi = 3.14159265358979323846;
const int NumSectors = 15;
GLdouble x1 = +0.06;
@@ -134,13 +134,13 @@ void GLWidget::makeObject()
GLdouble x8 = 0.30 * sin(angle2);
GLdouble y8 = 0.30 * cos(angle2);
- qglColor(trolltechGreen);
+ qglColor(qtGreen);
quad(GL_QUADS, x5, y5, x6, y6, x7, y7, x8, y8);
qglColor(Qt::black);
quad(GL_LINE_LOOP, x5, y5, x6, y6, x7, y7, x8, y8);
}
- qglColor(trolltechGreen);
+ qglColor(qtGreen);
quad(GL_QUADS, x1, y1, x2, y2, y2, x2, y1, x1);
quad(GL_QUADS, x3, y3, x4, y4, y4, x4, y3, x3);