X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.h;h=7ad13f4343690da573145b044447ae8e2062fdfb;hp=0dc6c5f5ad0a4c4589cb5dbe9647e3cfab71ae46;hb=0a79f71c41f69643fdbf0c32c061f1b11d14346d;hpb=f81ad4f71a532ca310fae0fbe2f412bde9a37521

diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h
index 0dc6c5f5..7ad13f43 100644
--- a/src/core/corenetwork.h
+++ b/src/core/corenetwork.h
@@ -26,7 +26,6 @@
 #include "coreircuser.h"
 
 #include <QTimer>
-#include <QDebug>
 
 #ifdef HAVE_SSL
 # include <QSslSocket>
@@ -34,7 +33,6 @@
 #else
 # include <QTcpSocket>
 #endif
-#include <QAbstractSocket>
 
 #ifdef HAVE_QCA2
 #  include "cipher.h"
@@ -87,12 +85,12 @@ public:
 
   inline UserId userId() const { return _coreSession->user(); }
 
-  inline QAbstractSocket::SocketState socketState() { return socket.state(); }
-  inline bool socketConnected() { return socket.state() == QAbstractSocket::ConnectedState; }
-  inline QHostAddress localAddress() { return socket.localAddress(); }
-  inline QHostAddress peerAddress() { return socket.peerAddress(); }
-  inline quint16 localPort() { return socket.localPort(); }
-  inline quint16 peerPort() { return socket.peerPort(); }
+  inline QAbstractSocket::SocketState socketState() const { return socket.state(); }
+  inline bool socketConnected() const { return socket.state() == QAbstractSocket::ConnectedState; }
+  inline QHostAddress localAddress() const { return socket.localAddress(); }
+  inline QHostAddress peerAddress() const { return socket.peerAddress(); }
+  inline quint16 localPort() const { return socket.localPort(); }
+  inline quint16 peerPort() const { return socket.peerPort(); }
 
 public slots:
   virtual void setMyNick(const QString &mynick);
@@ -155,7 +153,8 @@ signals:
   void sslErrors(const QVariant &errorData);
 
   void newEvent(Event *event);
-  void newSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
+  void socketInitialized(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
+  void socketDisconnected(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
 
 protected:
   inline virtual IrcChannel *ircChannelFactory(const QString &channelname) { return new CoreIrcChannel(channelname, this); }