Eliminate some mentions of Trolltech.

Reviewed-by: Trust Me

8 files changed, 20 insertions, 20 deletions

diff --git a/doc/src/codecs.qdoc b/doc/src/codecs.qdoc
index fc212df6b2..7359b79d40 100644
--- a/doc/src/codecs.qdoc
+++ b/doc/src/codecs.qdoc
@@ -48,7 +48,7 @@
     The code was originally contributed by Ming-Che Chuang
     \<mingche@cobra.ee.ntu.edu.tw\> for the Big-5+ encoding, and was
     included in Qt with the author's permission, and the grateful
-    thanks of the Trolltech team. (Note: Ming-Che's code is QPL'd, as
+    thanks of the Qt team. (Note: Ming-Che's code is QPL'd, as
     per an mail to qt-info@nokia.com.)
 
     However, since Big-5+ was never formally approved, and was never
@@ -185,7 +185,7 @@
 
     Most of the code here was written by Serika Kurusugawa,
     a.k.a. Junji Takagi, and is included in Qt with the author's
-    permission and the grateful thanks of the Trolltech team. Here is
+    permission and the grateful thanks of the Qt team. Here is
     the copyright statement for that code:
 
     \legalese
@@ -228,7 +228,7 @@
 
     It was largely written by Mizi Research Inc. Here is the
     copyright statement for the code as it was at the point of
-    contribution. Trolltech's subsequent modifications are covered by
+    contribution. The subsequent modifications are covered by
     the usual copyright for Qt.
 
     \legalese
@@ -395,7 +395,7 @@
 
     Most of the code here was written by Serika Kurusugawa,
     a.k.a. Junji Takagi, and is included in Qt with the author's
-    permission and the grateful thanks of the Trolltech team. Here is
+    permission and the grateful thanks of the Qt team. Here is
     the copyright statement for that code:
 
     \legalese
@@ -442,9 +442,9 @@
 
     Most of the code here was written by Serika Kurusugawa, a.k.a.
     Junji Takagi, and is included in Qt with the author's permission
-    and the grateful thanks of the Trolltech team. Here is the
+    and the grateful thanks of the Qt team. Here is the
     copyright statement for the code as it was at the point of
-    contribution. Trolltech's subsequent modifications are covered by
+    contribution. The subsequent modifications are covered by
     the usual copyright for Qt.
 
     \legalese
@@ -498,8 +498,8 @@
 
     Most of the code was written by Hans Petter Bieker and is
     included in Qt with the author's permission and the grateful
-    thanks of the Trolltech team. Here is the copyright statement for
-    the code as it was at the point of contribution. Trolltech's
+    thanks of the Qt team. Here is the copyright statement for
+    the code as it was at the point of contribution. The
     subsequent modifications are covered by the usual copyright for
     Qt:
 
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index 83e65395fc..5165285913 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -103,8 +103,8 @@
     \section1 Legal Notices
 
     Some source code in \QD is licensed under specific highly permissive
-    licenses from the original authors. Trolltech gratefully acknowledges
-    these contributions to \QD and all uses of \QD should also acknowledge
+    licenses from the original authors. We gratefully acknowledges
+    these contributions to \QD and all users of \QD should also acknowledge
     these contributions and quote the following license statements in an
     appendix to the documentation.
 
diff --git a/doc/src/emb-porting.qdoc b/doc/src/emb-porting.qdoc
index 4c746bfe44..1afd1bec77 100644
--- a/doc/src/emb-porting.qdoc
+++ b/doc/src/emb-porting.qdoc
@@ -49,7 +49,7 @@
     the standard C library and some POSIX functions, but only a Linux
     implementation is publically available. If you are looking for a
     non-Linux commercial implementation, it is worth contacting \l
-    {mailto:sales@trolltech.com}{sales@trolltech.com} to see if we can
+    {mailto:qt-info@nokia.com}{qt-info@nokia.com} to see if we can
     help.
 
     There are several issues to be aware of if you plan to do your own
diff --git a/doc/src/porting4-obsoletedmechanism.qdocinc b/doc/src/porting4-obsoletedmechanism.qdocinc
index 1594570bab..6bf0fbd64b 100644
--- a/doc/src/porting4-obsoletedmechanism.qdocinc
+++ b/doc/src/porting4-obsoletedmechanism.qdocinc
@@ -1,3 +1,3 @@
 If you use this mechanism in your application, please submit a
-report to the \l{Task Tracker} on the Trolltech
+report to the \l{Task Tracker} on the Qt
 website and we will try to find a satisfactory substitute.
diff --git a/doc/src/qmsdev.qdoc b/doc/src/qmsdev.qdoc
index b8d8f85ba5..67de74694d 100644
--- a/doc/src/qmsdev.qdoc
+++ b/doc/src/qmsdev.qdoc
@@ -35,7 +35,7 @@
   \endlist
 
   Now the integration plugin should be installed. If this doesn't
-  work, then contact Trolltech technical support giving details of
+  work, then contact Qt technical support giving details of
   what went wrong.
   
   \section1 How to uninstall the Visual Studio Integration Plugin
diff --git a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
index 566633f3ab..08ca2f502e 100644
--- a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -246,16 +246,16 @@ QByteArray z = x.mid(5);        // z == "pineapples"
 
 
 //! [30]
-QByteArray x("TROlltECH");
+QByteArray x("Qt by NOKIA");
 QByteArray y = x.toLower();
-// y == "trolltech"
+// y == "qt by nokia"
 //! [30]
 
 
 //! [31]
-QByteArray x("TROlltECH");
+QByteArray x("Qt by NOKIA");
 QByteArray y = x.toUpper();
-// y == "TROLLTECH"
+// y == "QT BY NOKIA"
 //! [31]
 
 
diff --git a/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
index 611daae92e..536473ced3 100644
--- a/doc/src/snippets/code/src_gui_painting_qpainter.cpp
+++ b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
@@ -173,7 +173,7 @@ painter.drawPixmap(target, image, source);
 
 //! [17]
 QPainter painter(this);
-painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nTrolltech"));
+painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nNokia"));
 //! [17]
 
 
diff --git a/doc/src/snippets/qstring/main.cpp b/doc/src/snippets/qstring/main.cpp
index c075462c00..521817e9d4 100644
--- a/doc/src/snippets/qstring/main.cpp
+++ b/doc/src/snippets/qstring/main.cpp
@@ -801,8 +801,8 @@ void Widget::toLongLongFunction()
 void Widget::toLowerFunction()
 {
 //! [75]
-    QString str = "TROlltECH";
-    str = str.toLower();        // str == "trolltech"
+    QString str = "Qt by NOKIA";
+    str = str.toLower();        // str == "qt by nokia"
 //! [75]
 }