- Improved the speed of IrcServerHandler (and other BasicHandler

[quassel.git] / src / core / coresession.h

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 0e18315..27417e5 100644 (file)
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -27,10 +27,13 @@
 
 #include "message.h"
 
-class Server;
+class Identity;
+class NetworkConnection;
 class SignalProxy;
 class Storage;
 
+class QScriptEngine;
+
 class CoreSession : public QObject {
   Q_OBJECT
 
@@ -38,37 +41,57 @@ public:
   CoreSession(UserId, Storage *, QObject *parent = 0);
   virtual ~CoreSession();
 
-  uint getNetworkId(const QString &network) const;
+  NetworkId getNetworkId(const QString &network) const;
   QList<BufferInfo> buffers() const;
   UserId userId() const;
   QVariant sessionState();
 
   //! Retrieve a piece of session-wide data.
   QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
-  
+
   SignalProxy *signalProxy() const;
-                                 
-  void attachServer(Server *server);
-                                  
+
+  void attachNetworkConnection(NetworkConnection *conn);
+
+  //! Return necessary data for restoring the session after restarting the core
+  QVariant state() const;
+  void restoreState(const QVariant &previousState);
+
 public slots:
   //! Store a piece session-wide data and distribute it to connected clients.
   void storeSessionData(const QString &key, const QVariant &data);
 
-  void serverStateRequested();
+  void networkStateRequested();
 
   void addClient(QIODevice *connection);
-  
-  void connectToNetwork(QString);
-  
+
+  void connectToNetwork(QString, const QVariant &previousState = QVariant());
+  //void connectToNetwork(NetworkId);
+
   //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
   void sendBacklog(BufferInfo, QVariant, QVariant);
   void msgFromGui(BufferInfo, QString message);
-  
+
+  //! Create an identity and propagate the changes to the clients.
+  /** \param identity The identity to be created.
+   */
+  void createIdentity(const Identity &identity);
+
+  //! Update an identity and propagate the changes to the clients.
+  /** \param identity The identity to be updated.
+   */
+  void updateIdentity(const Identity &identity);
+
+  //! Remove identity and propagate that fact to the clients.
+  /** \param identity The identity to be removed.
+   */
+  void removeIdentity(IdentityId identity);
+
 signals:
   void msgFromGui(uint netid, QString buf, QString message);
   void displayMsg(Message message);
   void displayStatusMsg(QString, QString);
-  
+
   void connectToIrc(QString net);
   void disconnectFromIrc(QString net);
 
@@ -78,21 +101,43 @@ signals:
   void sessionDataChanged(const QString &key);
   void sessionDataChanged(const QString &key, const QVariant &data);
 
+  void scriptResult(QString result);
+
+  //! Identity has been created.
+  /** This signal is propagated to the clients to tell them that the given identity has been created.
+   *  \param identity The new identity.
+   */
+  void identityCreated(const Identity &identity);
+
+  //! Identity has been removed.
+  /** This signal is propagated to the clients to inform them about the removal of the given identity.
+   *  \param identity The identity that has been removed.
+   */
+  void identityRemoved(IdentityId identity);
+
 private slots:
   void recvStatusMsgFromServer(QString msg);
   void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
-  void serverConnected(uint networkid);
-  void serverDisconnected(uint networkid);
+  void networkConnected(uint networkid);
+  void networkDisconnected(uint networkid);
 
+  void scriptRequest(QString script);
+  
 private:
+  void initScriptEngine();
+  
   UserId user;
   
   SignalProxy *_signalProxy;
   Storage *storage;
-  QHash<uint, Server *> servers;
+  QHash<NetworkId, NetworkConnection *> connections;
   
   QVariantMap sessionData;
   QMutex mutex;
+
+  QScriptEngine *scriptEngine;
+
+  QHash<IdentityId, Identity *> _identities;
 };
 
 #endif