Fwd: [kdelibs/KDE/4.8] kdecore/network: KTcpSocket: forward encryptedBytesWritten from QSslSocket.

[David Faure]

Hello,

can you make sure this commit goes into kdelibs-4.8.0 ?
Given the current RC status, I'm not sure if all changes to kdelibs KDE/4.8 
will be taken, or none, or only selected ones...

----------  Forwarded Message  ----------

Subject: [kdelibs/KDE/4.8] kdecore/network: KTcpSocket: forward 
encryptedBytesWritten from QSslSocket.
Date: Friday, January 06, 2012, 01:17:50 PM
From: David Faure <faure at kde.org>
To: kde-commits at kde.org

Git commit d31715db768b477e8e5d7acaf852924f356c42e2 by David Faure.
Committed on 06/01/2012 at 12:33.
Pushed by dfaure into branch 'KDE/4.8'.

KTcpSocket: forward encryptedBytesWritten from QSslSocket.

Very important for the timeout detection in the akonadi imap resource.
write(5MB) gives an immediate bytesWritten(5MB), only encryptedBytesWritten
allows to see some regular activity on the socket.

CCBUG: 258271, 258361

M  +1    -0    kdecore/network/ktcpsocket.cpp
M  +4    -0    kdecore/network/ktcpsocket.h

http://commits.kde.org/kdelibs/d31715db768b477e8e5d7acaf852924f356c42e2

diff --git a/kdecore/network/ktcpsocket.cpp b/kdecore/network/ktcpsocket.cpp
index 4f5b583..29eb826 100644
--- a/kdecore/network/ktcpsocket.cpp
+++ b/kdecore/network/ktcpsocket.cpp
@@ -380,6 +380,7 @@ KTcpSocket::KTcpSocket(QObject *parent)
 
     connect(&d->sock, SIGNAL(aboutToClose()), this, SIGNAL(aboutToClose()));
     connect(&d->sock, SIGNAL(bytesWritten(qint64)), this, 
SIGNAL(bytesWritten(qint64)));
+    connect(&d->sock, SIGNAL(encryptedBytesWritten(qint64)), this, 
SIGNAL(encryptedBytesWritten(qint64)));
     connect(&d->sock, SIGNAL(readyRead()), this, SLOT(reemitReadyRead()));
     connect(&d->sock, SIGNAL(connected()), this, SIGNAL(connected()));
     connect(&d->sock, SIGNAL(encrypted()), this, SIGNAL(encrypted()));
diff --git a/kdecore/network/ktcpsocket.h b/kdecore/network/ktcpsocket.h
index e038c64..3f768ee 100644
--- a/kdecore/network/ktcpsocket.h
+++ b/kdecore/network/ktcpsocket.h
@@ -237,6 +237,10 @@ QSslError::NoSslSupport                             Never 
happens :)
 protected:
     virtual qint64 readData (char *data, qint64 maxSize);
     virtual qint64 writeData (const char *data, qint64 maxSize);
+signals:
+    /// @since 4.8.1
+    /// Forwarded from QSslSocket
+    void encryptedBytesWritten( qint64 written );
 public:
     //from QAbstractSocket
     void abort();

-----------------------------------------