X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.h;h=c5694caa0a39e20cc9d1bf95ecd098caea7c536d;hb=2dd7667489021341267d316472d375e8c89c79c0;hp=1e1247b5d89b66db9d10f931325c6d9bb6ee5fa8;hpb=d1b6499b0b848d4287efae89107576548533502c;p=quassel.git

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index 1e1247b5..c5694caa 100644
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -28,6 +28,7 @@
 #include <QTimer>
 
 #include "message.h"
+#include "network.h"
 #include "signalproxy.h"
 
 class CoreSession;
@@ -50,6 +51,7 @@ public:
   CoreSession *coreSession() const;
 
   bool isConnected() const;
+  Network::ConnectionState connectionState() const;
 
   IrcServerHandler *ircServerHandler() const;
   UserInputHandler *userInputHandler() const;
@@ -80,7 +82,7 @@ public slots:
   // void setServerOptions();
   void connectToIrc();
   void disconnectFromIrc();
-  void userInput(QString buffer, QString msg);
+  void userInput(BufferInfo bufferInfo, QString msg);
 
   void putRawLine(QString input);
   void putCmd(QString cmd, QStringList params, QString prefix = 0);
@@ -94,11 +96,12 @@ signals:
   void recvRawServerMsg(QString);
   void displayStatusMsg(QString);
   //void displayMsg(Message msg);
-  void displayMsg(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
-  void connected(NetworkId networkId);
+  void displayMsg(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+  void connected(NetworkId networkId);   ///< Emitted after receipt of 001 to indicate that we can now send data to the IRC server
   void disconnected(NetworkId networkId);
-
+  void connectionStateChanged(Network::ConnectionState);
   void connectionInitialized(); ///< Emitted after receipt of 001 to indicate that we can now send data to the IRC server
+  void connectionError(const QString &errorMsg);
 
   //void queryRequested(QString network, QString nick);
 
@@ -107,10 +110,14 @@ private slots:
   void socketHasData();
   void socketError(QAbstractSocket::SocketError);
   void socketConnected();
+  void socketDisconnected();
   void socketStateChanged(QAbstractSocket::SocketState);
+  void setConnectionState(Network::ConnectionState);
+  void networkInitialized();
 
 private:
   QTcpSocket socket;
+  Network::ConnectionState _connectionState;
 
   Network *_network;
   CoreSession *_coreSession;