From 9f479b8f76238a03bce5d13aee14efd34e659c6e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sun, 30 Oct 2022 20:34:23 +0100
Subject: Clean up and modernize code

- static "new-style" signal->slot connections
- Fix a lot of things Clang-Tidy complained about
- Move includes to .cpp files and use forward decls in .h
- Don't use <QtWidgets> and <QtCore>, but specific includes instead
---
 src/server/net/sslserver.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/server/net/sslserver.cpp')

diff --git a/src/server/net/sslserver.cpp b/src/server/net/sslserver.cpp
index b2da034..2dfa84c 100644
--- a/src/server/net/sslserver.cpp
+++ b/src/server/net/sslserver.cpp
@@ -21,7 +21,9 @@
 #include "certmanager.h"
 #include <unistd.h>
 
-SslServer::SslServer() : QTcpServer(nullptr), _timer(new QTimer(this))
+SslServer::SslServer(QObject *parent)
+		: QTcpServer(parent)
+		, _timer(new QTimer(this))
 {
 	connect(_timer, &QTimer::timeout, [=]() {
 		if (_pending.empty())
@@ -43,9 +45,11 @@ SslServer::SslServer() : QTcpServer(nullptr), _timer(new QTimer(this))
 SslServer::~SslServer()
 {
 	_timer->stop();
-	for (QSslSocket *sock : _pending.keys()) {
+	auto keys = _pending.keys();
+	for (QSslSocket *sock : keys) {
 		sock->deleteLater();
 	}
+	_pending.clear();
 }
 
 /**
@@ -64,7 +68,7 @@ void SslServer::incomingConnection(qintptr socketDescriptor)
 		::close(int(socketDescriptor));
 		return;
 	}
-	QSslSocket *serverSocket = new QSslSocket(nullptr);
+	auto *serverSocket = new QSslSocket(nullptr);
 	connect(serverSocket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &SslServer::sslErrors);
 	serverSocket->setPrivateKey(key);
 	serverSocket->setLocalCertificate(cert);
@@ -93,8 +97,8 @@ void SslServer::incomingConnection(qintptr socketDescriptor)
 void SslServer::sslErrors(const QList<QSslError>& errors)
 {
 	qDebug() << "Client caused sslErrors before connection:";
-	for (QList<QSslError>::const_iterator it = errors.begin(); it != errors.end(); it++) {
-		qDebug() << it->errorString();
+	for (const auto & error : errors) {
+		qDebug() << error.errorString();
 	}
 
 }
-- 
cgit v1.2.3-55-g7522