Finally! All *Id types are now first-class types rather than tpyedefs.
[quassel.git] / src / core / networkconnection.cpp
index 21e7f63..803564b 100644 (file)
@@ -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();
 }