X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fauthhandler.cpp;h=eb8a00c92eaac7d43f7ce98bf7aebf15f05f3949;hp=f1dc292076e810dca8d1dbe3d6ea0c0b03a0fb75;hb=95848fd9232d92f388e0e533adb15f6ba9d2d492;hpb=fcacaaf16551524c7ebb6114254d005274cc3d63 diff --git a/src/common/authhandler.cpp b/src/common/authhandler.cpp index f1dc2920..eb8a00c9 100644 --- a/src/common/authhandler.cpp +++ b/src/common/authhandler.cpp @@ -18,31 +18,28 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include - #include "authhandler.h" -AuthHandler::AuthHandler(QObject *parent) - : QObject(parent) -{ +#include -} +#include "util.h" +AuthHandler::AuthHandler(QObject* parent) + : QObject(parent) +{} -QTcpSocket *AuthHandler::socket() const +QTcpSocket* AuthHandler::socket() const { return _socket; } - -void AuthHandler::setSocket(QTcpSocket *socket) +void AuthHandler::setSocket(QTcpSocket* socket) { _socket = socket; - connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError))); + connect(socket, selectOverload(&QTcpSocket::error), this, &AuthHandler::onSocketError); connect(socket, &QAbstractSocket::disconnected, this, &AuthHandler::onSocketDisconnected); } - bool AuthHandler::isLocal() const { if (socket()) { @@ -52,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) @@ -67,7 +63,6 @@ void AuthHandler::onSocketError(QAbstractSocket::SocketError error) } } - void AuthHandler::onSocketDisconnected() { if (!_disconnectedSent) { @@ -76,13 +71,11 @@ void AuthHandler::onSocketDisconnected() } } - void AuthHandler::invalidMessage() { qWarning() << Q_FUNC_INFO << "No handler for message!"; } - void AuthHandler::close() { if (_socket && _socket->isOpen())