X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftransfer.cpp;h=f565a0d2aa6da97379e86417c274d8a9d7c3a9a2;hb=294e7ee7e918cf4d85ddf4eca1f5bcedabf561eb;hp=25f1e2059fe257cb7296ae73ce9eba0c7a89caca;hpb=f5bb6544096b45cde4642e821654c48e26a9f79c;p=quassel.git

diff --git a/src/common/transfer.cpp b/src/common/transfer.cpp
index 25f1e205..f565a0d2 100644
--- a/src/common/transfer.cpp
+++ b/src/common/transfer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,8 +23,8 @@
 INIT_SYNCABLE_OBJECT(Transfer)
 Transfer::Transfer(const QUuid &uuid, QObject *parent)
     : SyncableObject(parent),
-    _state(New),
-    _direction(Receive),
+    _state(State::New),
+    _direction(Direction::Receive),
     _port(0),
     _fileSize(0),
     _uuid(uuid)
@@ -34,7 +34,7 @@ Transfer::Transfer(const QUuid &uuid, 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),
+    _state(State::New),
     _direction(direction),
     _fileName(fileName),
     _address(address),
@@ -49,6 +49,15 @@ Transfer::Transfer(Direction direction, const QString &nick, const QString &file
 
 void Transfer::init()
 {
+    static auto regTypes = []() -> bool {
+        qRegisterMetaType<State>("Transfer::State");
+        qRegisterMetaType<Direction>("Transfer::Direction");
+        qRegisterMetaTypeStreamOperators<State>("Transfer::State");
+        qRegisterMetaTypeStreamOperators<Direction>("Transfer::Direction");
+        return true;
+    }();
+    Q_UNUSED(regTypes);
+
     renameObject(QString("Transfer/%1").arg(_uuid.toString()));
     setAllowClientUpdates(true);
 }
@@ -173,35 +182,35 @@ void Transfer::setNick(const QString &nick)
 }
 
 
-QString Transfer::savePath() const
+void Transfer::setError(const QString &errorString)
 {
-    return _savePath;
+    qWarning() << Q_FUNC_INFO << errorString;
+    emit error(errorString);
+    setState(State::Failed);
+    cleanUp();
 }
 
 
-void Transfer::accept(const QString &savePath) const
-{
-    _savePath = savePath;
-    PeerPtr ptr = 0;
-    REQUEST_OTHER(requestAccepted, ARG(ptr));
-    emit accepted();
+QDataStream &operator<<(QDataStream &out, Transfer::State state) {
+    out << static_cast<qint8>(state);
+    return out;
 }
 
-
-void Transfer::reject() const
-{
-    REQUEST_OTHER(requestRejected, NO_ARG);
-    emit rejected();
+QDataStream &operator>>(QDataStream &in, Transfer::State &state) {
+    qint8 s;
+    in >> s;
+    state = static_cast<Transfer::State>(s);
+    return in;
 }
 
-
-void Transfer::requestAccepted(PeerPtr peer)
-{
-    emit accepted(peer);
+QDataStream &operator<<(QDataStream &out, Transfer::Direction direction) {
+    out << static_cast<qint8>(direction);
+    return out;
 }
 
-
-void Transfer::requestRejected()
-{
-    emit rejected();
+QDataStream &operator>>(QDataStream &in, Transfer::Direction &direction) {
+    qint8 d;
+    in >> d;
+    direction = static_cast<Transfer::Direction>(d);
+    return in;
 }