projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There won't ever be a Qt 4.9...
[quassel.git]
/
src
/
common
/
remotepeer.h
diff --git
a/src/common/remotepeer.h
b/src/common/remotepeer.h
index
71bae7f
..
191439e
100644
(file)
--- a/
src/common/remotepeer.h
+++ b/
src/common/remotepeer.h
@@
-42,11
+42,12
@@
public:
using Peer::dispatch;
RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, QObject *parent = 0);
using Peer::dispatch;
RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, QObject *parent = 0);
- virtual ~RemotePeer() {};
void setSignalProxy(SignalProxy *proxy);
void setSignalProxy(SignalProxy *proxy);
- QString description() const;
+ virtual Protocol::Type protocol() const = 0;
+ virtual QString description() const;
+ virtual quint16 enabledFeatures() const { return 0; }
bool isOpen() const;
bool isSecure() const;
bool isOpen() const;
bool isSecure() const;
@@
-64,8
+65,8
@@
public slots:
signals:
void transferProgress(int current, int max);
signals:
void transferProgress(int current, int max);
- void socketStateChanged(QAbstractSocket::SocketState socketState);
void socketError(QAbstractSocket::SocketError error, const QString &errorString);
void socketError(QAbstractSocket::SocketError error, const QString &errorString);
+ void statusMessage(const QString &msg);
protected:
SignalProxy *signalProxy() const;
protected:
SignalProxy *signalProxy() const;
@@
-76,10
+77,14
@@
protected:
virtual void dispatch(const Protocol::HeartBeat &msg) = 0;
virtual void dispatch(const Protocol::HeartBeatReply &msg) = 0;
virtual void dispatch(const Protocol::HeartBeat &msg) = 0;
virtual void dispatch(const Protocol::HeartBeatReply &msg) = 0;
+protected slots:
+ virtual void onSocketDataAvailable() = 0;
+ virtual void onSocketStateChanged(QAbstractSocket::SocketState state);
+ virtual void onSocketError(QAbstractSocket::SocketError error);
+
private slots:
void sendHeartBeat();
void changeHeartBeatInterval(int secs);
private slots:
void sendHeartBeat();
void changeHeartBeatInterval(int secs);
- void onSocketError(QAbstractSocket::SocketError error);
private:
QTcpSocket *_socket;
private:
QTcpSocket *_socket;