diff options
author | Björn Hagemeister | 2014-04-23 18:20:33 +0200 |
---|---|---|
committer | Björn Hagemeister | 2014-04-23 18:20:33 +0200 |
commit | efcbd6b3fffbb92b7e0b90f21de69611d142f111 (patch) | |
tree | 238ce0a11c846aa7377f9c3fd2ddd57f980385d7 /src/client/vnc/vncwindow.h | |
parent | Fix status icon updating not working (diff) | |
parent | Made vnc thread stoppable from outside. Thread kills itself. If the vnc (diff) | |
download | pvs2-efcbd6b3fffbb92b7e0b90f21de69611d142f111.tar.gz pvs2-efcbd6b3fffbb92b7e0b90f21de69611d142f111.tar.xz pvs2-efcbd6b3fffbb92b7e0b90f21de69611d142f111.zip |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/client/vnc/vncwindow.h')
-rw-r--r-- | src/client/vnc/vncwindow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/vnc/vncwindow.h b/src/client/vnc/vncwindow.h index f648ebf..a9c5910 100644 --- a/src/client/vnc/vncwindow.h +++ b/src/client/vnc/vncwindow.h @@ -37,8 +37,8 @@ public: protected slots: void onUpdateImage(const int x, const int y, const int w, const int h); - void onThreadFinished(); void onProjectionStarted(); + void onProjectionStopped(); void open(const QString& host, int port, const QString& passwd, bool ro, bool fullscreen, const QString& caption, const int clientId); @@ -63,6 +63,7 @@ private: QMap<unsigned int, bool> _modkeys; int _clientId; int _redrawTimer; + int _tcpTimeoutTimer; bool eventFilter(QObject *obj, QEvent *event); void keyPressEvent(QKeyEvent* event); |