From 2a5ccd3bd191b75b9fa148a8fa7f3d3ddc225add Mon Sep 17 00:00:00 2001
From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
Date: Sun, 3 Sep 2017 22:00:29 +0200
Subject: Drop support for Qt 4

---
 src/server/QXmppOutgoingServer.cpp | 6 ------
 src/server/QXmppServer.cpp         | 4 ----
 src/server/QXmppServer.h           | 4 ----
 3 files changed, 14 deletions(-)

(limited to 'src/server')

diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp
index 3855da4d..2da1628a 100644
--- a/src/server/QXmppOutgoingServer.cpp
+++ b/src/server/QXmppOutgoingServer.cpp
@@ -25,11 +25,7 @@
 #include <QSslKey>
 #include <QSslSocket>
 #include <QTimer>
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 #include <QDnsLookup>
-#else
-#include "qdnslookup.h"
-#endif
 
 #include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
@@ -137,10 +133,8 @@ void QXmppOutgoingServer::_q_dnsLookupFinished()
         port = 5269;
     }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0))
     // set the name the SSL certificate should match
     socket()->setPeerVerifyName(d->remoteDomain);
-#endif
 
     // connect to server
     info(QString("Connecting to %1:%2").arg(host, QString::number(port)));
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 13be2169..53b6ba83 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -891,11 +891,7 @@ QXmppSslServer::~QXmppSslServer()
     delete d;
 }
 
-#if QT_VERSION < 0x050000
 void QXmppSslServer::incomingConnection(int socketDescriptor)
-#else
-void QXmppSslServer::incomingConnection(qintptr socketDescriptor)
-#endif
 {
     QSslSocket *socket = new QSslSocket;
     if (!socket->setSocketDescriptor(socketDescriptor)) {
diff --git a/src/server/QXmppServer.h b/src/server/QXmppServer.h
index f6866f92..2734105d 100644
--- a/src/server/QXmppServer.h
+++ b/src/server/QXmppServer.h
@@ -143,11 +143,7 @@ signals:
     void newConnection(QSslSocket *socket);
 
 private:
-    #if QT_VERSION < 0x050000
     void incomingConnection(int socketDescriptor);
-    #else
-    void incomingConnection(qintptr socketDescriptor);
-    #endif
     QXmppSslServerPrivate * const d;
 };
 
-- 
cgit v1.2.3