summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-06-02 18:18:14 +0200
committerBjörn Hagemeister2014-06-02 18:18:14 +0200
commit266f172e2c5eac02a0e1e480cadb5ba1a5098cb4 (patch)
tree0218780315956b76f96569b684ffe9ac56962cdd
parentMerge branch 'master' of git.openslx.org:pvs2 (diff)
downloadpvs2-266f172e2c5eac02a0e1e480cadb5ba1a5098cb4.tar.gz
pvs2-266f172e2c5eac02a0e1e480cadb5ba1a5098cb4.tar.xz
pvs2-266f172e2c5eac02a0e1e480cadb5ba1a5098cb4.zip
Removed some unnecessary qDebug comments.
-rw-r--r--src/server/mainwindow/mainwindow.cpp4
-rw-r--r--src/server/mainwindow/mainwindow.h1
-rw-r--r--src/server/net/listenserver.cpp1
-rw-r--r--src/server/net/sslserver.cpp1
4 files changed, 1 insertions, 6 deletions
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 21cde86..c1e39f3 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -101,6 +101,7 @@ MainWindow::MainWindow(QString ipListUrl, QWidget* parent) :
connect(ui->action_Lock, SIGNAL(toggled(bool)), this, SLOT(onButtonLock(bool)));
connect(ui->action_Help, SIGNAL(triggered()), this, SLOT(onButtonHelp()));
+
/* Stuff for the button lock */
_buttonLockTimer = new QTimer(this);
_buttonLockTimer->setSingleShot(true);
@@ -718,7 +719,6 @@ void MainWindow::onButtonSetAsTutor()
*/
void MainWindow::onClientConnected(Client* client)
{
- qDebug("ListenServer told MainWindow about new connection");
connect(client, SIGNAL(authenticating(Client*, ClientLogin*)), this, SLOT(onClientAuthenticating(Client*, ClientLogin*)));
connect(client, SIGNAL(authenticated(Client*)), this, SLOT(onClientAuthenticated(Client*)));
}
@@ -735,7 +735,6 @@ void MainWindow::onClientConnected(Client* client)
*/
void MainWindow::onClientAuthenticating(Client* client, ClientLogin* request)
{
- qDebug("onClientAuthenticating - Slot was called.");
disconnect(client, SIGNAL(authenticating(Client*, ClientLogin*)), this, SLOT(onClientAuthenticating(Client*, ClientLogin*)));
if (!request->accept) // Another receiver of that signal already rejected the client, so nothing to do
return;
@@ -783,7 +782,6 @@ void MainWindow::onClientAuthenticating(Client* client, ClientLogin* request)
*/
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*)), this, SLOT(onVncClientStateChange(Client*)), Qt::QueuedConnection);
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index 0d0d650..a15c12f 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -86,7 +86,6 @@ private:
void resizeEvent(QResizeEvent *e);
void mouseReleaseEvent(QMouseEvent* e);
-
protected slots:
void onTutorListDownloaded(QByteArray& tutorList);
void onSessionNameClick();
diff --git a/src/server/net/listenserver.cpp b/src/server/net/listenserver.cpp
index 859ee33..8eb3750 100644
--- a/src/server/net/listenserver.cpp
+++ b/src/server/net/listenserver.cpp
@@ -32,7 +32,6 @@ ListenServer::~ListenServer()
*/
void ListenServer::newClientConnection()
{
- qDebug("Listenserver::newClientConnection().");
QSslSocket* sock;
while ((sock = (QSslSocket*)_server.nextPendingConnection()) != NULL)
{
diff --git a/src/server/net/sslserver.cpp b/src/server/net/sslserver.cpp
index 65a40b4..4ea3991 100644
--- a/src/server/net/sslserver.cpp
+++ b/src/server/net/sslserver.cpp
@@ -36,7 +36,6 @@ SslServer::~SslServer()
*/
void SslServer::incomingConnection(int socketDescriptor)
{
- qDebug("SslServer:incomingConnection.");
QSslSocket *serverSocket = new QSslSocket(NULL);
connect(serverSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
QSslKey key;