diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 07:04:56 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 07:04:56 (GMT) |
commit | 1047445648b7eb5b85107c00ea43885b44f891cd (patch) | |
tree | 0f9735d5a1b83cb1e3764c4d388f96bff20f2a8b /examples/opengl/samplebuffers/glwidget.cpp | |
parent | 96b6a3c9cd84dbd90bd1fac84a077c01062c5871 (diff) | |
download | Qt-1047445648b7eb5b85107c00ea43885b44f891cd.zip Qt-1047445648b7eb5b85107c00ea43885b44f891cd.tar.gz Qt-1047445648b7eb5b85107c00ea43885b44f891cd.tar.bz2 |
Replace some mentions of Trolltech with more appropriate terms.
Reviewed-by: Trust Me
Diffstat (limited to 'examples/opengl/samplebuffers/glwidget.cpp')
-rw-r--r-- | examples/opengl/samplebuffers/glwidget.cpp | 6 |
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); |