X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Ftransfer.cpp;h=4d71fc1df6bf66df21b8cf1b2e15d2897b9c4e2e;hp=523d9e320c70d49b73bfb4960e7752e32127f476;hb=e3c42d072b2b8f39c8c9ea44dfc3bded87ae43b0;hpb=100a2678adf2016b7b4753d09d868929de83294e

diff --git a/src/common/transfer.cpp b/src/common/transfer.cpp
index 523d9e32..4d71fc1d 100644
--- a/src/common/transfer.cpp
+++ b/src/common/transfer.cpp
@@ -29,10 +29,10 @@ Transfer::Transfer(const QUuid &uuid, QObject *parent)
     _fileSize(0),
     _uuid(uuid)
 {
-    renameObject(QString("Transfer/%1").arg(_uuid.toString()));
+    init();
 }
 
-Transfer::Transfer(Direction direction, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent)
+Transfer::Transfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent)
     : SyncableObject(parent),
     _state(New),
     _direction(direction),
@@ -40,9 +40,17 @@ Transfer::Transfer(Direction direction, const QString &fileName, const QHostAddr
     _address(address),
     _port(port),
     _fileSize(fileSize),
+    _nick(nick),
     _uuid(QUuid::createUuid())
+{
+    init();
+}
+
+
+void Transfer::init()
 {
     renameObject(QString("Transfer/%1").arg(_uuid.toString()));
+    setAllowClientUpdates(true);
 }
 
 
@@ -147,3 +155,28 @@ void Transfer::setFileSize(quint64 fileSize)
         emit fileSizeChanged(fileSize);
     }
 }
+
+
+QString Transfer::nick() const
+{
+    return _nick;
+}
+
+
+void Transfer::setNick(const QString &nick)
+{
+    if (_nick != nick) {
+        _nick = nick;
+        SYNC(ARG(nick));
+        emit nickChanged(nick);
+    }
+}
+
+
+void Transfer::setError(const QString &errorString)
+{
+    qWarning() << Q_FUNC_INFO << errorString;
+    emit error(errorString);
+    setState(Failed);
+    cleanUp();
+}