projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #175 from ayonix/ssl-fix
[quassel.git]
/
src
/
common
/
transfer.h
diff --git
a/src/common/transfer.h
b/src/common/transfer.h
index
bdbad9f
..
0094851
100644
(file)
--- a/
src/common/transfer.h
+++ b/
src/common/transfer.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
5
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-24,8
+24,8
@@
#include <QHostAddress>
#include <QUuid>
#include <QHostAddress>
#include <QUuid>
+#include "peer.h"
#include "syncableobject.h"
#include "syncableobject.h"
-#include "types.h"
class Transfer : public SyncableObject
{
class Transfer : public SyncableObject
{
@@
-45,6
+45,7
@@
public:
enum State {
New,
Pending,
enum State {
New,
Pending,
+ Connecting,
Transferring,
Paused,
Completed,
Transferring,
Paused,
Completed,
@@
-90,11
+91,19
@@
signals:
void fileSizeChanged(quint64 fileSize);
void nickChanged(const QString &nick);
void fileSizeChanged(quint64 fileSize);
void nickChanged(const QString &nick);
+ void error(const QString &errorString);
+
void accepted(PeerPtr peer = 0) const;
void rejected(PeerPtr peer = 0) const;
void accepted(PeerPtr peer = 0) const;
void rejected(PeerPtr peer = 0) const;
-protected:
+protected
slots
:
void setState(State state);
void setState(State state);
+ void setError(const QString &errorString);
+
+ // called on the client side through sync calls
+ virtual void dataReceived(PeerPtr, const QByteArray &data) { Q_UNUSED(data); }
+
+ virtual void cleanUp() = 0;
private:
void init();
private:
void init();