diff options
author | sr | 2013-02-05 19:48:39 +0100 |
---|---|---|
committer | sr | 2013-02-05 19:48:39 +0100 |
commit | e9b4cb4721b7c7f02728e22f92f5ad7a94828521 (patch) | |
tree | 14e7573bf8ec0764cb9b9519f81ceb49830b777a /src/server/connectionframe | |
parent | ... (diff) | |
download | pvs2-e9b4cb4721b7c7f02728e22f92f5ad7a94828521.tar.gz pvs2-e9b4cb4721b7c7f02728e22f92f5ad7a94828521.tar.xz pvs2-e9b4cb4721b7c7f02728e22f92f5ad7a94828521.zip |
[SERVER] Go back from ClientId to int, so queued signal/slot connections work
Diffstat (limited to 'src/server/connectionframe')
-rw-r--r-- | src/server/connectionframe/connectionframe.cpp | 4 | ||||
-rw-r--r-- | src/server/connectionframe/connectionframe.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp index a05af95..df93525 100644 --- a/src/server/connectionframe/connectionframe.cpp +++ b/src/server/connectionframe/connectionframe.cpp @@ -100,7 +100,7 @@ void ConnectionFrame::assignClient(Client* client) connect(client, SIGNAL(disconnected()), this, SLOT(onClientDisconnected())); connect(client, SIGNAL(thumbUpdated(Client*, const QPixmap&)), this, SLOT(onThumbUpdated(Client*, const QPixmap&))); connect(client, SIGNAL(vncServerStateChange(Client*)), this, SLOT(onVncServerStateChange(Client*))); - connect(client, SIGNAL(vncClientStateChange(Client*, ClientId)), this, SLOT(onVncClientStateChange(Client*, ClientId))); + connect(client, SIGNAL(vncClientStateChange(Client*, int)), this, SLOT(onVncClientStateChange(Client*, int))); _client = client; _computerId = client->computerId(); _lblHostName->setText(client->ip()); @@ -280,7 +280,7 @@ void ConnectionFrame::onVncServerStateChange(Client* client) this->updateColor(); } -void ConnectionFrame::onVncClientStateChange(Client* client, ClientId lastSource) +void ConnectionFrame::onVncClientStateChange(Client* client, int lastSource) { this->updateColor(); } diff --git a/src/server/connectionframe/connectionframe.h b/src/server/connectionframe/connectionframe.h index ac1a0a8..a4d9ede 100644 --- a/src/server/connectionframe/connectionframe.h +++ b/src/server/connectionframe/connectionframe.h @@ -1,8 +1,7 @@ #ifndef _CONNECTIONFRAME_H_ #define _CONNECTIONFRAME_H_ #include <QtGui> - -class Client; +#include "../net/client.h" class ConnectionFrame : public QGroupBox { @@ -71,7 +70,7 @@ private slots: void onClientDisconnected(); void onThumbUpdated(Client* client, const QPixmap& thumb); void onVncServerStateChange(Client* client); - void onVncClientStateChange(Client* client, ClientId lastSource); + void onVncClientStateChange(Client* client, int lastSource); }; #endif |