summaryrefslogtreecommitdiffstats
path: root/demos/qtdemo
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-12 07:04:56 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-12 07:04:56 (GMT)
commit1047445648b7eb5b85107c00ea43885b44f891cd (patch)
tree0f9735d5a1b83cb1e3764c4d388f96bff20f2a8b /demos/qtdemo
parent96b6a3c9cd84dbd90bd1fac84a077c01062c5871 (diff)
downloadQt-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 'demos/qtdemo')
-rw-r--r--demos/qtdemo/mainwindow.cpp14
-rw-r--r--demos/qtdemo/mainwindow.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
index 7842fec..5839b0c 100644
--- a/demos/qtdemo/mainwindow.cpp
+++ b/demos/qtdemo/mainwindow.cpp
@@ -63,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent) : QGraphicsView(parent), updateTimer(thi
this->doneAdapt = false;
this->useTimer = false;
this->updateTimer.setSingleShot(true);
- this->trolltechLogo = 0;
+ this->companyLogo = 0;
this->qtLogo = 0;
this->setupWidget();
this->setupScene();
@@ -73,7 +73,7 @@ MainWindow::MainWindow(QWidget *parent) : QGraphicsView(parent), updateTimer(thi
MainWindow::~MainWindow()
{
- delete this->trolltechLogo;
+ delete this->companyLogo;
delete this->qtLogo;
}
@@ -270,9 +270,9 @@ void MainWindow::setupSceneItems()
this->fpsLabel->setPos(Colors::stageStartX, 600 - QFontMetricsF(Colors::buttonFont()).height() - 5);
}
- this->trolltechLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, 0, true, 0.5f);
+ this->companyLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, 0, true, 0.5f);
this->qtLogo = new ImageItem(QImage(":/images/qtlogo_small.png"), 1000, 1000, this->scene, 0, true, 0.5f);
- this->trolltechLogo->setZValue(100);
+ this->companyLogo->setZValue(100);
this->qtLogo->setZValue(100);
this->pausedLabel = new DemoTextItem(QString("PAUSED"), Colors::buttonFont(), Qt::white, -1, this->scene, 0);
this->pausedLabel->setZValue(100);
@@ -456,10 +456,10 @@ void MainWindow::resizeEvent(QResizeEvent *event)
QGraphicsView::resizeEvent(event);
DemoItem::setMatrix(this->matrix());
- if (this->trolltechLogo){
+ if (this->companyLogo){
const QRectF r = this->scene->sceneRect();
- QRectF ttb = this->trolltechLogo->boundingRect();
- this->trolltechLogo->setPos(int((r.width() - ttb.width()) / 2), 595 - ttb.height());
+ QRectF ttb = this->companyLogo->boundingRect();
+ this->companyLogo->setPos(int((r.width() - ttb.width()) / 2), 595 - ttb.height());
QRectF qtb = this->qtLogo->boundingRect();
this->qtLogo->setPos(802 - qtb.width(), 0);
}
diff --git a/demos/qtdemo/mainwindow.h b/demos/qtdemo/mainwindow.h
index d8fac1f..634a026 100644
--- a/demos/qtdemo/mainwindow.h
+++ b/demos/qtdemo/mainwindow.h
@@ -98,7 +98,7 @@ private:
QTime demoStartTime;
QTime fpsTime;
QPixmap background;
- ImageItem *trolltechLogo;
+ ImageItem *companyLogo;
ImageItem *qtLogo;
bool doneAdapt;
bool useTimer;