X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsslserver.cpp;h=f7d35c3447df70f49d5f871fc7f80e6a3c848638;hb=145a52eb79fed146731f85c23b60f0609e40e785;hp=92ac6fe7153b96e372b42fc8b8195353bea663cd;hpb=a95ad2de573027f9bee36db972bcae4195168d0c;p=quassel.git

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 92ac6fe7..f7d35c34 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -20,17 +20,12 @@
 
 #include "sslserver.h"
 
-#ifdef HAVE_SSL
-#    include <QSslSocket>
-#endif
-
 #include <QDateTime>
+#include <QSslSocket>
 
 #include "core.h"
 #include "quassel.h"
 
-#ifdef HAVE_SSL
-
 SslServer::SslServer(QObject* parent)
     : QTcpServer(parent)
 {
@@ -62,28 +57,19 @@ SslServer::SslServer(QObject* parent)
     }
 }
 
-QTcpSocket* SslServer::nextPendingConnection()
-{
-    if (_pendingConnections.isEmpty())
-        return nullptr;
-    else
-        return _pendingConnections.takeFirst();
-}
-
 void SslServer::incomingConnection(qintptr socketDescriptor)
 {
-    auto* serverSocket = new QSslSocket(this);
-    if (serverSocket->setSocketDescriptor(socketDescriptor)) {
+    auto* socket = new QSslSocket(this);
+    if (socket->setSocketDescriptor(socketDescriptor)) {
         if (isCertValid()) {
-            serverSocket->setLocalCertificate(_cert);
-            serverSocket->setPrivateKey(_key);
-            serverSocket->addCaCertificates(_ca);
+            socket->setLocalCertificate(_cert);
+            socket->setPrivateKey(_key);
+            socket->addCaCertificates(_ca);
         }
-        _pendingConnections << serverSocket;
-        emit newConnection();
+        addPendingConnection(socket);
     }
     else {
-        delete serverSocket;
+        delete socket;
     }
 }
 
@@ -235,5 +221,3 @@ void SslServer::setMetricsServer(MetricsServer* metricsServer) {
         _metricsServer->setCertificateExpires(_certificateExpires);
     }
 }
-
-#endif  // HAVE_SSL