QDtls - use conventional names

More Qt-style and more natural, also, shorter names.

Change-Id: I97bd68a8614126d518a3853027661435dc4e080d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

2 files changed, 10 insertions, 10 deletions

diff --git a/src/network/ssl/qdtls.cpp b/src/network/ssl/qdtls.cpp
index 58158036ca..cdb600538f 100644
--- a/src/network/ssl/qdtls.cpp
+++ b/src/network/ssl/qdtls.cpp
@@ -420,7 +420,7 @@ bool QDtls::continueHandshake(QUdpSocket *socket, const QByteArray &datagram)
     return d->continueHandshake(socket, datagram);
 }
 
-bool QDtls::resumeHandshakeAfterError(QUdpSocket *socket)
+bool QDtls::resumeHandshake(QUdpSocket *socket)
 {
     Q_D(QDtls);
 
@@ -438,7 +438,7 @@ bool QDtls::resumeHandshakeAfterError(QUdpSocket *socket)
     return d->resumeHandshake(socket);
 }
 
-bool QDtls::abortHandshakeAfterError(QUdpSocket *socket)
+bool QDtls::abortHandshake(QUdpSocket *socket)
 {
     Q_D(QDtls);
 
@@ -457,7 +457,7 @@ bool QDtls::abortHandshakeAfterError(QUdpSocket *socket)
     return true;
 }
 
-bool QDtls::sendShutdownAlert(QUdpSocket *socket)
+bool QDtls::shutdown(QUdpSocket *socket)
 {
     Q_D(QDtls);
 
@@ -477,7 +477,7 @@ bool QDtls::sendShutdownAlert(QUdpSocket *socket)
     return true;
 }
 
-bool QDtls::connectionEncrypted() const
+bool QDtls::isConnectionEncrypted() const
 {
     Q_D(const QDtls);
 
@@ -507,7 +507,7 @@ qint64 QDtls::writeDatagramEncrypted(QUdpSocket *socket, const QByteArray &dgram
         return -1;
     }
 
-    if (!connectionEncrypted()) {
+    if (!isConnectionEncrypted()) {
         d->setDtlsError(QDtlsError::InvalidOperation,
                         tr("Cannot write a datagram, not in encrypted state"));
         return -1;
@@ -525,7 +525,7 @@ QByteArray QDtls::decryptDatagram(QUdpSocket *socket, const QByteArray &dgram)
         return {};
     }
 
-    if (!connectionEncrypted()) {
+    if (!isConnectionEncrypted()) {
         d->setDtlsError(QDtlsError::InvalidOperation,
                         tr("Cannot read a datagram, not in encrypted state"));
         return {};
diff --git a/src/network/ssl/qdtls.h b/src/network/ssl/qdtls.h
index 7df92f31a7..88c10c8309 100644
--- a/src/network/ssl/qdtls.h
+++ b/src/network/ssl/qdtls.h
@@ -151,11 +151,11 @@ public:
 
     bool doHandshake(QUdpSocket *socket, const QByteArray &dgram = {});
     bool handleTimeout(QUdpSocket *socket);
-    bool resumeHandshakeAfterError(QUdpSocket *socket);
-    bool abortHandshakeAfterError(QUdpSocket *socket);
-    bool sendShutdownAlert(QUdpSocket *socket);
+    bool resumeHandshake(QUdpSocket *socket);
+    bool abortHandshake(QUdpSocket *socket);
+    bool shutdown(QUdpSocket *socket);
 
-    bool connectionEncrypted() const;
+    bool isConnectionEncrypted() const;
     QSslCipher sessionCipher() const;
     QSsl::SslProtocol sessionProtocol() const;