diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-13 14:38:44 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-13 14:38:44 (GMT) |
| commit | 5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1 (patch) | |
| tree | 712cb1697a1f09439f77219c44ed90fb0223ff49 /src/network/ssl/qsslsocket.cpp | |
| parent | fdd2ad0813a856a00cac83ccff9bdd210b398c9c (diff) | |
| parent | 9820412d2551b655fec24ffde7b2a56e3ad168ea (diff) | |
| download | Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.zip Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.tar.gz Qt-5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 39ac5da..92054a4 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -113,8 +113,8 @@ readLine(), or getChar() to read decrypted data from QSslSocket's internal buffer, and you can call write() or putChar() to write data back to the peer. QSslSocket will automatically encrypt the - written data for you, and emit bytesWritten() once the data has - been written to the peer. + written data for you, and emit encryptedBytesWritten() once + the data has been written to the peer. As a convenience, QSslSocket supports QTcpSocket's blocking functions waitForConnected(), waitForReadyRead(), |