From 0035d4e4984b64314142c97191e836b23b385de7 Mon Sep 17 00:00:00 2001 From: Christian Klinger Date: Fri, 20 May 2016 14:26:31 +0200 Subject: cleaned up some dead code. --- src/server/mainwindow/mainwindow.cpp | 5 ----- src/server/net/discoverylistener.cpp | 1 - 2 files changed, 6 deletions(-) (limited to 'src/server') diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index b76534e..76f5e00 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -187,9 +187,7 @@ float distance(QPoint a, QPoint b) { */ void MainWindow::placeFrameInFreeSlot(ConnectionFrame* frame, QPoint preferred) { - qDebug() << "placeFrameInFreeSlot(preferred = " << preferred << ")"; const QSize& clientSize = Global::getCurrentRoom()->clientSize; - // TODO: Fix this qDebug() << "clientSize: " << &clientSize /* Get occupied cell of each frame and store status in an array */ bool grid[_tilesX][_tilesY]; memset(grid, 0, sizeof(bool) * _tilesX * _tilesY); // set everything to false @@ -550,9 +548,6 @@ void MainWindow::resizeEvent(QResizeEvent* e) const Room* room = Global::getCurrentRoom(); const QSize& clientSize = room->clientSize; - // TODO: Do I still need this? - // if (room == NULL) {return; } /* Nothing to do here */ - // QSize& clientSize = room->clientSize; if (ui->frmRoom->size().width() < 100 || ui->frmRoom->size().height() < 100 || _tilesX <= 0 || _tilesY <= 0) { return; } QSize newGridSize = room->gridSize; diff --git a/src/server/net/discoverylistener.cpp b/src/server/net/discoverylistener.cpp index c0b80b8..e205c77 100644 --- a/src/server/net/discoverylistener.cpp +++ b/src/server/net/discoverylistener.cpp @@ -159,7 +159,6 @@ void DiscoveryListener::onReadyRead() if (!Network::isAddressInList(QString::fromUtf8(iplist), addr.toString())) continue; // If so, check if the submitted hash seems valid - // if (Global::getCurrentRoom() == "") { continue; } // TODO: Can we remove this check? if (genSha1(&Global::sessionNameArray(), &salt1, &iplist) != hash && !(Global::getCurrentRoom()->clientPositions.contains(addr.toString()))) { -- cgit v1.2.3-55-g7522