summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/opengl/hellogl/glwidget.cpp10
-rw-r--r--examples/opengl/hellogl/glwidget.h4
-rw-r--r--examples/opengl/overpainting/glwidget.cpp14
-rw-r--r--examples/opengl/overpainting/glwidget.h4
-rw-r--r--examples/opengl/samplebuffers/glwidget.cpp6
-rw-r--r--examples/tools/completer/resources/wordlist.txt1
-rw-r--r--examples/tools/customcompleter/resources/wordlist.txt1
-rw-r--r--examples/xml/dombookmarks/jennifer.xbel2
-rw-r--r--examples/xml/saxbookmarks/jennifer.xbel2
9 files changed, 21 insertions, 23 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]
diff --git a/examples/opengl/overpainting/glwidget.cpp b/examples/opengl/overpainting/glwidget.cpp
index 3e4b17f..a6e6195 100644
--- a/examples/opengl/overpainting/glwidget.cpp
+++ b/examples/opengl/overpainting/glwidget.cpp
@@ -64,8 +64,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);
animationTimer.setSingleShot(false);
connect(&animationTimer, SIGNAL(timeout()), this, SLOT(animate()));
@@ -142,7 +142,7 @@ void GLWidget::paintEvent(QPaintEvent *event)
//! [4]
//! [6]
- qglClearColor(trolltechPurple.dark());
+ qglClearColor(qtPurple.dark());
glShadeModel(GL_SMOOTH);
glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
@@ -210,9 +210,9 @@ GLuint GLWidget::makeObject()
glEnable(GL_NORMALIZE);
glBegin(GL_QUADS);
- static GLfloat logoDiffuseColor[4] = {trolltechGreen.red()/255.0,
- trolltechGreen.green()/255.0,
- trolltechGreen.blue()/255.0, 1.0};
+ static GLfloat logoDiffuseColor[4] = {qtGreen.red()/255.0,
+ qtGreen.green()/255.0,
+ qtGreen.blue()/255.0, 1.0};
glMaterialfv(GL_FRONT, GL_DIFFUSE, logoDiffuseColor);
GLdouble x1 = +0.06;
@@ -281,7 +281,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)));
glNormal3d((x1 + x2)/2.0, (y1 + y2)/2.0, 0.0);
glVertex3d(x1, y1, +0.05);
diff --git a/examples/opengl/overpainting/glwidget.h b/examples/opengl/overpainting/glwidget.h
index df40808..13814a6 100644
--- a/examples/opengl/overpainting/glwidget.h
+++ b/examples/opengl/overpainting/glwidget.h
@@ -103,8 +103,8 @@ private:
int yRot;
int zRot;
QPoint lastPos;
- QColor trolltechGreen;
- QColor trolltechPurple;
+ QColor qtGreen;
+ QColor qtPurple;
//! [4]
QList<Bubble*> bubbles;
QTimer animationTimer;
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);
diff --git a/examples/tools/completer/resources/wordlist.txt b/examples/tools/completer/resources/wordlist.txt
index e598a19..1f56e36 100644
--- a/examples/tools/completer/resources/wordlist.txt
+++ b/examples/tools/completer/resources/wordlist.txt
@@ -1366,7 +1366,6 @@ transparency
transparent
travel
traveled
-Trolltech
true
try
turn
diff --git a/examples/tools/customcompleter/resources/wordlist.txt b/examples/tools/customcompleter/resources/wordlist.txt
index a5de826..f8b581a 100644
--- a/examples/tools/customcompleter/resources/wordlist.txt
+++ b/examples/tools/customcompleter/resources/wordlist.txt
@@ -1337,7 +1337,6 @@ transparency
transparent
travel
traveled
-Trolltech
true
try
turn
diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel
index 6cfa491..36256fd 100644
--- a/examples/xml/dombookmarks/jennifer.xbel
+++ b/examples/xml/dombookmarks/jennifer.xbel
@@ -4,7 +4,7 @@
<folder folded="no">
<title>Qt Resources</title>
<folder folded="yes">
- <title>Trolltech Partners</title>
+ <title>Qt Partners</title>
<bookmark href="http://partners.trolltech.com/partners/training.html">
<title>Training Partners</title>
</bookmark>
diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel
index cd9bece..d6a5b41 100644
--- a/examples/xml/saxbookmarks/jennifer.xbel
+++ b/examples/xml/saxbookmarks/jennifer.xbel
@@ -4,7 +4,7 @@
<folder folded="no">
<title>Qt Resources</title>
<folder folded="yes">
- <title>Trolltech Partners</title>
+ <title>Qt Partners</title>
<bookmark href="http://partners.trolltech.com/partners/training.html">
<title>Training Partners</title>
</bookmark>
generated by cgit v0.12 at 2024-12-27 22:43:49 (GMT)