X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoretransfer.cpp;h=e178cdab05d887ccaf3625bd221521435536d1da;hp=ea07b3746baf567b9b6fee2ac82ea2418863b0a6;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=dd711790dddee81442e2138b3917764dac39c487

diff --git a/src/core/coretransfer.cpp b/src/core/coretransfer.cpp
index ea07b374..e178cdab 100644
--- a/src/core/coretransfer.cpp
+++ b/src/core/coretransfer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,14 +24,13 @@
 #include <QTcpSocket>
 
 #include "coretransfer.h"
+#include "util.h"
 
 const qint64 chunkSize = 16 * 1024;
 
-INIT_SYNCABLE_OBJECT(CoreTransfer)
-
 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)
 {
@@ -50,7 +49,7 @@ void CoreTransfer::cleanUp()
     if (_socket) {
         _socket->close();
         _socket->deleteLater();
-        _socket = 0;
+        _socket = nullptr;
     }
 
     _buffer.clear();
@@ -124,10 +123,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, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError)));
-    connect(_socket, SIGNAL(readyRead()), SLOT(onDataReceived()));
+    connect(_socket, &QAbstractSocket::connected, this, &CoreTransfer::startReceiving);
+    connect(_socket, &QAbstractSocket::disconnected, this, &CoreTransfer::onSocketDisconnected);
+    connect(_socket, selectOverload<QAbstractSocket::SocketError>(&QAbstractSocket::error), this, &CoreTransfer::onSocketError);
+    connect(_socket, &QIODevice::readyRead, this, &CoreTransfer::onDataReceived);
 
     _socket->connectToHost(address(), port());
 }