Replace some mentions of Trolltech with more appropriate terms.

Reviewed-by: Trust Me

4 files changed, 9 insertions, 9 deletions

diff --git a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
index 870f72c..c113b72 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 611daae..536473c 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/code/src_qt3support_network_q3url.cpp b/doc/src/snippets/code/src_qt3support_network_q3url.cpp
index 6dc9f31..d0174a9 100644
--- a/doc/src/snippets/code/src_qt3support_network_q3url.cpp
+++ b/doc/src/snippets/code/src_qt3support_network_q3url.cpp
@@ -32,12 +32,12 @@ Q3Url url( "ftp://ftp.qt.nokia.com/qt/source", "file:///usr/local" );
 //! [5]
 QString url = http://qt.nokia.com
 Q3Url::encode( url );
-// url is now "http%3A//www%20trolltech%20com"
+// url is now "http%3A//qt%20nokia%20com"
 //! [5]
 
 
 //! [6]
-QString url = "http%3A//www%20trolltech%20com"
+QString url = "http%3A//qt%20nokia%20com"
 Q3Url::decode( url );
 // url is now "http://qt.nokia.com"
 //! [6]
diff --git a/doc/src/snippets/qstring/main.cpp b/doc/src/snippets/qstring/main.cpp
index c075462..1179b68 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 == "qy by nokia"
 //! [75]
 }