qt6: Fix signal connection for new services code.

MythTV · Dec 8, 2021 · 7b099ff · 7b099ff
1 parent 735d649
commit 7b099ff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/mythtv/libs/libmythbase/http/mythhttps.cpp b/mythtv/libs/libmythbase/http/mythhttps.cpp
@@ -134,7 +134,7 @@ void MythHTTPS::InitSSLSocket(QSslSocket *Socket, QSslConfiguration& Config)
     };
 
     QObject::connect(Socket, &QSslSocket::encrypted, std::bind(Encrypted, Socket));
-    QObject::connect(Socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), SSLErrors);
+    QObject::connect(Socket, qOverload<const QList<QSslError> &>(&QSslSocket::sslErrors), SSLErrors);
     Socket->setSslConfiguration(Config);
     Socket->startServerEncryption();
 }

diff --git a/mythtv/libs/libmythbase/http/mythhttpsocket.cpp b/mythtv/libs/libmythbase/http/mythhttpsocket.cpp
@@ -57,8 +57,12 @@ MythHTTPSocket::MythHTTPSocket(qintptr Socket, bool SSL, const MythHTTPConfig& C
     connect(m_socket, &QTcpSocket::bytesWritten, this, &MythHTTPSocket::Write);
     connect(m_socket, &QTcpSocket::disconnected, this, &MythHTTPSocket::Disconnected);
     connect(m_socket, &QTcpSocket::disconnected, QThread::currentThread(), &QThread::quit);
-    connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
+    connect(m_socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error),
                                                  this, &MythHTTPSocket::Error);
+#else
+    connect(m_socket, &QTcpSocket::errorOccurred, this, &MythHTTPSocket::Error);
+#endif
     m_socket->setSocketDescriptor(m_socketFD);
 
 #ifndef QT_NO_OPENSSL

diff --git a/mythtv/libs/libmythtv/mythplayeroverlayui.cpp b/mythtv/libs/libmythtv/mythplayeroverlayui.cpp
@@ -18,7 +18,7 @@ MythPlayerOverlayUI::MythPlayerOverlayUI(MythMainWindow* MainWindow, TV* Tv, Pla
     m_positionUpdateTimer.setInterval(999ms);
     connect(&m_positionUpdateTimer, &QTimer::timeout, this, &MythPlayerOverlayUI::UpdateOSDPosition);
     connect(this, &MythPlayerOverlayUI::OverlayStateChanged, m_tv, &TV::OverlayStateChanged);
-    connect(m_tv, &TV::ChangeOSDMessage, this, QOverload<const QString&>::of(&MythPlayerOverlayUI::UpdateOSDMessage));
+    connect(m_tv, &TV::ChangeOSDMessage, this, qOverload<const QString&>(&MythPlayerOverlayUI::UpdateOSDMessage));
 
     // Signalled directly from TV to OSD
     connect(m_tv, &TV::DialogQuit,    &m_osd, &OSD::DialogQuit);

diff --git a/mythtv/libs/libmythtv/mythplayervideoui.cpp b/mythtv/libs/libmythtv/mythplayervideoui.cpp
@@ -68,7 +68,7 @@ bool MythPlayerVideoUI::InitVideo()
     connect(video, &MythVideoOutputGPU::PictureAttributesUpdated,
                                                   this, &MythPlayerVideoUI::PictureAttributesUpdated);
     connect(video, &MythVideoBounds::UpdateOSDMessage,
-                                                  this, QOverload<const QString&>::of(&MythPlayerVideoUI::UpdateOSDMessage));
+                                                  this, qOverload<const QString&>(&MythPlayerVideoUI::UpdateOSDMessage));
     connect(video, &MythVideoBounds::VideoBoundsStateChanged,
                                                   m_tv, &TV::VideoBoundsStateChanged);
     connect(m_tv,  &TV::ChangeOSDPositionUpdates, this,  &MythPlayerVideoUI::ChangeOSDPositionUpdates);