Qt6: Fix build with latest dev branch

Change-Id: Ic214e72b2c7b915dcc4c69af36c34044fb103e87
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

14 files changed, 17 insertions, 26 deletions

diff --git a/examples/knx/device/mainwindow.cpp b/examples/knx/device/mainwindow.cpp
index d5dd1cf..e0977a4 100644
--- a/examples/knx/device/mainwindow.cpp
+++ b/examples/knx/device/mainwindow.cpp
@@ -312,7 +312,7 @@ void MainWindow::setupInterfaces()
     }
     ui->interfaces->setCurrentIndex(bool(ui->interfaces->count()));
 
-    connect(ui->interfaces, &QComboBox::currentIndexChanged, this, [&](int i, const QString &) {
+    connect(ui->interfaces, &QComboBox::currentIndexChanged, this, [&](int i) {
         if (i < 0)
             return;
         m_discoveryAgent.stop();
diff --git a/examples/knx/feature/mainwindow.cpp b/examples/knx/feature/mainwindow.cpp
index 97265a9..3fb2c33 100644
--- a/examples/knx/feature/mainwindow.cpp
+++ b/examples/knx/feature/mainwindow.cpp
@@ -281,7 +281,7 @@ void MainWindow::setupInterfaces()
     }
     ui->interfaces->setCurrentIndex(bool(ui->interfaces->count()));
 
-    connect(ui->interfaces, &QComboBox::currentIndexChanged, this, [&](int i, const QString &) {
+    connect(ui->interfaces, &QComboBox::currentIndexChanged, this, [&](int i) {
         if (i < 0)
             return;
         m_discoveryAgent.stop();
diff --git a/examples/knx/group/mainwindow.cpp b/examples/knx/group/mainwindow.cpp
index 2ba3300..df2c0f0 100644
--- a/examples/knx/group/mainwindow.cpp
+++ b/examples/knx/group/mainwindow.cpp
@@ -289,7 +289,7 @@ void MainWindow::setupInterfaces()
     }
     ui->interfaces->setCurrentIndex(bool(ui->interfaces->count()));
 
-    connect(ui->interfaces, &QComboBox::currentIndexChanged, this, [&](int i, const QString &) {
+    connect(ui->interfaces, &QComboBox::currentIndexChanged, this, [&](int i) {
         if (i < 0)
             return;
         m_discoveryAgent.stop();
diff --git a/examples/knx/knxeditor/tunneling.cpp b/examples/knx/knxeditor/tunneling.cpp
index ae245ec..604fe60 100644
--- a/examples/knx/knxeditor/tunneling.cpp
+++ b/examples/knx/knxeditor/tunneling.cpp
@@ -187,9 +187,7 @@ Tunneling::Tunneling(QWidget* parent)
             QString(delimiter)));
         updateExtendedControlField();
     });
-    using overload = void (QSpinBox::*)(int);
-    connect(ui->hopCount, static_cast<overload>(&QSpinBox::valueChanged), this,
-        &Tunneling::updateExtendedControlField);
+    connect(ui->hopCount, &QSpinBox::valueChanged, this, &Tunneling::updateExtendedControlField);
     connect(ui->extFrameFormat, &QComboBox::currentTextChanged, this,
         &Tunneling::updateExtendedControlField);
 
@@ -374,7 +372,7 @@ void Tunneling::setupApciTpciComboBox()
 
     regexp = QRegularExpression("(?=[A-Z])");
     for (auto i = 0; i < typeEnum.keyCount() - 1; ++i) {
-        auto string = QString::fromLatin1(typeEnum.key(i)).split(regexp, QString::SkipEmptyParts);
+        auto string = QString::fromLatin1(typeEnum.key(i)).split(regexp, Qt::SkipEmptyParts);
         ui->tpci->addItem("T_" + string.join(QLatin1Char('_')), typeEnum.value(i));
     }
 }
diff --git a/src/knx/core/qknxbytearray.cpp b/src/knx/core/qknxbytearray.cpp
index bfec17d..5b2d3d9 100644
--- a/src/knx/core/qknxbytearray.cpp
+++ b/src/knx/core/qknxbytearray.cpp
@@ -927,7 +927,7 @@ QDebug operator<<(QDebug debug, const QKnxByteArray &byteArray)
 
     Returns the hash value for the \a key, using \a seed to seed the calculation.
 */
-uint qHash(const QKnxByteArray &ba, uint seed) Q_DECL_NOTHROW
+size_t qHash(const QKnxByteArray &ba, uint seed) Q_DECL_NOTHROW
 {
     return qHash(ba.toByteArray(), seed);
 }
diff --git a/src/knx/core/qknxbytearray.h b/src/knx/core/qknxbytearray.h
index b48b9c5..10fa00b 100644
--- a/src/knx/core/qknxbytearray.h
+++ b/src/knx/core/qknxbytearray.h
@@ -222,7 +222,7 @@ inline const QKnxByteArray operator+(quint8 ch, const QKnxByteArray &ba)
 }
 
 Q_KNX_EXPORT QDebug operator<<(QDebug debug, const QKnxByteArray &);
-Q_KNX_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QKnxByteArray &ba, uint seed = 0) Q_DECL_NOTHROW;
+Q_KNX_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(const QKnxByteArray &ba, uint seed = 0) Q_DECL_NOTHROW;
 
 QT_END_NAMESPACE
 
diff --git a/src/knx/dpt/qknxdatapointtype.h b/src/knx/dpt/qknxdatapointtype.h
index 32318f6..2401799 100644
--- a/src/knx/dpt/qknxdatapointtype.h
+++ b/src/knx/dpt/qknxdatapointtype.h
@@ -258,7 +258,7 @@ public:
 };
 Q_KNX_EXPORT QDebug operator<<(QDebug debug, const QKnxDatapointType &dpt);
 
-inline uint qHash(const QKnxDatapointType::Type &key, uint seed)
+inline size_t qHash(const QKnxDatapointType::Type &key, uint seed)
 {
     return qHash(quint32(key), seed);
 }
diff --git a/src/knx/netip/qknxnetipendpointconnection.cpp b/src/knx/netip/qknxnetipendpointconnection.cpp
index dfc6501..1379366 100644
--- a/src/knx/netip/qknxnetipendpointconnection.cpp
+++ b/src/knx/netip/qknxnetipendpointconnection.cpp
@@ -605,7 +605,7 @@ bool QKnxNetIpEndpointConnectionPrivate::initConnection(const QHostAddress &a, q
     }
 
     if (socket) {
-        QObject::connect(socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
+        QObject::connect(socket, &QAbstractSocket::errorOccurred,
             q, [socket, this](QAbstractSocket::SocketError) {
                 setAndEmitErrorOccurred(QKnxNetIpEndpointConnection::Error::Network,
                     socket->errorString());
diff --git a/src/knx/netip/qknxnetiprouter_p.cpp b/src/knx/netip/qknxnetiprouter_p.cpp
index 61b588a..7ea7924 100644
--- a/src/knx/netip/qknxnetiprouter_p.cpp
+++ b/src/knx/netip/qknxnetiprouter_p.cpp
@@ -214,9 +214,7 @@ void QKnxNetIpRouterPrivate::start()
     });
 
     // handle UDP socket errors
-    using overload = void (QUdpSocket::*)(QUdpSocket::SocketError);
-    QObject::connect(m_socket,
-        static_cast<overload>(&QUdpSocket::error), [&](QUdpSocket::SocketError) {
+    QObject::connect(m_socket, &QUdpSocket::errorOccurred, [&](QUdpSocket::SocketError) {
         errorOccurred(QKnxNetIpRouter::Error::Network,
             m_socket->errorString());
     });
diff --git a/src/knx/netip/qknxnetipserverdescriptionagent.cpp b/src/knx/netip/qknxnetipserverdescriptionagent.cpp
index 596cbbb..744e32a 100644
--- a/src/knx/netip/qknxnetipserverdescriptionagent.cpp
+++ b/src/knx/netip/qknxnetipserverdescriptionagent.cpp
@@ -185,9 +185,7 @@ void QKnxNetIpServerDescriptionAgentPrivate::setupSocket()
         }
     });
 
-    using overload = void (QUdpSocket::*)(QUdpSocket::SocketError);
-    QObject::connect(socket,
-        static_cast<overload>(&QUdpSocket::error), [&](QUdpSocket::SocketError) {
+    QObject::connect(socket, &QUdpSocket::errorOccurred, [&](QUdpSocket::SocketError) {
             setAndEmitErrorOccurred(QKnxNetIpServerDescriptionAgent::Error::Network,
                 socket->errorString());
 
diff --git a/src/knx/netip/qknxnetipserverdiscoveryagent_p.cpp b/src/knx/netip/qknxnetipserverdiscoveryagent_p.cpp
index 44e7bb5..d22a029 100644
--- a/src/knx/netip/qknxnetipserverdiscoveryagent_p.cpp
+++ b/src/knx/netip/qknxnetipserverdiscoveryagent_p.cpp
@@ -114,8 +114,7 @@ void Discoverer::start()
 
     m_socket = new QUdpSocket;
     connect(m_socket, &QUdpSocket::readyRead, this, &Discoverer::onReadyRead);
-    using overload = void (QUdpSocket::*)(QUdpSocket::SocketError);
-    connect(m_socket, static_cast<overload>(&QUdpSocket::error), this, &Discoverer::onError);
+    connect(m_socket, &QUdpSocket::errorOccurred, this, &Discoverer::onError);
 
     bool bound = m_socket->bind(m_config.Multicast ? QHostAddress::AnyIPv4
                                                    : m_address,
@@ -377,9 +376,7 @@ void QKnxNetIpServerDiscoveryAgentPrivate::setupSocket()
         }
     });
 
-    using overload = void (QUdpSocket::*)(QUdpSocket::SocketError);
-    QObject::connect(socket,
-        static_cast<overload>(&QUdpSocket::error), q, [&](QUdpSocket::SocketError) {
+    QObject::connect(socket, &QUdpSocket::errorOccurred, q, [&](QUdpSocket::SocketError) {
             setAndEmitErrorOccurred(QKnxNetIpServerDiscoveryAgent::Error::Network,
                 socket->errorString());
 
diff --git a/src/knx/qknxaddress.cpp b/src/knx/qknxaddress.cpp
index 439847e..f1b12e8 100644
--- a/src/knx/qknxaddress.cpp
+++ b/src/knx/qknxaddress.cpp
@@ -475,7 +475,7 @@ QKnxAddress::QKnxAddress(QKnxAddress::Type type, quint16 sec1, quint16 *sec2, qu
     }
 }
 
-uint qHash(const QKnxAddress &key, uint seed) Q_DECL_NOTHROW
+size_t qHash(const QKnxAddress &key, uint seed) Q_DECL_NOTHROW
 {
     return qHash(key.bytes(), seed);
 }
diff --git a/src/knx/qknxaddress.h b/src/knx/qknxaddress.h
index d278aa4..998a0ea 100644
--- a/src/knx/qknxaddress.h
+++ b/src/knx/qknxaddress.h
@@ -97,7 +97,7 @@ private:
     QKnxAddress::Type m_type = static_cast<QKnxAddress::Type>(0xff);
 };
 Q_KNX_EXPORT QDebug operator<<(QDebug debug, const QKnxAddress &address);
-Q_KNX_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QKnxAddress &key, uint seed = 0) Q_DECL_NOTHROW;
+Q_KNX_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(const QKnxAddress &key, uint seed = 0) Q_DECL_NOTHROW;
 
 Q_DECLARE_TYPEINFO(QKnxAddress::Type, Q_PRIMITIVE_TYPE);
 Q_DECLARE_TYPEINFO(QKnxAddress::Notation, Q_PRIMITIVE_TYPE);
diff --git a/src/knx/ssl/qsslsocket_openssl_symbols.cpp b/src/knx/ssl/qsslsocket_openssl_symbols.cpp
index 73caed3..7598abe 100644
--- a/src/knx/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/knx/ssl/qsslsocket_openssl_symbols.cpp
@@ -662,7 +662,7 @@ static QStringList libraryPathList()
     QStringList paths;
 #  ifdef Q_OS_DARWIN
     paths = QString::fromLatin1(qgetenv("DYLD_LIBRARY_PATH"))
-            .split(QLatin1Char(':'), QString::SkipEmptyParts);
+            .split(QLatin1Char(':'), Qt::SkipEmptyParts);
 
     // search in .app/Contents/Frameworks
     UInt32 packageType;
@@ -674,7 +674,7 @@ static QStringList libraryPathList()
     }
 #  else
     paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH"))
-            .split(QLatin1Char(':'), QString::SkipEmptyParts);
+            .split(QLatin1Char(':'), Qt::SkipEmptyParts);
 #  endif
     paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
     paths << QLatin1String("/lib64") << QLatin1String("/usr/lib64") << QLatin1String("/usr/local/lib64");