Remove Qt < 5.15 compat code

4 files changed, 2 insertions, 25 deletions

diff --git a/src/client/QXmppCallStream.cpp b/src/client/QXmppCallStream.cpp
index 868a1df8..042739ee 100644
--- a/src/client/QXmppCallStream.cpp
+++ b/src/client/QXmppCallStream.cpp
@@ -8,13 +8,11 @@
 #include "QXmppCall_p.h"
 #include "QXmppStun.h"
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#include <QRandomGenerator>
-#endif
-
 #include <cstring>
 #include <gst/gst.h>
 
+#include <QRandomGenerator>
+
 /// \cond
 QXmppCallStreamPrivate::QXmppCallStreamPrivate(QXmppCallStream *parent, GstElement *pipeline_,
                                                GstElement *rtpbin_, QString media_, QString creator_,
@@ -34,11 +32,7 @@ QXmppCallStreamPrivate::QXmppCallStreamPrivate(QXmppCallStream *parent, GstEleme
       name(std::move(name_)),
       id(id_)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     localSsrc = QRandomGenerator::global()->generate();
-#else
-    localSsrc = qrand();
-#endif
 
     iceReceiveBin = gst_bin_new(QStringLiteral("receive_%1").arg(id).toLatin1().data());
     iceSendBin = gst_bin_new(QStringLiteral("send_%1").arg(id).toLatin1().data());
diff --git a/src/client/QXmppHttpFileSharingProvider.cpp b/src/client/QXmppHttpFileSharingProvider.cpp
index 5b7304c5..ecd2b4fd 100644
--- a/src/client/QXmppHttpFileSharingProvider.cpp
+++ b/src/client/QXmppHttpFileSharingProvider.cpp
@@ -95,12 +95,7 @@ auto QXmppHttpFileSharingProvider::downloadFile(const std::any &source,
         }
     });
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     QObject::connect(state->reply, &QNetworkReply::readyRead, [state, file = std::move(target)]() {
-#else
-    auto file = std::shared_ptr<QIODevice>(std::move(target));
-    QObject::connect(state->reply, &QNetworkReply::readyRead, [state, file]() {
-#endif
         auto data = state->reply->readAll();
         if (file->write(data) != data.size()) {
             state->error = QXmppError::fromIoDevice(*file);
@@ -113,11 +108,7 @@ auto QXmppHttpFileSharingProvider::downloadFile(const std::any &source,
         }
     });
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     QObject::connect(state->reply, &QNetworkReply::errorOccurred,
-#else
-    QObject::connect(state->reply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error),
-#endif
                      [state](QNetworkReply::NetworkError) {
                          // Qt doc: the finished() signal will "probably" follow
                          // => we can't be sure that finished() is going to be called
diff --git a/src/client/QXmppHttpUploadManager.cpp b/src/client/QXmppHttpUploadManager.cpp
index c5b3fe89..85c1ac90 100644
--- a/src/client/QXmppHttpUploadManager.cpp
+++ b/src/client/QXmppHttpUploadManager.cpp
@@ -339,11 +339,7 @@ std::shared_ptr<QXmppHttpUpload> QXmppHttpUploadManager::uploadFile(std::unique_
                 reply->deleteLater();
             });
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
             connect(reply, &QNetworkReply::errorOccurred, this,
-#else
-            connect(reply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this,
-#endif
                     [upload, reply](QNetworkReply::NetworkError error) {
                         upload->d->reportError({ reply->errorString(), error });
                         upload->d->reportFinished();
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 20e88b9c..046bdcf2 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -176,11 +176,7 @@ QXmppOutgoingClient::QXmppOutgoingClient(QObject *parent)
 
     connect(socket, &QAbstractSocket::disconnected, this, &QXmppOutgoingClient::_q_socketDisconnected);
     connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &QXmppOutgoingClient::socketSslErrors);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     connect(socket, &QSslSocket::errorOccurred, this, &QXmppOutgoingClient::socketError);
-#else
-    connect(socket, QOverload<QAbstractSocket::SocketError>::of(&QSslSocket::error), this, &QXmppOutgoingClient::socketError);
-#endif
 
     // DNS lookups
     connect(&d->dns, &QDnsLookup::finished, this, &QXmppOutgoingClient::_q_dnsLookupFinished);