diff options
| author | axis <qt-info@nokia.com> | 2009-11-05 10:32:55 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-05 10:32:55 (GMT) |
| commit | dd6a230f812b957137a2711c772284ee77ffccf4 (patch) | |
| tree | a1f46718a295964ddaa9ab04c8222f6db3b19057 /doc/src | |
| parent | f1a56f4db2f6d6c395ac6e7023b6e9184140d571 (diff) | |
| parent | eb75d1d6acf121fc08a591b4d6b34f1f39283bc2 (diff) | |
| download | Qt-dd6a230f812b957137a2711c772284ee77ffccf4.zip Qt-dd6a230f812b957137a2711c772284ee77ffccf4.tar.gz Qt-dd6a230f812b957137a2711c772284ee77ffccf4.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/examples/ftp.qdoc | 10 | ||||
| -rw-r--r-- | doc/src/network-programming/qtnetwork.qdoc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc index 782613c..68fb0d7 100644 --- a/doc/src/examples/ftp.qdoc +++ b/doc/src/examples/ftp.qdoc @@ -90,12 +90,12 @@ the FTP server, and registers whether an entry represents a directory or a file. We use the QFile object to download files from the FTP server. - + \section1 FtpWindow Class Implementation We skip the \c FtpWindow constructor as it only contains code for setting up the GUI, which is explained in other examples. - + We move on to the slots, starting with \c connectOrDisconnect(). \snippet examples/network/qftp/ftpwindow.cpp 0 @@ -137,7 +137,7 @@ \snippet examples/network/qftp/ftpwindow.cpp 3 \dots \snippet examples/network/qftp/ftpwindow.cpp 4 - + We first fetch the name of the file, which we find in the selected item of \c fileList. We then start the download by using QFtp::get(). QFtp will send progress signals during the download @@ -153,7 +153,7 @@ finished a QFtp::Command. If an error occurred during the command, QFtp will set \c error to one of the values in the QFtp::Error enum; otherwise, \c error is zero. - + \snippet examples/network/qftp/ftpwindow.cpp 7 After login, the QFtp::list() function will list the top-level @@ -165,7 +165,7 @@ When a \l{QFtp::}{Get} command is finished, a file has finished downloading (or an error occurred during the download). - + \snippet examples/network/qftp/ftpwindow.cpp 9 After a \l{QFtp::}{List} command is performed, we have to check if diff --git a/doc/src/network-programming/qtnetwork.qdoc b/doc/src/network-programming/qtnetwork.qdoc index b44b84f..c20adaf 100644 --- a/doc/src/network-programming/qtnetwork.qdoc +++ b/doc/src/network-programming/qtnetwork.qdoc @@ -101,7 +101,7 @@ Each application or library can create one or more instances of QNetworkAccessManager to handle network communication. - + \section1 Writing FTP Clients with QFtp FTP (File Transfer Protocol) is a protocol used almost exclusively |