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/hellogl | |
| 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/hellogl')
| -rw-r--r-- | examples/opengl/hellogl/glwidget.cpp | 10 | ||||
| -rw-r--r-- | examples/opengl/hellogl/glwidget.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/opengl/hellogl/glwidget.cpp b/examples/opengl/hellogl/glwidget.cpp index 5722f9a..877e1ca 100644 --- a/examples/opengl/hellogl/glwidget.cpp +++ b/examples/opengl/hellogl/glwidget.cpp @@ -55,8 +55,8 @@ GLWidget::GLWidget(QWidget *parent) yRot = 0; zRot = 0; - trolltechGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0); - trolltechPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0); + qtGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0); + qtPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0); } //! [0] @@ -118,7 +118,7 @@ void GLWidget::setZRotation(int angle) //! [6] void GLWidget::initializeGL() { - qglClearColor(trolltechPurple.dark()); + qglClearColor(qtPurple.dark()); object = makeObject(); glShadeModel(GL_FLAT); glEnable(GL_DEPTH_TEST); @@ -234,7 +234,7 @@ GLuint GLWidget::makeObject() void GLWidget::quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2, GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4) { - qglColor(trolltechGreen); + qglColor(qtGreen); glVertex3d(x1, y1, -0.05); glVertex3d(x2, y2, -0.05); @@ -249,7 +249,7 @@ void GLWidget::quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2, void GLWidget::extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) { - qglColor(trolltechGreen.dark(250 + int(100 * x1))); + qglColor(qtGreen.dark(250 + int(100 * x1))); glVertex3d(x1, y1, +0.05); glVertex3d(x2, y2, +0.05); diff --git a/examples/opengl/hellogl/glwidget.h b/examples/opengl/hellogl/glwidget.h index be3fb35..1474965 100644 --- a/examples/opengl/hellogl/glwidget.h +++ b/examples/opengl/hellogl/glwidget.h @@ -91,8 +91,8 @@ private: int yRot; int zRot; QPoint lastPos; - QColor trolltechGreen; - QColor trolltechPurple; + QColor qtGreen; + QColor qtPurple; }; //! [3] |