#include <QTcpSocket>
#include <QTimer>
+#include "identity.h"
#include "message.h"
+#include "network.h"
#include "signalproxy.h"
class CoreSession;
NetworkId networkId() const;
QString networkName() const;
Network *network() const;
+ Identity *identity() const;
CoreSession *coreSession() const;
bool isConnected() const;
+ Network::ConnectionState connectionState() const;
IrcServerHandler *ircServerHandler() const;
UserInputHandler *userInputHandler() const;
// 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);
+ void putRawLine(QByteArray input);
+ void putCmd(const QString &cmd, const QVariantList ¶ms, const QByteArray &prefix = QByteArray());
private slots:
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);
void socketHasData();
void socketError(QAbstractSocket::SocketError);
void socketConnected();
+ void socketDisconnected();
void socketStateChanged(QAbstractSocket::SocketState);
+ void setConnectionState(Network::ConnectionState);
+ void networkInitialized(const QString ¤tServer);
private:
QTcpSocket socket;
+ Network::ConnectionState _connectionState;
Network *_network;
CoreSession *_coreSession;
UserInputHandler *_userInputHandler;
CtcpHandler *_ctcpHandler;
- QVariantMap networkSettings;
- QVariantMap identity;
-
QVariant _previousState;
class ParseError : public Exception {