summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2018-07-26 10:36:48 +0200
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2018-07-26 15:13:57 +0000
commit056fbf03a54b2e3ee20f8d677649e407e50cc018 (patch)
treef762537cca6a2a56be614c28b8b80420c143deb4 /src/network
parenteed8141a7ce5c983840aeb74d711fb8a1388d91a (diff)
QDtls - refactor
This patch renames rather awkward 'remote' into more conventional 'peer' (similar to what we have in QAbstractSocket). Change-Id: Ifc45e538b8adf9cc076bd7aee693277829fd94dc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/ssl/qdtls.cpp12
-rw-r--r--src/network/ssl/qdtls.h8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/network/ssl/qdtls.cpp b/src/network/ssl/qdtls.cpp
index 0b31da3d74..58158036ca 100644
--- a/src/network/ssl/qdtls.cpp
+++ b/src/network/ssl/qdtls.cpp
@@ -208,14 +208,14 @@ QDtls::QDtls(QSslSocket::SslMode mode, QObject *parent)
setDtlsConfiguration(QSslConfiguration::defaultDtlsConfiguration());
}
-bool QDtls::setRemote(const QHostAddress &address, quint16 port,
- const QString &verificationName)
+bool QDtls::setPeer(const QHostAddress &address, quint16 port,
+ const QString &verificationName)
{
Q_D(QDtls);
if (d->handshakeState != HandshakeNotStarted) {
d->setDtlsError(QDtlsError::InvalidOperation,
- tr("Cannot set remote after handshake started"));
+ tr("Cannot set peer after handshake started"));
return false;
}
@@ -256,14 +256,14 @@ bool QDtls::setPeerVerificationName(const QString &name)
return true;
}
-QHostAddress QDtls::remoteAddress() const
+QHostAddress QDtls::peerAddress() const
{
Q_D(const QDtls);
return d->remoteAddress;
}
-quint16 QDtls::remotePort() const
+quint16 QDtls::peerPort() const
{
Q_D(const QDtlsBase);
@@ -370,7 +370,7 @@ bool QDtls::startHandshake(QUdpSocket *socket, const QByteArray &datagram)
if (d->remoteAddress.isNull()) {
d->setDtlsError(QDtlsError::InvalidOperation,
- tr("To start a handshake you must set remote address and port first"));
+ tr("To start a handshake you must set peer's address and port first"));
return false;
}
diff --git a/src/network/ssl/qdtls.h b/src/network/ssl/qdtls.h
index 34362e6f13..7df92f31a7 100644
--- a/src/network/ssl/qdtls.h
+++ b/src/network/ssl/qdtls.h
@@ -129,11 +129,11 @@ public:
explicit QDtls(QSslSocket::SslMode mode, QObject *parent = nullptr);
- bool setRemote(const QHostAddress &address, quint16 port,
- const QString &verificationName = {});
+ bool setPeer(const QHostAddress &address, quint16 port,
+ const QString &verificationName = {});
bool setPeerVerificationName(const QString &name);
- QHostAddress remoteAddress() const;
- quint16 remotePort() const;
+ QHostAddress peerAddress() const;
+ quint16 peerPort() const;
QString peerVerificationName() const;
QSslSocket::SslMode sslMode() const;