summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@qt.io>2020-04-18 17:14:07 +0200
committerMaurice Kalinowski <maurice.kalinowski@qt.io>2020-04-18 18:13:16 +0200
commit6e48bcfd40e9a8a2f6c870e5468ad04de2436506 (patch)
tree701fbe6b8e2ae1b17199a73fa9843e64a9936116
parente672503b2f4ba303617e6e1b5e3119b09d7607b0 (diff)
Fix deprecation warnings
Change-Id: Icf598a98ff6999b3c6e615c4defa90f47e5e02d2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/mqtt/qmqttconnection.cpp3
-rw-r--r--src/mqtt/qmqtttopicname.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mqtt/qmqttconnection.cpp b/src/mqtt/qmqttconnection.cpp
index cd2d74a..3c33d7d 100644
--- a/src/mqtt/qmqttconnection.cpp
+++ b/src/mqtt/qmqttconnection.cpp
@@ -160,8 +160,7 @@ bool QMqttConnection::ensureTransport(bool createSecureIfNeeded)
#endif
connect(socket, &QAbstractSocket::connected, this, &QMqttConnection::transportConnectionEstablished);
connect(socket, &QAbstractSocket::disconnected, this, &QMqttConnection::transportConnectionClosed);
- connect(socket, static_cast<void (QAbstractSocket::*)(QAbstractSocket::SocketError)>(&QAbstractSocket::error),
- this, &QMqttConnection::transportError);
+ connect(socket, &QAbstractSocket::errorOccurred, this, &QMqttConnection::transportError);
connect(m_transport, &QIODevice::aboutToClose, this, &QMqttConnection::transportConnectionClosed);
connect(m_transport, &QIODevice::readyRead, this, &QMqttConnection::transportReadReady);
diff --git a/src/mqtt/qmqtttopicname.cpp b/src/mqtt/qmqtttopicname.cpp
index d414db0..9b9af2b 100644
--- a/src/mqtt/qmqtttopicname.cpp
+++ b/src/mqtt/qmqtttopicname.cpp
@@ -145,7 +145,7 @@ int QMqttTopicName::levelCount() const
*/
QStringList QMqttTopicName::levels() const
{
- return d->name.split(QLatin1Char('/'), QString::KeepEmptyParts);
+ return d->name.split(QLatin1Char('/'), Qt::KeepEmptyParts);
}
/*!