Fixed regressions

psi-im · Mar 16, 2024 · 126cdb5 · 126cdb5
1 parent 8fdf688
commit 126cdb5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -43,13 +43,12 @@ class QTcpSocketSignalRelay : public QObject {
     QTcpSocketSignalRelay(QTcpSocket *sock, QObject *parent = nullptr) : QObject(parent)
     {
         qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
-        connect(sock, SIGNAL(hostFound()), SLOT(sock_hostFound()), Qt::QueuedConnection);
-        connect(sock, SIGNAL(connected()), SLOT(sock_connected()), Qt::QueuedConnection);
-        connect(sock, SIGNAL(disconnected()), SLOT(sock_disconnected()), Qt::QueuedConnection);
-        connect(sock, SIGNAL(readyRead()), SLOT(sock_readyRead()), Qt::QueuedConnection);
-        connect(sock, SIGNAL(bytesWritten(qint64)), SLOT(sock_bytesWritten(qint64)), Qt::QueuedConnection);
-        connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)),
-                Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::hostFound, this, &QTcpSocketSignalRelay::sock_hostFound, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::connected, this, &QTcpSocketSignalRelay::sock_connected, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::disconnected, this, &QTcpSocketSignalRelay::sock_disconnected, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::readyRead, this, &QTcpSocketSignalRelay::sock_readyRead, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::bytesWritten, this, &QTcpSocketSignalRelay::sock_bytesWritten, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::errorOccurred, this, &QTcpSocketSignalRelay::sock_error, Qt::QueuedConnection);
     }
 
 signals:

diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -195,9 +195,8 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         if (!QRegExp(p1, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(p2))
 #else
-        if (!QRegularExpression::fromWildcard(QLatin1Char('^') + p1 + QLatin1Char('$'), Qt::CaseSensitive)
-                 .match(p2)
-                 .hasMatch())
+        // note, wildcards a by default anchored. so exact match
+        if (!QRegularExpression::fromWildcard(p1, Qt::CaseSensitive).match(p2).hasMatch())
 #endif
             return false;
     }