diff options
| -rw-r--r-- | src/server/connectionframe/connectionframe.cpp | 2 | ||||
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 2 | ||||
| -rw-r--r-- | src/server/net/client.cpp | 4 | ||||
| -rw-r--r-- | src/server/net/client.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp index bafa525..444902e 100644 --- a/src/server/connectionframe/connectionframe.cpp +++ b/src/server/connectionframe/connectionframe.cpp @@ -140,7 +140,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(updateAppearance())); - connect( client, SIGNAL(vncClientStateChange(Client*, int)), this, SLOT(updateAppearance())); + connect( client, SIGNAL(vncClientStateChange(Client*)), this, SLOT(updateAppearance())); _client = client; _computerId = client->ip(); _lblHostName->setText(client->ip()); diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 60623ea..c1fc2a5 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -769,7 +769,7 @@ void MainWindow::onClientAuthenticated(Client* client) qDebug("Entering onClientAuthenticated - Slot."); disconnect(client, SIGNAL(authenticated(Client*)), this, SLOT(onClientAuthenticated(Client*))); connect(client, SIGNAL(vncServerStateChange(Client*)), this, SLOT(onVncServerStateChange(Client*)), Qt::QueuedConnection); - connect(client, SIGNAL(vncClientStateChange(Client*, int)), this, SLOT(onVncClientStateChange(Client*, int)), Qt::QueuedConnection); + connect(client, SIGNAL(vncClientStateChange(Client*)), this, SLOT(onVncClientStateChange(Client*)), Qt::QueuedConnection); bool hasActiveTutor = false; ConnectionFrame *existing = NULL; for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) @@ -919,7 +919,7 @@ void MainWindow::onVncServerStateChange(Client* client) * @param client * @param lastProjectionSource */ -void MainWindow::onVncClientStateChange(Client* client, int lastProjectionSource) +void MainWindow::onVncClientStateChange(Client* client) { if (!isValidClient(client)) // Check here because this slot is connected queued return; diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 8405e4a..97d9dc3 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -113,6 +113,6 @@ protected slots: void onClientAuthenticating(Client* client, ClientLogin* request); void onClientAuthenticated(Client* client); void onVncServerStateChange(Client* client); - void onVncClientStateChange(Client* client, int lastProjectionSource); + void onVncClientStateChange(Client* client); }; #endif diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index 3ee096e..e59f77e 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -192,13 +192,13 @@ void Client::handleMsg() if (_fromClient.getFieldString("ENABLED").toInt() != 0) { qDebug() << "Client " << _name << " started its VNC client (watching " << projectionSource << ")"; - emit vncClientStateChange(this, _currentProjectionSource); + emit vncClientStateChange(this); _currentProjectionSource = projectionSource; } else { qDebug() << "Client " << _name << " stopped its VNC client (watched " << projectionSource << ")"; - emit vncClientStateChange(this, _currentProjectionSource); + emit vncClientStateChange(this); _currentProjectionSource = 0; } diff --git a/src/server/net/client.h b/src/server/net/client.h index 6788284..8d71da7 100644 --- a/src/server/net/client.h +++ b/src/server/net/client.h @@ -81,7 +81,7 @@ signals: void authenticated(Client* client); void thumbUpdated(Client* client, const QPixmap& thumb); void vncServerStateChange(Client* client); - void vncClientStateChange(Client* client, int lastProjectionSource); + void vncClientStateChange(Client* client); void disconnected(); private slots: |