summaryrefslogtreecommitdiffstats
path: root/src/qt3support/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/qt3support/network')
-rw-r--r--src/qt3support/network/q3dns.cpp2
-rw-r--r--src/qt3support/network/q3dns.h2
-rw-r--r--src/qt3support/network/q3ftp.cpp4
-rw-r--r--src/qt3support/network/q3ftp.h2
-rw-r--r--src/qt3support/network/q3http.cpp11
-rw-r--r--src/qt3support/network/q3http.h2
-rw-r--r--src/qt3support/network/q3localfs.cpp2
-rw-r--r--src/qt3support/network/q3localfs.h2
-rw-r--r--src/qt3support/network/q3network.cpp2
-rw-r--r--src/qt3support/network/q3network.h2
-rw-r--r--src/qt3support/network/q3networkprotocol.cpp2
-rw-r--r--src/qt3support/network/q3networkprotocol.h2
-rw-r--r--src/qt3support/network/q3serversocket.cpp2
-rw-r--r--src/qt3support/network/q3serversocket.h2
-rw-r--r--src/qt3support/network/q3socket.cpp2
-rw-r--r--src/qt3support/network/q3socket.h2
-rw-r--r--src/qt3support/network/q3socketdevice.cpp2
-rw-r--r--src/qt3support/network/q3socketdevice.h2
-rw-r--r--src/qt3support/network/q3socketdevice_unix.cpp2
-rw-r--r--src/qt3support/network/q3socketdevice_win.cpp2
-rw-r--r--src/qt3support/network/q3url.cpp14
-rw-r--r--src/qt3support/network/q3url.h2
-rw-r--r--src/qt3support/network/q3urloperator.cpp2
-rw-r--r--src/qt3support/network/q3urloperator.h2
24 files changed, 35 insertions, 36 deletions
diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp
index 6d514c1..6652dc8 100644
--- a/src/qt3support/network/q3dns.cpp
+++ b/src/qt3support/network/q3dns.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3dns.h b/src/qt3support/network/q3dns.h
index 79d1011..d06ad62 100644
--- a/src/qt3support/network/q3dns.h
+++ b/src/qt3support/network/q3dns.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3ftp.cpp b/src/qt3support/network/q3ftp.cpp
index e27c7bd..bc03368 100644
--- a/src/qt3support/network/q3ftp.cpp
+++ b/src/qt3support/network/q3ftp.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -1144,7 +1144,7 @@ static void delete_d( const Q3Ftp* foo )
Some commands, e.g. list(), emit additional signals to report
their results.
- Example: If you want to download the INSTALL file from Trolltech's
+ Example: If you want to download the INSTALL file from the Qt
FTP server, you would write this:
\snippet doc/src/snippets/code/src_qt3support_network_q3ftp.cpp 2
diff --git a/src/qt3support/network/q3ftp.h b/src/qt3support/network/q3ftp.h
index cc55ce9..58be341 100644
--- a/src/qt3support/network/q3ftp.h
+++ b/src/qt3support/network/q3ftp.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp
index 9b5c33f..c1c2148 100644
--- a/src/qt3support/network/q3http.cpp
+++ b/src/qt3support/network/q3http.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -1048,8 +1048,7 @@ QString Q3HttpRequestHeader::toString() const
To make an HTTP request you must set up suitable HTTP headers. The
following example demonstrates, how to request the main HTML page
- from the Trolltech home page (i.e. the URL
- http://qtsoftware.com/index.html):
+ from the Qt website (i.e. the URL \c http://qt.nokia.com/index.html):
\snippet doc/src/snippets/code/src_qt3support_network_q3http.cpp 3
@@ -1535,7 +1534,7 @@ int Q3Http::setHost(const QString &hostname, Q_UINT16 port )
as specified in the constructor.
\a path must be an absolute path like \c /index.html or an
- absolute URI like \c http://qtsoftware.com/index.html.
+ absolute URI like \c http://example.com/index.html.
If the IO device \a to is 0 the readyRead() signal is emitted
every time new content data is available to read.
@@ -1568,7 +1567,7 @@ int Q3Http::get( const QString& path, QIODevice* to )
as specified in the constructor.
\a path must be an absolute path like \c /index.html or an
- absolute URI like \c http://qtsoftware.com/index.html.
+ absolute URI like \c http://example.com/index.html.
The incoming data comes via the \a data IO device.
@@ -1615,7 +1614,7 @@ int Q3Http::post( const QString& path, const QByteArray& data, QIODevice* to )
or as specified in the constructor.
\a path must be an absolute path like \c /index.html or an
- absolute URI like \c http://qtsoftware.com/index.html.
+ absolute URI like \c http://example.com/index.html.
The function does not block and returns immediately. The request
is scheduled, and its execution is performed asynchronously. The
diff --git a/src/qt3support/network/q3http.h b/src/qt3support/network/q3http.h
index 5311764..4257ac2 100644
--- a/src/qt3support/network/q3http.h
+++ b/src/qt3support/network/q3http.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3localfs.cpp b/src/qt3support/network/q3localfs.cpp
index 6dc8177..f8c1b16 100644
--- a/src/qt3support/network/q3localfs.cpp
+++ b/src/qt3support/network/q3localfs.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3localfs.h b/src/qt3support/network/q3localfs.h
index d6b2b43..01eaae6 100644
--- a/src/qt3support/network/q3localfs.h
+++ b/src/qt3support/network/q3localfs.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3network.cpp b/src/qt3support/network/q3network.cpp
index 1f918d1..a64dfd3 100644
--- a/src/qt3support/network/q3network.cpp
+++ b/src/qt3support/network/q3network.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3network.h b/src/qt3support/network/q3network.h
index 4a9986b..5239b78 100644
--- a/src/qt3support/network/q3network.h
+++ b/src/qt3support/network/q3network.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3networkprotocol.cpp b/src/qt3support/network/q3networkprotocol.cpp
index e1aab56..b09ebe4 100644
--- a/src/qt3support/network/q3networkprotocol.cpp
+++ b/src/qt3support/network/q3networkprotocol.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3networkprotocol.h b/src/qt3support/network/q3networkprotocol.h
index 7de3ae2..e53befd 100644
--- a/src/qt3support/network/q3networkprotocol.h
+++ b/src/qt3support/network/q3networkprotocol.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3serversocket.cpp b/src/qt3support/network/q3serversocket.cpp
index 28902d0..92710ae 100644
--- a/src/qt3support/network/q3serversocket.cpp
+++ b/src/qt3support/network/q3serversocket.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3serversocket.h b/src/qt3support/network/q3serversocket.h
index b0578c0..e025b23 100644
--- a/src/qt3support/network/q3serversocket.h
+++ b/src/qt3support/network/q3serversocket.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3socket.cpp b/src/qt3support/network/q3socket.cpp
index 6524735..9f61d97 100644
--- a/src/qt3support/network/q3socket.cpp
+++ b/src/qt3support/network/q3socket.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3socket.h b/src/qt3support/network/q3socket.h
index edbbc53..d04a8ea 100644
--- a/src/qt3support/network/q3socket.h
+++ b/src/qt3support/network/q3socket.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3socketdevice.cpp b/src/qt3support/network/q3socketdevice.cpp
index e202186..4db50a0 100644
--- a/src/qt3support/network/q3socketdevice.cpp
+++ b/src/qt3support/network/q3socketdevice.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3socketdevice.h b/src/qt3support/network/q3socketdevice.h
index a2637b3..b665636 100644
--- a/src/qt3support/network/q3socketdevice.h
+++ b/src/qt3support/network/q3socketdevice.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3socketdevice_unix.cpp b/src/qt3support/network/q3socketdevice_unix.cpp
index 0073e6c..3170a0e 100644
--- a/src/qt3support/network/q3socketdevice_unix.cpp
+++ b/src/qt3support/network/q3socketdevice_unix.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3socketdevice_win.cpp b/src/qt3support/network/q3socketdevice_win.cpp
index a0f0c0f..a3b766c 100644
--- a/src/qt3support/network/q3socketdevice_win.cpp
+++ b/src/qt3support/network/q3socketdevice_win.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3url.cpp b/src/qt3support/network/q3url.cpp
index 3523ace..bcb574c 100644
--- a/src/qt3support/network/q3url.cpp
+++ b/src/qt3support/network/q3url.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -109,12 +109,12 @@ static void slashify( QString& s, bool allowMultiple = true )
Example:
- <tt>http://qtsoftware.com:80/cgi-bin/test%20me.pl?cmd=Hello%20you</tt>
+ <tt>http://example.com:80/cgi-bin/test%20me.pl?cmd=Hello%20you</tt>
\table
\header \i Function \i Returns
\row \i \l protocol() \i "http"
- \row \i \l host() \i "qtsoftware.com"
+ \row \i \l host() \i "example.com"
\row \i \l port() \i 80
\row \i \l path() \i "/cgi-bin/test&nbsp;me.pl"
\row \i \l fileName() \i "test&nbsp;me.pl"
@@ -123,13 +123,13 @@ static void slashify( QString& s, bool allowMultiple = true )
Example:
- <tt>http://doc.trolltech.com/qdockarea.html#lines</tt>
+ <tt>http://qt.nokia.com/doc/qdockarea.html#lines</tt>
\table
\header \i Function \i Returns
\row \i \l protocol() \i "http"
- \row \i \l host() \i "doc.trolltech.com"
- \row \i \l fileName() \i "qdockarea.html"
+ \row \i \l host() \i "qt.nokia.com"
+ \row \i \l fileName() \i "doc/qdockarea.html"
\row \i \l ref() \i "lines"
\endtable
@@ -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/src/qt3support/network/q3url.h b/src/qt3support/network/q3url.h
index 74c8769..4e90e1e 100644
--- a/src/qt3support/network/q3url.h
+++ b/src/qt3support/network/q3url.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3urloperator.cpp b/src/qt3support/network/q3urloperator.cpp
index 98a603f..362ad3f 100644
--- a/src/qt3support/network/q3urloperator.cpp
+++ b/src/qt3support/network/q3urloperator.cpp
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/qt3support/network/q3urloperator.h b/src/qt3support/network/q3urloperator.h
index cab2b40..ecac611 100644
--- a/src/qt3support/network/q3urloperator.h
+++ b/src/qt3support/network/q3urloperator.h
@@ -34,7 +34,7 @@
** 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://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/