diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 06:09:25 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 06:09:25 (GMT) |
commit | 96b6a3c9cd84dbd90bd1fac84a077c01062c5871 (patch) | |
tree | 27985ab4d9f2b8b309d0cf48bd3627a545e28938 /doc | |
parent | e6b6dfb42ea4b649b52df9d17628bfdf3f9d29e4 (diff) | |
download | Qt-96b6a3c9cd84dbd90bd1fac84a077c01062c5871.zip Qt-96b6a3c9cd84dbd90bd1fac84a077c01062c5871.tar.gz Qt-96b6a3c9cd84dbd90bd1fac84a077c01062c5871.tar.bz2 |
Update obsolete URL's in code and docs.
Reviewed-by: Trust Me
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/porting4.qdoc | 2 | ||||
-rw-r--r-- | doc/src/snippets/code/src_corelib_tools_qbytearray.cpp | 2 | ||||
-rw-r--r-- | doc/src/snippets/code/src_network_access_qftp.cpp | 4 | ||||
-rw-r--r-- | doc/src/snippets/code/src_qt3support_network_q3ftp.cpp | 6 | ||||
-rw-r--r-- | doc/src/snippets/code/src_qt3support_network_q3url.cpp | 6 | ||||
-rw-r--r-- | doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp | 2 | ||||
-rw-r--r-- | doc/src/xquery-introduction.qdoc | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/doc/src/porting4.qdoc b/doc/src/porting4.qdoc index 937885f..4efb7be 100644 --- a/doc/src/porting4.qdoc +++ b/doc/src/porting4.qdoc @@ -174,7 +174,7 @@ and MSVC 7.) If you get stuck, ask on the - \l{http://lists.trolltech.com/qt-interest/}{qt-interest} + \l{http://qt.nokia.com/lists/qt-interest/}{qt-interest} mailing list. If you are a licensed customer, you can also contact Qt's technical support team. diff --git a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp index 566633f..870f72c 100644 --- a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp @@ -211,7 +211,7 @@ ba.lastIndexOf("X"); // returns -1 //! [25] -QByteArray url("ftp://ftp.trolltech.com/"); +QByteArray url("ftp://ftp.qt.nokia.com/"); if (url.startsWith("ftp:")) ... //! [25] diff --git a/doc/src/snippets/code/src_network_access_qftp.cpp b/doc/src/snippets/code/src_network_access_qftp.cpp index 25e3da3..4230d56 100644 --- a/doc/src/snippets/code/src_network_access_qftp.cpp +++ b/doc/src/snippets/code/src_network_access_qftp.cpp @@ -1,12 +1,12 @@ //! [0] QFtp *ftp = new QFtp(parent); -ftp->connectToHost("ftp.trolltech.com"); +ftp->connectToHost("ftp.qt.nokia.com"); ftp->login(); //! [0] //! [1] -ftp->connectToHost("ftp.trolltech.com"); // id == 1 +ftp->connectToHost("ftp.qt.nokia.com"); // id == 1 ftp->login(); // id == 2 ftp->cd("qt"); // id == 3 ftp->get("INSTALL"); // id == 4 diff --git a/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp b/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp index 37e17d4..cda1be4 100644 --- a/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp +++ b/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp @@ -1,18 +1,18 @@ //! [0] -QUrlOperator op( "ftp://ftp.trolltech.com" ); +QUrlOperator op( "ftp://ftp.qt.nokia.com" ); op.listChildren(); // Asks the server to provide a directory listing //! [0] //! [1] Q3Ftp *ftp = new Q3Ftp( this ); // this is an optional QObject parent -ftp->connectToHost( "ftp.trolltech.com" ); +ftp->connectToHost( "ftp.qt.nokia.com" ); ftp->login(); //! [1] //! [2] -ftp->connectToHost( "ftp.trolltech.com" ); // id == 1 +ftp->connectToHost( "ftp.qt.nokia.com" ); // id == 1 ftp->login(); // id == 2 ftp->cd( "qt" ); // id == 3 ftp->get( "INSTALL" ); // id == 4 diff --git a/doc/src/snippets/code/src_qt3support_network_q3url.cpp b/doc/src/snippets/code/src_qt3support_network_q3url.cpp index 536840a..6dc9f31 100644 --- a/doc/src/snippets/code/src_qt3support_network_q3url.cpp +++ b/doc/src/snippets/code/src_qt3support_network_q3url.cpp @@ -15,17 +15,17 @@ Q3Url url( s ); //! [2] -Q3Url url( "ftp://ftp.trolltech.com/qt/source", "qt-2.1.0.tar.gz" ); +Q3Url url( "ftp://ftp.qt.nokia.com/qt/source", "qt-2.1.0.tar.gz" ); //! [2] //! [3] -Q3Url url( "ftp://ftp.trolltech.com/qt/source", "/usr/local" ); +Q3Url url( "ftp://ftp.qt.nokia.com/qt/source", "/usr/local" ); //! [3] //! [4] -Q3Url url( "ftp://ftp.trolltech.com/qt/source", "file:///usr/local" ); +Q3Url url( "ftp://ftp.qt.nokia.com/qt/source", "file:///usr/local" ); //! [4] diff --git a/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp b/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp index 03b8f7b..f076a7c 100644 --- a/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp +++ b/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp @@ -1,6 +1,6 @@ //! [0] Q3UrlOperator *op = new Q3UrlOperator(); -op->copy( QString("ftp://ftp.trolltech.com/qt/source/qt-2.1.0.tar.gz"), +op->copy( QString("ftp://ftp.qt.nokia.com/qt/source/qt-2.1.0.tar.gz"), "file:///tmp" ); //! [0] diff --git a/doc/src/xquery-introduction.qdoc b/doc/src/xquery-introduction.qdoc index 5b96bb3..02e4f47 100644 --- a/doc/src/xquery-introduction.qdoc +++ b/doc/src/xquery-introduction.qdoc @@ -760,7 +760,7 @@ You can also ask questions on XQuery mail lists: \list \o -\l{http://lists.trolltech.com/qt-interest/}{qt-interest} +\l{http://qt.nokia.com/lists/qt-interest/}{qt-interest} \o \l{http://www.x-query.com/mailman/listinfo/talk}{talk at x-query.com}. \endlist |