diff options
Diffstat (limited to 'src/server')
-rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 19 | ||||
-rw-r--r-- | src/server/mainwindow/mainwindow.h | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index ded64b9..c716849 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -1213,7 +1213,6 @@ void MainWindow::onClientAuthenticated(Client* client) disconnect(client, SIGNAL(authenticated(Client*)), this, SLOT(onClientAuthenticated(Client*))); connect(client, SIGNAL(vncServerStateChange(Client*)), this, SLOT(onVncServerStateChange(Client*))); connect(client, SIGNAL(vncClientStateChange(Client*)), this, SLOT(onVncClientStateChange(Client*))); - bool hasActiveTutor = false; ConnectionFrame *existing = NULL; for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) { // qDebug() << "Existing frame ip: " << (*it)->computerId(); @@ -1222,27 +1221,11 @@ void MainWindow::onClientAuthenticated(Client* client) if ((*it)->computerId() == client->ip()) { existing = *it; } - if ((*it)->isTutor()) { - if ((*it)->client() != NULL) - hasActiveTutor = true; - } } - - bool isTutor = false; - if (!hasActiveTutor) { - for (int i = 0; i < _tutorList.size(); i++) { - // Check if client is possible tutor - if (client->ip() == _tutorList[i]) { - isTutor = true; - break; - } - } - } // Clients ip already exists, but was not active. if (existing != NULL) { // qDebug() << "Should go into this if clause."; - existing->setTutor(isTutor); existing->assignClient(client); tellClientCurrentSituation(client); updateExamMode(); @@ -1253,8 +1236,6 @@ void MainWindow::onClientAuthenticated(Client* client) ConnectionFrame *cf = createFrame(); // Move to any free tile placeFrameInFreeSlot(cf); - // Set Tutor option - cf->setTutor(isTutor); // Assign client instance cf->assignClient(client); diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 69be1bf..5ecda61 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -73,7 +73,6 @@ private: QList<ConnectionFrame*> _clientFrames; ListenServer *_listenServer; DiscoveryListener *_discoveryListener; - QStringList _tutorList; QPoint closestFreeSlot(QPoint preferredPixels, ConnectionFrame* toIgnore); void placeFrameInFreeSlot(ConnectionFrame* frame, QPoint preferred = QPoint(0, 0)); |