X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fauthhandler.cpp;h=9e7b5e76c65081d7df61a621da9401f798325446;hp=7c2905dddc6bd166c4480aead8d04f73cfd7b412;hb=c0d6dc0dec628f2e143e37ecc95cec45e636f8a5;hpb=ba5a098f200be1968d198b1325c45b943c797a3b

diff --git a/src/common/authhandler.cpp b/src/common/authhandler.cpp
index 7c2905dd..9e7b5e76 100644
--- a/src/common/authhandler.cpp
+++ b/src/common/authhandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,33 +18,28 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QHostAddress>
-
 #include "authhandler.h"
 
-AuthHandler::AuthHandler(QObject *parent)
-    : QObject(parent),
-    _socket(0),
-    _disconnectedSent(false)
-{
+#include <QHostAddress>
 
-}
+#include "util.h"
 
+AuthHandler::AuthHandler(QObject* parent)
+    : QObject(parent)
+{}
 
-QTcpSocket *AuthHandler::socket() const
+QSslSocket* AuthHandler::socket() const
 {
     return _socket;
 }
 
-
-void AuthHandler::setSocket(QTcpSocket *socket)
+void AuthHandler::setSocket(QSslSocket* socket)
 {
     _socket = socket;
-    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError)));
-    connect(socket, SIGNAL(disconnected()), SLOT(onSocketDisconnected()));
+    connect(socket, selectOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), this, &AuthHandler::onSocketError);
+    connect(socket, &QAbstractSocket::disconnected, this, &AuthHandler::onSocketDisconnected);
 }
 
-
 bool AuthHandler::isLocal() const
 {
     if (socket()) {
@@ -54,7 +49,6 @@ bool AuthHandler::isLocal() const
     return false;
 }
 
-
 // Some errors (e.g. connection refused) don't trigger a disconnected() from the socket, so send this explicitly
 // (but make sure it's only sent once!)
 void AuthHandler::onSocketError(QAbstractSocket::SocketError error)
@@ -69,7 +63,6 @@ void AuthHandler::onSocketError(QAbstractSocket::SocketError error)
     }
 }
 
-
 void AuthHandler::onSocketDisconnected()
 {
     if (!_disconnectedSent) {
@@ -78,13 +71,11 @@ void AuthHandler::onSocketDisconnected()
     }
 }
 
-
 void AuthHandler::invalidMessage()
 {
     qWarning() << Q_FUNC_INFO << "No handler for message!";
 }
 
-
 void AuthHandler::close()
 {
     if (_socket && _socket->isOpen())