Eliminate some mentions of Trolltech.

Reviewed-by: Trust Me

7 files changed, 52 insertions, 52 deletions

diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp
index 7a87b339c6..8262d22175 100644
--- a/demos/browser/browserapplication.cpp
+++ b/demos/browser/browserapplication.cpp
@@ -79,7 +79,7 @@ BrowserApplication::BrowserApplication(int &argc, char **argv)
     : QApplication(argc, argv)
     , m_localServer(0)
 {
-    QCoreApplication::setOrganizationName(QLatin1String("Trolltech"));
+    QCoreApplication::setOrganizationName(QLatin1String("Qt"));
     QCoreApplication::setApplicationName(QLatin1String("demobrowser"));
     QCoreApplication::setApplicationVersion(QLatin1String("0.1"));
 #ifdef Q_WS_QWS
diff --git a/demos/browser/htmls/notfound.html b/demos/browser/htmls/notfound.html
index b04a9f83ff..e89845aa65 100644
--- a/demos/browser/htmls/notfound.html
+++ b/demos/browser/htmls/notfound.html
@@ -49,8 +49,8 @@ ul {
     <h1>%2</h1>
     <h2>When connecting to: %3.</h2>
     <ul>
-      <li>Check the address for errors such as <b>ww</b>.trolltech.com
-      instead of <b>www</b>.trolltech.com</li>
+      <li>Check the address for errors such as <b>ww</b>.example.com
+      instead of <b>www</b>.example.com</li>
       <li>If the address is correct, try checking the network
       connection.</li>
       <li>If your computer or network is protected by a firewall or
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp
index 19661d1cbb..1c4197ac4a 100644
--- a/demos/embedded/fluidlauncher/pictureflow.cpp
+++ b/demos/embedded/fluidlauncher/pictureflow.cpp
@@ -1,39 +1,39 @@
 /****************************************************************************
 **
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
-* This is version of the Pictureflow animated image show widget modified by Nokia.
-*
-*  $QT_BEGIN_LICENSE:LGPL$
-*  No Commercial Usage
-*  This file contains pre-release code and may not be distributed.
-*  You may use this file in accordance with the terms and conditions
-*  contained in the either Technology Preview License Agreement or the
-*  Beta Release License Agreement.
-* 
-*  GNU Lesser General Public License Usage
-*  Alternatively, this file may be used under the terms of the GNU Lesser
-*  General Public License version 2.1 as published by the Free Software
-*  Foundation and appearing in the file LICENSE.LGPL included in the
-*  packaging of this file.  Please review the following information to
-*  ensure the GNU Lesser General Public License version 2.1 requirements
-*  will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-* 
-*  In addition, as a special exception, Nokia gives you certain
-*  additional rights. These rights are described in the Nokia Qt LGPL
-*  Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-*  package.
-* 
-*  GNU General Public License Usage
-*  Alternatively, this file may be used under the terms of the GNU
-*  General Public License version 3.0 as published by the Free Software
-*  Foundation and appearing in the file LICENSE.GPL included in the
-*  packaging of this file.  Please review the following information to
-*  ensure the GNU General Public License version 3.0 requirements will be
-*  met: http://www.gnu.org/copyleft/gpl.html.
-* 
-*  If you are unsure which license is appropriate for your use, please
-*  contact the sales department at http://qt.nokia.com/contact.
-*  $QT_END_LICENSE$
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+** This is version of the Pictureflow animated image show widget modified by Nokia.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
 *
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 *       names of its contributors may be used to endorse or promote products
 *       derived from this software without specific prior written permission.
 *
-* THIS SOFTWARE IS PROVIDED BY TROLLTECH ASA ``AS IS'' AND ANY
+* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
@@ -57,10 +57,10 @@
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+*
 ****************************************************************************/
 
-/* 
+/*
   ORIGINAL COPYRIGHT HEADER
   PictureFlow - animated image show widget
   http://pictureflow.googlecode.com
diff --git a/demos/embedded/styledemo/main.cpp b/demos/embedded/styledemo/main.cpp
index 7aab5323bd..7cb6b7f97a 100644
--- a/demos/embedded/styledemo/main.cpp
+++ b/demos/embedded/styledemo/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(styledemo);
 
     app.setApplicationName("style");
-    app.setOrganizationName("Trolltech");
-    app.setOrganizationDomain("com.trolltech");
+    app.setOrganizationName("Nokia");
+    app.setOrganizationDomain("com.nokia.qt");
 
     StyleWidget widget;
     widget.showFullScreen();
diff --git a/demos/mediaplayer/main.cpp b/demos/mediaplayer/main.cpp
index 8c921fcd8a..8a6d71e681 100644
--- a/demos/mediaplayer/main.cpp
+++ b/demos/mediaplayer/main.cpp
@@ -47,9 +47,9 @@ int main (int argc, char *argv[])
     Q_INIT_RESOURCE(mediaplayer);
     QApplication app(argc, argv);
     app.setApplicationName("Media Player");
-    app.setOrganizationName("Trolltech");
+    app.setOrganizationName("Qt");
     app.setQuitOnLastWindowClosed(true);
-    
+
     QString fileString = app.arguments().value(1);
     MediaPlayer player(fileString);
     player.show();
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
index 1561dda383..59715a67d4 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;
 }
 
@@ -275,9 +275,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);
@@ -463,10 +463,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 d8fac1fc78..634a026b49 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;