X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoretransfer.cpp;h=38b693b3e313e7c3445ce425f043584c555adb5f;hp=34443a048f2e9dad158b2557cd3762f07c07a9e0;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=3e63cb8a6e83765069a45101b86ae9e21dcc57ad diff --git a/src/core/coretransfer.cpp b/src/core/coretransfer.cpp index 34443a04..38b693b3 100644 --- a/src/core/coretransfer.cpp +++ b/src/core/coretransfer.cpp @@ -29,7 +29,7 @@ const qint64 chunkSize = 16 * 1024; CoreTransfer::CoreTransfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent) : Transfer(direction, nick, fileName, address, port, fileSize, parent), - _socket(0), + _socket(nullptr), _pos(0), _reading(false) { @@ -48,7 +48,7 @@ void CoreTransfer::cleanUp() if (_socket) { _socket->close(); _socket->deleteLater(); - _socket = 0; + _socket = nullptr; } _buffer.clear(); @@ -122,10 +122,10 @@ void CoreTransfer::setupConnectionForReceive() setStatus(Status::Connecting); _socket = new QTcpSocket(this); - connect(_socket, SIGNAL(connected()), SLOT(startReceiving())); - connect(_socket, SIGNAL(disconnected()), SLOT(onSocketDisconnected())); + connect(_socket, &QAbstractSocket::connected, this, &CoreTransfer::startReceiving); + connect(_socket, &QAbstractSocket::disconnected, this, &CoreTransfer::onSocketDisconnected); connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError))); - connect(_socket, SIGNAL(readyRead()), SLOT(onDataReceived())); + connect(_socket, &QIODevice::readyRead, this, &CoreTransfer::onDataReceived); _socket->connectToHost(address(), port()); }