X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fnetworkconnection.h;h=745afc7761a05454f62abb94cfd48223de7c3aec;hb=723db5bff304ad3fdf5a0609198c65a66bfbaea7;hp=a7d6eba65152cbe97f6c71cd3c0a62565e067f64;hpb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27;p=quassel.git

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index a7d6eba6..745afc77 100644
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -25,121 +25,111 @@
 #include <QString>
 #include <QStringList>
 #include <QTcpSocket>
-#include <QThread>
 #include <QTimer>
 
+#include "identity.h"
 #include "message.h"
+#include "network.h"
 #include "signalproxy.h"
 
+class CoreSession;
 class Network;
 
 class IrcServerHandler;
 class UserInputHandler;
 class CtcpHandler;
-class CoreSession;
 
-/*!
- * This is a server object, managing a single connection to an IRC server, handling the associated channels and so on.
- * We have this running in its own thread mainly to not block other server objects or the core if something goes wrong,
- * e.g. if some scripts starts running wild...
- */
-
-class NetworkConnection : public QThread {
+class NetworkConnection : public QObject {
   Q_OBJECT
 
 public:
-  NetworkConnection(UserId uid, NetworkId networkId, QString network, const QVariant &previousState = QVariant());
+  NetworkConnection(Network *network, CoreSession *session, const QVariant &previousState = QVariant());
   ~NetworkConnection();
 
-  UserId userId() const { return _userId; } 
-
-  // networkState state();
-  bool isConnected() const { return socket.state() == QAbstractSocket::ConnectedState; }
-
   NetworkId networkId() const;
-  QString networkName() const;  // hasbeen getNetwork()
+  QString networkName() const;
+  Network *network() const;
+  Identity *identity() const;
+  CoreSession *coreSession() const;
 
-  Network *network() const { return _network; }
-  IrcServerHandler *ircServerHandler() const { return _ircServerHandler; }
-  UserInputHandler *userInputHandler() const { return _userInputHandler; }
-  CtcpHandler *ctcpHandler() const { return _ctcpHandler; }
+  bool isConnected() const;
+  Network::ConnectionState connectionState() const;
 
-  QVariant state(); ///< Return data necessary to restore the server's state upon core restart
+  IrcServerHandler *ircServerHandler() const;
+  UserInputHandler *userInputHandler() const;
+  CtcpHandler *ctcpHandler() const;
+
+  //! Return data necessary to restore the connection state upon core restart
+  QVariant state() const;
 
   //! Decode a string using the server (network) decoding.
   QString serverDecode(const QByteArray &string) const;
 
-  //! Decode a string using a buffer-specific encoding if one is set (and use the server encoding else).
-  QString bufferDecode(const QString &bufferName, const QByteArray &string) const;
+  //! Decode a string using a channel-specific encoding if one is set (and use the standard encoding else).
+  QString channelDecode(const QString &channelName, const QByteArray &string) const;
 
-  //! Decode a string using a IrcUser specific encoding, if one exists (using the server encoding else).
+  //! Decode a string using an IrcUser-specific encoding, if one exists (using the standaed encoding else).
   QString userDecode(const QString &userNick, const QByteArray &string) const;
 
   //! Encode a string using the server (network) encoding.
   QByteArray serverEncode(const QString &string) const;
 
-  //! Encode a string using the buffer-specific encoding, if set, and use the server encoding else.
-  QByteArray bufferEncode(const QString &bufferName, const QString &string) const;
+  //! Encode a string using the channel-specific encoding, if set, and use the standard encoding else.
+  QByteArray channelEncode(const QString &channelName, const QString &string) const;
 
-  //! Encode a string using the user-specific encoding, if set, and use the server encoding else.
+  //! Encode a string using the user-specific encoding, if set, and use the standard encoding else.
   QByteArray userEncode(const QString &userNick, const QString &string) const;
 
 public slots:
   // void setServerOptions();
-  void connectToIrc(QString net);
-  void disconnectFromIrc(QString net);
-  void userInput(uint netid, QString buffer, QString msg);
+  void connectToIrc();
+  void disconnectFromIrc();
+  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 &params, const QByteArray &prefix = QByteArray());
 
 
 private slots:
-  void threadFinished();
   void sendPerform();
 
 signals:
-  void networkState(QString net, QVariantMap data);
+  // #void networkState(QString net, QVariantMap data);
   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(uint networkId);
-  void disconnected(uint 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 synchronizeClients();
-  
-  void queryRequested(QString network, QString nick);
+  //void queryRequested(QString network, QString nick);
 
 
 private slots:
-  void run();
   void socketHasData();
   void socketError(QAbstractSocket::SocketError);
   void socketConnected();
+  void socketDisconnected();
   void socketStateChanged(QAbstractSocket::SocketState);
+  void setConnectionState(Network::ConnectionState);
+  void networkInitialized(const QString &currentServer);
 
 private:
-  UserId _userId;
-  NetworkId _networkId;
-
   QTcpSocket socket;
+  Network::ConnectionState _connectionState;
+
+  Network *_network;
+  CoreSession *_coreSession;
 
   IrcServerHandler *_ircServerHandler;
   UserInputHandler *_userInputHandler;
   CtcpHandler *_ctcpHandler;
 
-  Network *_network;
-
-  QVariantMap networkSettings;
-  QVariantMap identity;
-
   QVariant _previousState;
 
-  CoreSession *coreSession() const;
-  
   class ParseError : public Exception {
   public:
     ParseError(QString cmd, QString prefix, QStringList params);