From 8a5e1fbd4f42a0f5cc23ac797d06424c1b362536 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 11 Aug 2009 20:50:53 +1000 Subject: Update URL for Qt FTP site. Reviewed-by: Trust Me --- .../snippets/code/src_corelib_tools_qbytearray.cpp | 2 +- doc/src/snippets/code/src_network_access_qftp.cpp | 4 +- .../snippets/code/src_qt3support_network_q3ftp.cpp | 6 +-- .../snippets/code/src_qt3support_network_q3url.cpp | 6 +-- .../code/src_qt3support_network_q3urloperator.cpp | 2 +- examples/network/ftp/ftpwindow.cpp | 2 +- src/qt3support/network/q3url.cpp | 2 +- tests/auto/q3dns/tst_q3dns.cpp | 4 +- tests/auto/qftp/tst_qftp.cpp | 2 +- tests/auto/qurl/tst_qurl.cpp | 44 +++++++++++----------- tools/installer/nsis/modules/mingw.nsh | 2 +- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp index 08ca2f5..c113b72 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..b5ff0c3 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 890ea71..d0174a9 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/examples/network/ftp/ftpwindow.cpp b/examples/network/ftp/ftpwindow.cpp index 7fc3b3b..2be9059 100644 --- a/examples/network/ftp/ftpwindow.cpp +++ b/examples/network/ftp/ftpwindow.cpp @@ -48,7 +48,7 @@ FtpWindow::FtpWindow(QWidget *parent) : QDialog(parent), ftp(0) { ftpServerLabel = new QLabel(tr("Ftp &server:")); - ftpServerLineEdit = new QLineEdit("ftp.trolltech.com"); + ftpServerLineEdit = new QLineEdit("ftp.qt.nokia.com"); ftpServerLabel->setBuddy(ftpServerLineEdit); statusLabel = new QLabel(tr("Please enter the name of an FTP server.")); diff --git a/src/qt3support/network/q3url.cpp b/src/qt3support/network/q3url.cpp index 4d3ad94..25ee07f 100644 --- a/src/qt3support/network/q3url.cpp +++ b/src/qt3support/network/q3url.cpp @@ -228,7 +228,7 @@ bool Q3Url::isRelativeUrl( const QString &url ) On the other hand, \snippet doc/src/snippets/code/src_qt3support_network_q3url.cpp 3 - will result in a new URL, "ftp://ftp.trolltech.com/usr/local", + will result in a new URL, "ftp://ftp.qt.nokia.com/usr/local", because "/usr/local" isn't relative. Similarly, diff --git a/tests/auto/q3dns/tst_q3dns.cpp b/tests/auto/q3dns/tst_q3dns.cpp index 018ce84..222a1d7 100644 --- a/tests/auto/q3dns/tst_q3dns.cpp +++ b/tests/auto/q3dns/tst_q3dns.cpp @@ -113,7 +113,7 @@ void tst_Q3Dns::destructor() { QApplication a( argc, argv ); Q3Socket *s = new Q3Socket( &a ); - s->connectToHost( "ftp.trolltech.com", 21 ); + s->connectToHost( "ftp.qt.nokia.com", 21 ); return 0; } */ @@ -121,7 +121,7 @@ void tst_Q3Dns::destructor() char **v = 0; QCoreApplication a(c, v); Q3Socket *s = new Q3Socket(&a); - s->connectToHost("ftp.trolltech.com", 21); + s->connectToHost("ftp.qt.nokia.com", 21); // dummy verify since this test only makes shure that it does not crash QVERIFY( TRUE ); diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp index d883c0c..7fa5601 100644 --- a/tests/auto/qftp/tst_qftp.cpp +++ b/tests/auto/qftp/tst_qftp.cpp @@ -2002,7 +2002,7 @@ void tst_QFtp::queueMoreCommandsInDoneSlot() this->ftp = &ftp; connect(&ftp, SIGNAL(done(bool)), this, SLOT(cdUpSlot(bool))); - ftp.connectToHost("ftp.trolltech.com"); + ftp.connectToHost("ftp.qt.nokia.com"); ftp.login(); ftp.cd("qt"); ftp.rmdir("qtest-removedir-noexist"); diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index cccb1db..be709e1 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -1814,8 +1814,8 @@ void tst_QUrl::compat_constructor_01_data() //next we fill it with data QTest::newRow( "data0" ) << QString("Makefile") << QString("Makefile"); // nolonger add file by defualt QTest::newRow( "data1" ) << QString("Makefile") << QString("Makefile"); - QTest::newRow( "data2" ) << QString("ftp://ftp.trolltech.com/qt/INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); - QTest::newRow( "data3" ) << QString("ftp://ftp.trolltech.com/qt/INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); + QTest::newRow( "data2" ) << QString("ftp://ftp.qt.nokia.com/qt/INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); + QTest::newRow( "data3" ) << QString("ftp://ftp.qt.nokia.com/qt/INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); } void tst_QUrl::compat_constructor_01() @@ -1830,7 +1830,7 @@ void tst_QUrl::compat_constructor_01() * as well as the following: * * QUrlOperator op; - * op.copy(QString("ftp://ftp.trolltech.com/qt/INSTALL"), "."); + * op.copy(QString("ftp://ftp.qt.nokia.com/qt/INSTALL"), "."); */ QFETCH( QString, urlStr ); @@ -1855,15 +1855,15 @@ void tst_QUrl::compat_constructor_02_data() QTest::addColumn("res"); //next we fill it with data - QTest::newRow( "data0" ) << QString("ftp://ftp.trolltech.com/qt") << QString("INSTALL") << QString("ftp://ftp.trolltech.com/INSTALL"); - QTest::newRow( "data1" ) << QString("ftp://ftp.trolltech.com/qt/") << QString("INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); + QTest::newRow( "data0" ) << QString("ftp://ftp.qt.nokia.com/qt") << QString("INSTALL") << QString("ftp://ftp.trolltech.com/INSTALL"); + QTest::newRow( "data1" ) << QString("ftp://ftp.qt.nokia.com/qt/") << QString("INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); } void tst_QUrl::compat_constructor_02() { /* The following should work as expected: * - * QUrlOperator op( "ftp://ftp.trolltech.com/qt" ); + * QUrlOperator op( "ftp://ftp.qt.nokia.com/qt" ); * op.copy(QString("INSTALL"), "."); */ QFETCH( QString, urlStr ); @@ -1886,7 +1886,7 @@ void tst_QUrl::compat_constructor_03_data() QTest::newRow( "protocol02" ) << QString( "http://qt.nokia.com/" ) << QString( "http://www.trolltech.com/" ); QTest::newRow( "protocol03" ) << QString( "http://qt.nokia.com/foo" ) << QString( "http://www.trolltech.com/foo" ); QTest::newRow( "protocol04" ) << QString( "http://qt.nokia.com/foo/" ) << QString( "http://www.trolltech.com/foo/" ); - QTest::newRow( "protocol05" ) << QString( "ftp://ftp.trolltech.com/foo/index.txt" ) << QString( "ftp://ftp.trolltech.com/foo/index.txt" ); + QTest::newRow( "protocol05" ) << QString( "ftp://ftp.qt.nokia.com/foo/index.txt" ) << QString( "ftp://ftp.trolltech.com/foo/index.txt" ); QTest::newRow( "local00" ) << QString( "/foo" ) << QString( "/foo" ); QTest::newRow( "local01" ) << QString( "/foo/" ) << QString( "/foo/" ); @@ -1928,11 +1928,11 @@ void tst_QUrl::compat_isValid_01_data() QTest::addColumn("urlStr"); QTest::addColumn("res"); - QTest::newRow( "ok_01" ) << QString("ftp://ftp.trolltech.com/qt/INSTALL") << (bool)true; + QTest::newRow( "ok_01" ) << QString("ftp://ftp.qt.nokia.com/qt/INSTALL") << (bool)true; QTest::newRow( "ok_02" ) << QString( "file:/foo") << (bool)true; QTest::newRow( "ok_03" ) << QString( "file:foo") << (bool)true; - QTest::newRow( "err_01" ) << QString("#ftp://ftp.trolltech.com/qt/INSTALL") << (bool)true; + QTest::newRow( "err_01" ) << QString("#ftp://ftp.qt.nokia.com/qt/INSTALL") << (bool)true; QTest::newRow( "err_02" ) << QString( "file:/::foo") << (bool)true; } @@ -1958,18 +1958,18 @@ void tst_QUrl::compat_isValid_02_data() QString n = ""; QTest::newRow( "ok_01" ) << n << n << n << n << -1 << QString("path") << (bool)true; - QTest::newRow( "ok_02" ) << QString("ftp") << n << n << QString("ftp.trolltech.com") << -1 << n << (bool)true; - QTest::newRow( "ok_03" ) << QString("ftp") << QString("foo") << n << QString("ftp.trolltech.com") << -1 << n << (bool)true; - QTest::newRow( "ok_04" ) << QString("ftp") << QString("foo") << QString("bar") << QString("ftp.trolltech.com") << -1 << n << (bool)true; - QTest::newRow( "ok_05" ) << QString("ftp") << n << n << QString("ftp.trolltech.com") << -1 << QString("path")<< (bool)true; - QTest::newRow( "ok_06" ) << QString("ftp") << QString("foo") << n << QString("ftp.trolltech.com") << -1 << QString("path") << (bool)true; - QTest::newRow( "ok_07" ) << QString("ftp") << QString("foo") << QString("bar") << QString("ftp.trolltech.com") << -1 << QString("path")<< (bool)true; + QTest::newRow( "ok_02" ) << QString("ftp") << n << n << QString("ftp.qt.nokia.com") << -1 << n << (bool)true; + QTest::newRow( "ok_03" ) << QString("ftp") << QString("foo") << n << QString("ftp.qt.nokia.com") << -1 << n << (bool)true; + QTest::newRow( "ok_04" ) << QString("ftp") << QString("foo") << QString("bar") << QString("ftp.qt.nokia.com") << -1 << n << (bool)true; + QTest::newRow( "ok_05" ) << QString("ftp") << n << n << QString("ftp.qt.nokia.com") << -1 << QString("path")<< (bool)true; + QTest::newRow( "ok_06" ) << QString("ftp") << QString("foo") << n << QString("ftp.qt.nokia.com") << -1 << QString("path") << (bool)true; + QTest::newRow( "ok_07" ) << QString("ftp") << QString("foo") << QString("bar") << QString("ftp.qt.nokia.com") << -1 << QString("path")<< (bool)true; QTest::newRow( "err_01" ) << n << n << n << n << -1 << n << (bool)false; QTest::newRow( "err_02" ) << QString("ftp") << n << n << n << -1 << n << (bool)true; QTest::newRow( "err_03" ) << n << QString("foo") << n << n << -1 << n << (bool)true; QTest::newRow( "err_04" ) << n << n << QString("bar") << n << -1 << n << (bool)true; - QTest::newRow( "err_05" ) << n << n << n << QString("ftp.trolltech.com") << -1 << n << (bool)true; + QTest::newRow( "err_05" ) << n << n << n << QString("ftp.qt.nokia.com") << -1 << n << (bool)true; QTest::newRow( "err_06" ) << n << n << n << n << 80 << n << (bool)true; QTest::newRow( "err_07" ) << QString("ftp") << QString("foo") << n << n << -1 << n << (bool)true; QTest::newRow( "err_08" ) << QString("ftp") << n << QString("bar") << n << -1 << n << (bool)true; @@ -2452,12 +2452,12 @@ void tst_QUrl::schemeValidator_data() // ftp QTest::newRow("ftp:") << QByteArray("ftp:") << true << QString("ftp:"); - QTest::newRow("ftp://ftp.trolltech.com") - << QByteArray("ftp://ftp.trolltech.com") - << true << QString("ftp://ftp.trolltech.com"); - QTest::newRow("ftp://ftp.trolltech.com/") - << QByteArray("ftp://ftp.trolltech.com/") - << true << QString("ftp://ftp.trolltech.com/"); + QTest::newRow("ftp://ftp.qt.nokia.com") + << QByteArray("ftp://ftp.qt.nokia.com") + << true << QString("ftp://ftp.qt.nokia.com"); + QTest::newRow("ftp://ftp.qt.nokia.com/") + << QByteArray("ftp://ftp.qt.nokia.com/") + << true << QString("ftp://ftp.qt.nokia.com/"); QTest::newRow("ftp:/index.html") << QByteArray("ftp:/index.html") << false << QString(); diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh index 7fce506..386d7d7 100644 --- a/tools/installer/nsis/modules/mingw.nsh +++ b/tools/installer/nsis/modules/mingw.nsh @@ -57,7 +57,7 @@ !error "MODULE_MINGW_ROOT not defined!" !endif !ifndef MODULE_MINGW_URL - !define MODULE_MINGW_URL "ftp://ftp.trolltech.com/misc" + !define MODULE_MINGW_URL "ftp://ftp.qt.nokia.com/misc" !endif !ifndef MODULE_MINGW_COMPILERVERSION !define MODULE_MINGW_COMPILERVERSION "3.4.2" -- cgit v0.12