X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=0369c213be0408201ab6f5e94fa093836413838b;hp=21e7f630118fad4bc52826282bdded41ed3e4615;hb=6f2f1723f5bb3d26908f6dd297890f6fba43793b;hpb=d1b6499b0b848d4287efae89107576548533502c diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp index 21e7f630..0369c213 100644 --- a/src/core/networkconnection.cpp +++ b/src/core/networkconnection.cpp @@ -46,7 +46,7 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session, con connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(sendPerform())); connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected())); - connect(&socket, SIGNAL(disconnected()), this, SLOT(quit())); + //connect(&socket, SIGNAL(disconnected()), this, SLOT(quit())); FIXME connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError))); connect(&socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState))); connect(&socket, SIGNAL(readyRead()), this, SLOT(socketHasData())); @@ -63,7 +63,7 @@ bool NetworkConnection::isConnected() const { return socket.state() == QAbstractSocket::ConnectedState; } -uint NetworkConnection::networkId() const { +NetworkId NetworkConnection::networkId() const { return network()->networkId(); } @@ -183,6 +183,7 @@ void NetworkConnection::socketHasData() { } void NetworkConnection::socketError( QAbstractSocket::SocketError err ) { + Q_UNUSED(err); qDebug() << "Socket Error!"; } @@ -199,6 +200,7 @@ void NetworkConnection::socketConnected() { } void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState state) { + Q_UNUSED(state); //qDebug() << "Socket state changed: " << state; }